From 795b657702a6cf9f68b9cb26fcdc3fec2dc8a477 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Tue, 3 Jul 2018 23:37:57 +0200 Subject: [PATCH] Add Excelvan CF366BLE to list of supported scales Also rename the driver to indicate that CF369BLE isn't the only scale supported by that driver. --- README.md | 2 +- ...ExcelvanCF369BLE.java => BluetoothExcelvanCF36xBLE.java} | 6 +++--- .../health/openscale/core/bluetooth/BluetoothFactory.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename android_app/app/src/main/java/com/health/openscale/core/bluetooth/{BluetoothExcelvanCF369BLE.java => BluetoothExcelvanCF36xBLE.java} (97%) diff --git a/README.md b/README.md index 0c8f0361..63cb3db6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Install [openScale-dev-build.apk](https://github.com/oliexdev/openScale/releases - Import or export your data from/into a CSV file - Estimates body metrics (body fat, body water and lean body mass) based on scientic publications - Support for multiple users -- Partially or full support for custom made Bluetooth scale, Xiaomi Mi scale v1/v2, Sanitas SBF70, Medisana BS444/BS440, Digoo DG-S038H, Yunmai Mini, Excelvan CF369BLE, Yunmai SE, MGB, Exingtech Y1, Beurer BF700/BF710/BF800, Silvercrest SBF75, Runtastic Libra, Hesley (Yunchen), iHealth HS3, Easy Home 64050, Accuway (see [openScale wiki](https://github.com/oliexdev/openScale/wiki/Supported-scales-in-openScale) for details) +- Partially or full support for custom made Bluetooth scale, Xiaomi Mi scale v1/v2, Sanitas SBF70, Medisana BS444/BS440, Digoo DG-S038H, Yunmai Mini, Excelvan CF369BLE/CF366BLE, Yunmai SE, MGB, Exingtech Y1, Beurer BF700/BF710/BF800, Silvercrest SBF75, Runtastic Libra, Hesley (Yunchen), iHealth HS3, Easy Home 64050, Accuway (see [openScale wiki](https://github.com/oliexdev/openScale/wiki/Supported-scales-in-openScale) for details) - Partially or full translated into Brazilian Portuguese, Catalan, Chinese (traditional), Croatian, Czech, Danish, Dutch, English, French, Galician, German, Greek, Italian, Japanese, Norwegian Bokmål, Polish, Romanian, Russian, Slovak, Slovenian, Spanish, Swedish, Turkish - No advertising and for free - All data belongs to you (no cloud service) diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF36xBLE.java similarity index 97% rename from android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java rename to android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF36xBLE.java index 958be2b8..aa93327f 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF36xBLE.java @@ -29,7 +29,7 @@ import com.health.openscale.core.utils.Converters; import java.util.Arrays; import java.util.UUID; -public class BluetoothExcelvanCF369BLE extends BluetoothCommunication { +public class BluetoothExcelvanCF36xBLE extends BluetoothCommunication { private final UUID WEIGHT_MEASUREMENT_SERVICE = UUID.fromString("0000FFF0-0000-1000-8000-00805f9b34fb"); private final UUID WEIGHT_MEASUREMENT_CHARACTERISTIC = UUID.fromString("0000FFF1-0000-1000-8000-00805f9b34fb"); private final UUID WEIGHT_CUSTOM0_CHARACTERISTIC = UUID.fromString("0000FFF4-0000-1000-8000-00805f9b34fb"); @@ -37,13 +37,13 @@ public class BluetoothExcelvanCF369BLE extends BluetoothCommunication { private byte[] receivedData = new byte[]{}; - public BluetoothExcelvanCF369BLE(Context context) { + public BluetoothExcelvanCF36xBLE(Context context) { super(context); } @Override public String driverName() { - return "Excelvan CF369BLE"; + return "Excelvan CF36xBLE"; } @Override diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java index 9c428605..31d6e00e 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java @@ -45,7 +45,7 @@ public class BluetoothFactory { return new BluetoothDigooDGSO38H(context); } if (name.equals("Electronic Scale".toLowerCase(Locale.US))) { - return new BluetoothExcelvanCF369BLE(context); + return new BluetoothExcelvanCF36xBLE(context); } if (name.equals("VScale".toLowerCase(Locale.US))) { return new BluetoothExingtechY1(context);