mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-22 16:23:09 +02:00
Code Issues Releases Wiki Activity

deviceName() -> driverName()

Browse Source
This commit is contained in:
Erik Johansson
2018-04-14 20:33:18 +02:00
parent 1bdec6a164
commit 20411a69e8
16 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerBF700_800.java
View File

@@ -120,7 +120,7 @@ public class BluetoothBeurerBF700_800 extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Beurer BF700/710/800 / Runtastic Libra";
}

4
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@@ -114,11 +114,11 @@ public abstract class BluetoothCommunication {
}
/**
* Return the Bluetooth device name
* Return the Bluetooth driver name
*
* @return a string in a human readable name
*/
abstract public String deviceName();
abstract public String driverName();
/**
* State machine for the initialization process of the Bluetooth device.

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java
View File

@@ -42,7 +42,7 @@ public class BluetoothCustomOpenScale extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Custom Open Scale";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothDigooDGSO38H.java
View File

@@ -38,7 +38,7 @@ public class BluetoothDigooDGSO38H extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Digoo DG-SO38H";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExcelvanCF369BLE.java
View File

@@ -41,7 +41,7 @@ public class BluetoothExcelvanCF369BLE extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Excelvan CF369BLE";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothExingtechY1.java
View File

@@ -38,7 +38,7 @@ public class BluetoothExingtechY1 extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Exingtech Y1";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothHesley.java
View File

@@ -36,7 +36,7 @@ public class BluetoothHesley extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Hesley scale";
}

3
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothIhealthHS3.java
View File

@@ -49,8 +49,7 @@ public class BluetoothIhealthHS3 extends BluetoothCommunication {
}
@Override
public String deviceName() {
Log.w("openscale","ihealthHS3 - DeviceName - returning iHealth HS33FA4A");
public String driverName() {
return "iHealth HS33FA4A";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java
View File

@@ -79,7 +79,7 @@ public class BluetoothMGB extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "SWAN";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMedisanaBS444.java
View File

@@ -41,7 +41,7 @@ public class BluetoothMedisanaBS444 extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Medisana BS444";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
View File

@@ -49,7 +49,7 @@ public class BluetoothMiScale extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Xiaomi Mi Scale v1";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java
View File

@@ -53,7 +53,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Xiaomi Mi Scale v2";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothOneByone.java
View File

@@ -40,7 +40,7 @@ public class BluetoothOneByone extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "1byone scale";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSanitasSbf70.java
View File

@@ -114,7 +114,7 @@ public class BluetoothSanitasSbf70 extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return "Sanitas SBF70/SilverCrest SBF75";
}

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothYunmaiSE_Mini.java
View File

@@ -47,7 +47,7 @@ public class BluetoothYunmaiSE_Mini extends BluetoothCommunication {
}
@Override
public String deviceName() {
public String driverName() {
return isMini ? "Yunmai Mini" : "Yunmai SE";
}

4
android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
View File

@@ -97,7 +97,7 @@ public class BluetoothPreferences extends PreferenceFragment {
}
});
// Do old school bluetooth discovery first and BLE scan afterwards
// Do classic bluetooth discovery first and BLE scan afterwards
btAdapter.startDiscovery();
}
@@ -158,7 +158,7 @@ public class BluetoothPreferences extends PreferenceFragment {
prefBtDevice.setOnPreferenceClickListener(new onClickListenerDeviceSelect());
prefBtDevice.setKey(device.getAddress());
prefBtDevice.setIcon(R.drawable.ic_bluetooth_connection_lost);
prefBtDevice.setSummary(btDevice.deviceName());
prefBtDevice.setSummary(btDevice.driverName());
int tintColor = new EditText(getActivity()).getCurrentTextColor();
prefBtDevice.getIcon().setColorFilter(tintColor, PorterDuff.Mode.SRC_IN);