organize bric device definitions

lz1asl · Jan 26, 2024 · f7388b2 · f7388b2
1 parent c4855be
commit f7388b2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/...ava/com/astoev/cave/survey/test/service/bluetooth/ledevice/Bric4LeDeviceProtocolTest.java b/...ava/com/astoev/cave/survey/test/service/bluetooth/ledevice/Bric4LeDeviceProtocolTest.java
@@ -7,8 +7,8 @@
 import android.os.Build;
 
 import com.astoev.cave.survey.service.bluetooth.device.AbstractBluetoothDevice;
-import com.astoev.cave.survey.service.bluetooth.device.ble.bric4.Bric4BluetoothLEDevice;
-import com.astoev.cave.survey.service.bluetooth.device.ble.bric4.Bric4ErrorCode;
+import com.astoev.cave.survey.service.bluetooth.device.ble.bric.Bric4BluetoothLEDevice;
+import com.astoev.cave.survey.service.bluetooth.device.ble.bric.Bric4ErrorCode;
 
 import org.junit.Test;
 

diff --git a/...ava/com/astoev/cave/survey/test/service/bluetooth/ledevice/Bric5LeDeviceProtocolTest.java b/...ava/com/astoev/cave/survey/test/service/bluetooth/ledevice/Bric5LeDeviceProtocolTest.java
@@ -1,7 +1,7 @@
 package com.astoev.cave.survey.test.service.bluetooth.ledevice;
 
 import com.astoev.cave.survey.service.bluetooth.device.AbstractBluetoothDevice;
-import com.astoev.cave.survey.service.bluetooth.device.ble.Bric5BluetoothLEDevice;
+import com.astoev.cave.survey.service.bluetooth.device.ble.bric.Bric5BluetoothLEDevice;
 
 public class Bric5LeDeviceProtocolTest extends Bric4LeDeviceProtocolTest {
 

diff --git a/src/main/java/com/astoev/cave/survey/service/bluetooth/BluetoothService.java b/src/main/java/com/astoev/cave/survey/service/bluetooth/BluetoothService.java
@@ -44,11 +44,11 @@
 import com.astoev.cave.survey.service.bluetooth.device.AbstractBluetoothDevice;
 import com.astoev.cave.survey.service.bluetooth.device.DiscoveredBluetoothDevice;
 import com.astoev.cave.survey.service.bluetooth.device.ble.AbstractBluetoothLEDevice;
-import com.astoev.cave.survey.service.bluetooth.device.ble.Bric5BluetoothLEDevice;
 import com.astoev.cave.survey.service.bluetooth.device.ble.DistoXBleDevice;
 import com.astoev.cave.survey.service.bluetooth.device.ble.LeicaDistoBluetoothLEDevice;
 import com.astoev.cave.survey.service.bluetooth.device.ble.StanleyBluetoothLeDevice;
-import com.astoev.cave.survey.service.bluetooth.device.ble.bric4.Bric4BluetoothLEDevice;
+import com.astoev.cave.survey.service.bluetooth.device.ble.bric.Bric4BluetoothLEDevice;
+import com.astoev.cave.survey.service.bluetooth.device.ble.bric.Bric5BluetoothLEDevice;
 import com.astoev.cave.survey.service.bluetooth.device.ble.mileseey.HerschLEM50BluetoothLeDevice;
 import com.astoev.cave.survey.service.bluetooth.device.ble.mileseey.MileseeyP7BluetoothLeDevice;
 import com.astoev.cave.survey.service.bluetooth.device.ble.mileseey.MileseeyT7BluetoothLeDevice;

diff --git a/...ice/ble/bric4/Bric4BluetoothLEDevice.java → ...vice/ble/bric/Bric4BluetoothLEDevice.java b/...ice/ble/bric4/Bric4BluetoothLEDevice.java → ...vice/ble/bric/Bric4BluetoothLEDevice.java
@@ -1,6 +1,4 @@
-package com.astoev.cave.survey.service.bluetooth.device.ble.bric4;
-
-import static java.nio.ByteOrder.LITTLE_ENDIAN;
+package com.astoev.cave.survey.service.bluetooth.device.ble.bric;
 
 import static java.nio.ByteOrder.LITTLE_ENDIAN;
 

diff --git a/...ooth/device/ble/bric4/Bric4ErrorCode.java → ...tooth/device/ble/bric/Bric4ErrorCode.java b/...ooth/device/ble/bric4/Bric4ErrorCode.java → ...tooth/device/ble/bric/Bric4ErrorCode.java
@@ -1,4 +1,4 @@
-package com.astoev.cave.survey.service.bluetooth.device.ble.bric4;
+package com.astoev.cave.survey.service.bluetooth.device.ble.bric;
 
 /**
  *  https://www.bricsurvey.com/s/BRIC4-Bluetooth-Protocol-revF.pdf

diff --git a/...th/device/ble/Bric5BluetoothLEDevice.java → ...vice/ble/bric/Bric5BluetoothLEDevice.java b/...th/device/ble/Bric5BluetoothLEDevice.java → ...vice/ble/bric/Bric5BluetoothLEDevice.java
@@ -1,6 +1,4 @@
-package com.astoev.cave.survey.service.bluetooth.device.ble;
-
-import com.astoev.cave.survey.service.bluetooth.device.ble.bric4.Bric4BluetoothLEDevice;
+package com.astoev.cave.survey.service.bluetooth.device.ble.bric;
 
 /**
  * BRIC5, same protocol as BRIC4 except the Bluetooth name.