From 875e27f417f8b6630461d58f43633718a6e8ec37 Mon Sep 17 00:00:00 2001
From: mspider65 <mspider65@aim.com>
Date: Tue, 15 Sep 2020 22:28:33 +0200
Subject: [PATCH] v2.1.3 - Override Street Mode from app - New Power assist
 level values (2% resolition) - Added Max speed parameters - Fix Bluetooth
 setup when device is already paired

---
 app/build.gradle                              |   4 +-
 .../ebike/tsdz2_esp32/MainActivity.java       |  44 ++++++++-
 .../spider65/ebike/tsdz2_esp32/TSDZConst.java |   5 +
 .../activities/BluetoothSetupActivity.java    |  16 ++-
 .../activities/LevelsSetupActivity.java       |  24 ++---
 .../activities/SystemSetupActivity.java       |  12 +++
 .../ebike/tsdz2_esp32/data/TSDZ_Config.java   |  92 +++++++++---------
 .../main/res/layout/activity_levels_setup.xml |   8 +-
 app/src/main/res/layout/activity_main.xml     |   2 +-
 .../main/res/layout/activity_system_setup.xml |  42 ++++++++
 app/src/main/res/menu/menu_street_mode.xml    |   9 ++
 .../main/res/mipmap-hdpi/street_icon_off.png  | Bin 0 -> 3623 bytes
 .../{street_icon.png => street_icon_on.png}   | Bin
 .../main/res/mipmap-mdpi/street_icon_off.png  | Bin 0 -> 1896 bytes
 .../{street_icon.png => street_icon_on.png}   | Bin
 .../main/res/mipmap-xhdpi/street_icon_off.png | Bin 0 -> 4996 bytes
 .../{street_icon.png => street_icon_on.png}   | Bin
 .../res/mipmap-xxhdpi/street_icon_off.png     | Bin 0 -> 9079 bytes
 .../{street_icon.png => street_icon_on.png}   | Bin
 .../res/mipmap-xxxhdpi/street_icon_off.png    | Bin 0 -> 12009 bytes
 .../{street_icon.png => street_icon_on.png}   | Bin
 app/src/main/res/values/strings.xml           |   5 +
 22 files changed, 193 insertions(+), 70 deletions(-)
 create mode 100644 app/src/main/res/menu/menu_street_mode.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/street_icon_off.png
 rename app/src/main/res/mipmap-hdpi/{street_icon.png => street_icon_on.png} (100%)
 create mode 100644 app/src/main/res/mipmap-mdpi/street_icon_off.png
 rename app/src/main/res/mipmap-mdpi/{street_icon.png => street_icon_on.png} (100%)
 create mode 100644 app/src/main/res/mipmap-xhdpi/street_icon_off.png
 rename app/src/main/res/mipmap-xhdpi/{street_icon.png => street_icon_on.png} (100%)
 create mode 100644 app/src/main/res/mipmap-xxhdpi/street_icon_off.png
 rename app/src/main/res/mipmap-xxhdpi/{street_icon.png => street_icon_on.png} (100%)
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/street_icon_off.png
 rename app/src/main/res/mipmap-xxxhdpi/{street_icon.png => street_icon_on.png} (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 2ca2476..7190079 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "spider65.ebike.tsdz2_esp32"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 9
-        versionName "2.1.2"
+        versionCode 10
+        versionName "2.1.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/spider65/ebike/tsdz2_esp32/MainActivity.java b/app/src/main/java/spider65/ebike/tsdz2_esp32/MainActivity.java
index df0ba3d..b08687b 100644
--- a/app/src/main/java/spider65/ebike/tsdz2_esp32/MainActivity.java
+++ b/app/src/main/java/spider65/ebike/tsdz2_esp32/MainActivity.java
@@ -36,8 +36,10 @@
 import spider65.ebike.tsdz2_esp32.utils.OnSwipeListener;
 
 import android.util.Log;
+import android.view.ContextMenu;
 import android.view.GestureDetector;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
@@ -196,6 +198,7 @@ public boolean onSwipe(Direction direction) {
         });
         brakeIV = findViewById(R.id.brakeIV);
         streetModeIV = findViewById(R.id.streetModeIV);
+        registerForContextMenu(streetModeIV);
 
         fabButton = findViewById(R.id.fab);
         fabButton.setOnClickListener((View) -> {
@@ -230,6 +233,43 @@ public boolean onSwipe(Direction direction) {
         checkBT();
     }
 
+    @Override
+    public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        if (v.getId() != R.id.streetModeIV)
+            return;
+        TSDZBTService service = TSDZBTService.getBluetoothService();
+        if (service == null || service.getConnectionStatus() != TSDZBTService.ConnectionState.CONNECTED)
+            return;
+
+        // create context menu for Street Mode Icon long press
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_street_mode, menu);
+        menu.setHeaderTitle(getResources().getString(R.string.street_mode));
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item){
+        // manage Street Mode icon context menu selection
+        TSDZBTService service = TSDZBTService.getBluetoothService();
+        if (service == null || service.getConnectionStatus() != TSDZBTService.ConnectionState.CONNECTED)
+            return false;
+
+        switch (item.getItemId()) {
+            case R.id.lcd_master:
+                service.writeCommand(new byte[] {TSDZConst.CMD_STREET_MODE, TSDZConst.STREET_MODE_LCD_MASTER});
+                break;
+            case R.id.force_off:
+                service.writeCommand(new byte[] {TSDZConst.CMD_STREET_MODE, TSDZConst.STREET_MODE_FORCE_OFF});
+                break;
+            case R.id.force_on:
+                service.writeCommand(new byte[] {TSDZConst.CMD_STREET_MODE, TSDZConst.STREET_MODE_FORCE_ON});
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
+
     private boolean checkDevice() {
         String mac = MyApp.getPreferences().getString(KEY_DEVICE_MAC, null);
         if (mac != null) {
@@ -370,9 +410,9 @@ private void refreshView() {
             statusTV.setVisibility(View.INVISIBLE);
 
         if (status.streetMode)
-            streetModeIV.setVisibility(View.VISIBLE);
+            streetModeIV.setImageResource(R.mipmap.street_icon_on);
         else
-            streetModeIV.setVisibility(View.INVISIBLE);
+            streetModeIV.setImageResource(R.mipmap.street_icon_off);
 
         switch (status.ridingMode) {
             case OFF_MODE:
diff --git a/app/src/main/java/spider65/ebike/tsdz2_esp32/TSDZConst.java b/app/src/main/java/spider65/ebike/tsdz2_esp32/TSDZConst.java
index d25550b..d0c50ca 100644
--- a/app/src/main/java/spider65/ebike/tsdz2_esp32/TSDZConst.java
+++ b/app/src/main/java/spider65/ebike/tsdz2_esp32/TSDZConst.java
@@ -23,6 +23,11 @@ public interface TSDZConst {
     byte CMD_ESP_OTA_STATUS = 0x05;
     byte CMD_STM8_OTA_STATUS = 0x06;
     byte CMD_ESP32_CONFIG = 0x08;
+    byte CMD_STREET_MODE = 0x09;
+
+    byte STREET_MODE_LCD_MASTER = 0;
+    byte STREET_MODE_FORCE_OFF = 1;
+    byte STREET_MODE_FORCE_ON = 2;
 
     // sub commands of CMD_ESP32_CONFIG
     byte CONFIG_GET = 0;
diff --git a/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/BluetoothSetupActivity.java b/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/BluetoothSetupActivity.java
index 2afcb2d..df263e7 100644
--- a/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/BluetoothSetupActivity.java
+++ b/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/BluetoothSetupActivity.java
@@ -80,9 +80,18 @@ public void onClick(View v) {
         okButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 stopScanning();
-                if (selectedDevice != null && (selectedDevice.getBondState() != BluetoothDevice.BOND_BONDED)) {
-                    if (!selectedDevice.createBond())
-                        showDialog(getString(R.string.error), getString(R.string.pairing_error),true);
+                if (selectedDevice != null) {
+                    if (selectedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
+                        if (!selectedDevice.createBond())
+                            showDialog(getString(R.string.error), getString(R.string.pairing_error), true);
+                    } else {
+                        // device is already bonded
+                        SharedPreferences.Editor editor = MyApp.getPreferences().edit();
+                        editor.putString(KEY_DEVICE_NAME, selectedDeviceString);
+                        editor.putString(KEY_DEVICE_MAC, selectedDevice.getAddress());
+                        editor.apply();
+                        BluetoothSetupActivity.this.showDialog(null, getString(R.string.pairing_done),true);
+                    }
                 } else
                     finish();
             }
@@ -105,7 +114,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 selectedDeviceString = deviceList.get(position);
                 selectedDevice = btDeviceList.get(position);
                 updateDeviceTV();
-                stopScanning();
             }
         });
 
diff --git a/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/LevelsSetupActivity.java b/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/LevelsSetupActivity.java
index f80447b..1ea28bc 100644
--- a/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/LevelsSetupActivity.java
+++ b/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/LevelsSetupActivity.java
@@ -100,27 +100,27 @@ private void saveCfg() {
             return;
         }
 
-        if ((val1 = checkRange(binding.powerAssist1ET, 1, 100)) == null) {
-            showDialog(getString(R.string.power_assist_level_1), getString(R.string.range_error, 1, 100));
+        if ((val1 = checkRange(binding.powerAssist1ET, 10, 500)) == null) {
+            showDialog(getString(R.string.power_assist_level_1), getString(R.string.range_error, 10, 500));
             return;
         }
-        if ((val2 = checkRange(binding.powerAssist2ET, 1, 100)) == null) {
-            showDialog(getString(R.string.power_assist_level_2), getString(R.string.range_error, 1, 100));
+        if ((val2 = checkRange(binding.powerAssist2ET, 10, 500)) == null) {
+            showDialog(getString(R.string.power_assist_level_2), getString(R.string.range_error, 10, 500));
             return;
         }
-        if ((val3 = checkRange(binding.powerAssist3ET, 1, 100)) == null) {
-            showDialog(getString(R.string.power_assist_level_3), getString(R.string.range_error, 1, 100));
+        if ((val3 = checkRange(binding.powerAssist3ET, 10, 500)) == null) {
+            showDialog(getString(R.string.power_assist_level_3), getString(R.string.range_error, 10, 500));
             return;
         }
-        if ((val4 = checkRange(binding.powerAssist4ET, 1, 100)) == null) {
-            showDialog(getString(R.string.power_assist_level_4), getString(R.string.range_error, 1, 100));
+        if ((val4 = checkRange(binding.powerAssist4ET, 10, 500)) == null) {
+            showDialog(getString(R.string.power_assist_level_4), getString(R.string.range_error, 10, 500));
             return;
         }
         if (val2>val1 && val3>val2 && val4>val3) {
-            cfg.ui8_power_assist_level[0] = val1;
-            cfg.ui8_power_assist_level[1] = val2;
-            cfg.ui8_power_assist_level[2] = val3;
-            cfg.ui8_power_assist_level[3] = val4;
+            cfg.ui8_power_assist_level[0] = val1/2;
+            cfg.ui8_power_assist_level[1] = val2/2;
+            cfg.ui8_power_assist_level[2] = val3/2;
+            cfg.ui8_power_assist_level[3] = val4/2;
         } else {
             showDialog(getString(R.string.power_mode), getString(R.string.level_error));
             return;
diff --git a/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/SystemSetupActivity.java b/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/SystemSetupActivity.java
index f4f9429..29b91a7 100644
--- a/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/SystemSetupActivity.java
+++ b/app/src/main/java/spider65/ebike/tsdz2_esp32/activities/SystemSetupActivity.java
@@ -155,9 +155,21 @@ private void saveCfg() {
         }
         cfg.ui16_wheel_perimeter = val;
 
+        if ((val = checkRange(binding.maxSpeedET, 10, 60)) == null) {
+            showDialog(getString(R.string.max_speed), getString(R.string.range_error, 10, 60));
+            return;
+        }
+        cfg.ui8_max_speed = val;
+
         checked = binding.cruiseModeCB.isChecked();
         cfg.ui8_cruise_enabled = checked;
 
+        if ((val = checkRange(binding.maxStreetSpeedET, 10, 45)) == null) {
+            showDialog(getString(R.string.max_speed), getString(R.string.range_error, 10, 45));
+            return;
+        }
+        cfg.ui8_street_max_speed = val;
+
         checked = binding.streetPowerCB.isChecked();
         if (checked) {
             if ((val = checkRange(binding.streetPowerET, 50, 1000)) == null) {
diff --git a/app/src/main/java/spider65/ebike/tsdz2_esp32/data/TSDZ_Config.java b/app/src/main/java/spider65/ebike/tsdz2_esp32/data/TSDZ_Config.java
index 21c53c3..88f0c17 100644
--- a/app/src/main/java/spider65/ebike/tsdz2_esp32/data/TSDZ_Config.java
+++ b/app/src/main/java/spider65/ebike/tsdz2_esp32/data/TSDZ_Config.java
@@ -40,7 +40,8 @@ public int getValue() {
     public int ui8_motor_temperature_max_value_to_limit;
     public int ui8_motor_acceleration;
     public int ui8_dummy;
-    public int ui16_dummy;
+    public int ui8_max_speed;
+    public int ui8_street_max_speed;
     public int ui8_pedal_torque_per_10_bit_ADC_step_x100;
     public TempControl temperature_control;
     public boolean throttleEnabled;
@@ -59,7 +60,7 @@ public int getValue() {
     public int ui8_li_io_cell_full_bars_x100;
     public int ui8_li_io_cell_one_bar_x100;
     public int ui8_li_io_cell_empty_x100;
-    public boolean ui8_street_mode_enabled;
+    public boolean ui8_dummy2;
     public boolean ui8_street_mode_power_limit_enabled;
     public boolean ui8_street_mode_throttle_enabled;
     public int ui8_street_mode_power_limit_div25;
@@ -74,43 +75,43 @@ public int getValue() {
 
     /*
     #pragma pack(1)
-    typedef struct _tsdz_cfg
-    {
-      volatile uint8_t ui8_motor_type;
-      volatile uint8_t ui8_motor_temperature_min_value_to_limit;
-      volatile uint8_t ui8_motor_temperature_max_value_to_limit;
-      volatile uint8_t ui8_motor_acceleration;
-      volatile uint8_t ui8_cadence_sensor_mode;
-      volatile uint16_t ui16_cadence_sensor_pulse_high_percentage_x10;
-      volatile uint8_t ui8_pedal_torque_per_10_bit_ADC_step_x100;
-      volatile uint8_t ui8_optional_ADC_function;
-      volatile uint8_t ui8_assist_without_pedal_rotation_threshold;
-      volatile uint8_t ui8_lights_configuration;
-      volatile uint16_t ui16_wheel_perimeter;
-      volatile uint8_t ui8_cruise_enabled;
-      volatile uint16_t ui16_battery_voltage_reset_wh_counter_x10;
-      volatile uint8_t ui8_battery_max_current;
-      volatile uint8_t ui8_target_max_battery_power_div25;
-      volatile uint8_t ui8_battery_cells_number;
-      volatile uint16_t ui16_battery_pack_resistance_x1000;
-      volatile uint16_t ui16_battery_low_voltage_cut_off_x10;
-      volatile uint8_t ui8_li_io_cell_overvolt_x100;
-      volatile uint8_t ui8_li_io_cell_full_bars_x100;
-      volatile uint8_t ui8_li_io_cell_one_bar_x100;
-      volatile uint8_t ui8_li_io_cell_empty_x100;
-      volatile uint8_t ui8_street_mode_enabled;
-      volatile uint8_t ui8_street_mode_power_limit_enabled;
-      volatile uint8_t ui8_street_mode_throttle_enabled;
-      volatile uint8_t ui8_street_mode_power_limit_div25;
-      volatile uint8_t ui8_street_mode_speed_limit;
-      volatile uint8_t ui8_esp32_temp_control;
-      volatile uint8_t ui8_cadence_assist_level[4];
-      volatile uint8_t ui8_power_assist_level[4];
-      volatile uint8_t ui8_torque_assist_level[4];
-      volatile uint8_t ui8_eMTB_assist_level[4];
-      volatile uint8_t ui8_walk_assist_level[4];
-      volatile uint8_t ui8_torque_offset_fix;
-      volatile uint16_t ui16_torque_offset_value;
+    typedef struct _tsdz_cfg {
+        volatile uint8_t ui8_motor_inductance_x1048576;
+        volatile uint8_t ui8_motor_temperature_min_value_to_limit;
+        volatile uint8_t ui8_motor_temperature_max_value_to_limit;
+        volatile uint8_t ui8_motor_acceleration;
+        volatile uint8_t ui8_dummy;
+        volatile uint8_t ui8_max_speed;
+        volatile uint8_t ui8_street_max_speed;
+        volatile uint8_t ui8_pedal_torque_per_10_bit_ADC_step_x100;
+        volatile uint8_t ui8_optional_ADC_function;
+        volatile uint8_t ui8_assist_without_pedal_rotation_threshold;
+        volatile uint8_t ui8_lights_configuration;
+        volatile uint16_t ui16_wheel_perimeter;
+        volatile uint8_t ui8_cruise_mode_enabled;
+        volatile uint16_t ui16_battery_voltage_reset_wh_counter_x10;
+        volatile uint8_t ui8_battery_max_current;
+        volatile uint8_t ui8_target_max_battery_power_div25;
+        volatile uint8_t ui8_battery_cells_number;
+        volatile uint16_t ui16_battery_pack_resistance_x1000;
+        volatile uint16_t ui16_battery_low_voltage_cut_off_x10;
+        volatile uint8_t ui8_li_io_cell_overvolt_x100;
+        volatile uint8_t ui8_li_io_cell_full_bars_x100;
+        volatile uint8_t ui8_li_io_cell_one_bar_x100;
+        volatile uint8_t ui8_li_io_cell_empty_x100;
+        volatile uint8_t ui8_dummy2;
+        volatile uint8_t ui8_street_mode_power_limit_enabled;
+        volatile uint8_t ui8_street_mode_throttle_enabled;
+        volatile uint8_t ui8_street_mode_power_limit_div25;
+        volatile uint8_t ui8_street_mode_speed_limit;
+        volatile uint8_t ui8_esp32_temp_control;
+        volatile uint8_t ui8_cadence_assist_level[4];
+        volatile uint8_t ui8_power_assist_level[4];
+        volatile uint8_t ui8_torque_assist_level[4];
+        volatile uint8_t ui8_eMTB_assist_sensitivity[4];
+        volatile uint8_t ui8_walk_assist_level[4];
+        volatile uint8_t ui8_torque_offset_fix;
+        volatile uint16_t ui16_torque_offset_value;
     } struct_tsdz_cfg;
     */
 
@@ -124,7 +125,8 @@ public boolean setData(byte[] data) {
         ui8_motor_temperature_max_value_to_limit = (data[2] & 255);
         ui8_motor_acceleration = (data[3] & 255);
         ui8_dummy = (data[4] & 255 ); // ui8_cadence_sensor_mode
-        ui16_dummy = (data[5] & 255) + ((data[6] & 255) << 8);
+        ui8_max_speed = (data[5] & 255);
+        ui8_street_max_speed = (data[6] & 255);
         ui8_pedal_torque_per_10_bit_ADC_step_x100 = (data[7] & 255);
         throttleEnabled = (data[8] & 255) == 2;
         ui8_assist_without_pedal_rotation_threshold = (data[9] & 255);
@@ -142,7 +144,7 @@ public boolean setData(byte[] data) {
         ui8_li_io_cell_full_bars_x100 = (data[24] & 255) + 200;
         ui8_li_io_cell_one_bar_x100 = (data[25] & 255) + 200;
         ui8_li_io_cell_empty_x100 = (data[26] & 255) + 200;
-        ui8_street_mode_enabled = (data[27] & 255) != 0;
+        ui8_dummy2 = (data[27] & 255) != 0;
         ui8_street_mode_power_limit_enabled = (data[28] & 255) != 0;
         ui8_street_mode_throttle_enabled = (data[29] & 255) != 0;
         ui8_street_mode_power_limit_div25 = (data[30] & 255) * 25;
@@ -174,9 +176,9 @@ public byte[] toByteArray() {
         data[1] = (byte)ui8_motor_temperature_min_value_to_limit;
         data[2] = (byte)ui8_motor_temperature_max_value_to_limit;
         data[3] = (byte)ui8_motor_acceleration;
-        data[4] = (byte)ui8_dummy; // ui8_cadence_sensor_mode
-        data[5] = (byte)ui16_dummy;
-        data[6] = (byte)(ui16_dummy >>> 8);
+        data[4] = (byte)ui8_dummy;
+        data[5] = (byte)ui8_max_speed;
+        data[6] = (byte)(ui8_street_max_speed);
         data[7] = (byte)ui8_pedal_torque_per_10_bit_ADC_step_x100;
         data[8] = (byte)(throttleEnabled ? 2:0); // ui8_optional_ADC_function
         data[8] = temperature_control == TempControl.tempADC ? (byte)1:data[8]; // ui8_optional_ADC_function
@@ -198,7 +200,7 @@ public byte[] toByteArray() {
         data[24] = (byte)(ui8_li_io_cell_full_bars_x100 - 200);
         data[25] = (byte)(ui8_li_io_cell_one_bar_x100 - 200);
         data[26] = (byte)(ui8_li_io_cell_empty_x100 - 200);
-        data[27] = (byte)(ui8_street_mode_enabled? 1:0);
+        data[27] = (byte)(ui8_dummy2 ? 1:0);
         data[28] = (byte)(ui8_street_mode_power_limit_enabled? 1:0);
         data[29] = (byte)(ui8_street_mode_throttle_enabled? 1:0);
         data[30] = (byte)(ui8_street_mode_power_limit_div25/25);
diff --git a/app/src/main/res/layout/activity_levels_setup.xml b/app/src/main/res/layout/activity_levels_setup.xml
index e587bf4..78c34bb 100644
--- a/app/src/main/res/layout/activity_levels_setup.xml
+++ b/app/src/main/res/layout/activity_levels_setup.xml
@@ -169,7 +169,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="5dp"
                         android:ems="4"
-                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[0])}"
+                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[0]*2)}"
                         android:inputType="number" />
                 </LinearLayout>
 
@@ -190,7 +190,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="5dp"
                         android:ems="4"
-                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[1])}"
+                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[1]*2)}"
                         android:inputType="number" />
                 </LinearLayout>
 
@@ -211,7 +211,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="5dp"
                         android:ems="4"
-                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[2])}"
+                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[2]*2)}"
                         android:inputType="number" />
                 </LinearLayout>
 
@@ -232,7 +232,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="5dp"
                         android:ems="4"
-                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[3])}"
+                        android:text="@{String.valueOf(cfg.ui8_power_assist_level[3]*2)}"
                         android:inputType="number" />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d77f36c..7686fe5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -115,7 +115,7 @@
                     android:id="@+id/streetModeIV"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@mipmap/street_icon" />
+                    android:src="@mipmap/street_icon_on" />
             </LinearLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_system_setup.xml b/app/src/main/res/layout/activity_system_setup.xml
index 35b6589..1c871bf 100644
--- a/app/src/main/res/layout/activity_system_setup.xml
+++ b/app/src/main/res/layout/activity_system_setup.xml
@@ -298,6 +298,27 @@
                         android:inputType="number" />
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="5dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/max_speed" />
+
+                    <EditText
+                        android:id="@+id/maxSpeedET"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:ems="4"
+                        android:text="@{String.valueOf(cfg.ui8_max_speed)}"
+                        android:inputType="number" />
+                </LinearLayout>
+
                 <CheckBox
                     android:id="@+id/cruiseModeCB"
                     android:layout_width="wrap_content"
@@ -321,6 +342,27 @@
                     android:layout_marginTop="5dp"
                     android:text="@string/street_mode" />
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="5dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/max_speed" />
+
+                    <EditText
+                        android:id="@+id/maxStreetSpeedET"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:ems="4"
+                        android:text="@{String.valueOf(cfg.ui8_street_max_speed)}"
+                        android:inputType="number" />
+                </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/app/src/main/res/menu/menu_street_mode.xml b/app/src/main/res/menu/menu_street_mode.xml
new file mode 100644
index 0000000..75311e5
--- /dev/null
+++ b/app/src/main/res/menu/menu_street_mode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:id="@+id/lcd_master"
+        android:title="@string/lcd_master"/>
+    <item  android:id="@+id/force_off"
+        android:title="@string/off" />
+    <item  android:id="@+id/force_on"
+        android:title="@string/on"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/street_icon_off.png b/app/src/main/res/mipmap-hdpi/street_icon_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e04209c46c2637c1ade78d88b8b16983904575e
GIT binary patch
literal 3623
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-hdpi/street_icon.png b/app/src/main/res/mipmap-hdpi/street_icon_on.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/street_icon.png
rename to app/src/main/res/mipmap-hdpi/street_icon_on.png
diff --git a/app/src/main/res/mipmap-mdpi/street_icon_off.png b/app/src/main/res/mipmap-mdpi/street_icon_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..62e9752bfdef68d971d6eb58d3b9a059eac6af53
GIT binary patch
literal 1896
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/street_icon.png b/app/src/main/res/mipmap-mdpi/street_icon_on.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/street_icon.png
rename to app/src/main/res/mipmap-mdpi/street_icon_on.png
diff --git a/app/src/main/res/mipmap-xhdpi/street_icon_off.png b/app/src/main/res/mipmap-xhdpi/street_icon_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..e160a59f3324cd8d46ef328fe4fed1206c1a7a34
GIT binary patch
literal 4996
zcma)g`9IX}_x=-MY#Fi)kzGjE?6OYTN=!wKEsdotiLsMC>sYeHXe_BoVk|L97-}rh
zWXTvU7)y+OXDl!I%=;hsKE6NP_x;Oxoclb^eXi?V_ery}wcz0t<pcnL$I224W1RQ?
zw?J%+eWoZ(7XZ%KSV2v1g}bggM>RR$jyNH-)AhUu#?etM>P^F)=}f5W&}yc+X_n|F
zAD27Troznq=GCdUoYKv>I0+Xn;we4_DQz{m?>ui8n%P%esqbz|mlx_TVy$Z6h#xmV
zde37TC0sgY_3oZ0wzp^^z1OC*fB8-nL?QQPG3(8A`s(^oOq6D(O%?wX%tC_K76Dk7
zo<aaUK)!N(Zi+-*oH`(9Q~r0l_rg7HlRkchi2Y4Y2#ekOQ`YBV+L-@;%>HrUnK8)4
zBeh0i#{qS_?`>gZL`hr63{~!%k@!CjCKLGwlT8mtW+%P7(*>RD#`L&}$AiCDKl~v)
zX`T2Oh~O0Xjl0`;b&B40Zt0RJPqX*nxs=FmLSyJ!8gO+HFxh{h?ayx^9zuR;UDcXu
zsYjbM*3&ys)zsAVR@*Kc)Vhg27_i1}Rfba*ga7sD(SNio>Cudg^z<UONhFel#`aN~
zr7!MA#KvcK3C4Y|E}l(-F@1d+J092@k$H8NU;2~SmdE_)Kub|-tz5+z>6OwW4&p|%
zp>Ok_6BB3vrgG9TZNb@VuLNn3`qm8UNLk*^9uK2F>3djN;?;la3YMkb|Bv<!ko}F^
zzbVkB^i%>4Z*<1Y-g^4Pfh1Et=z}}asHU4rM=l%g?%nY%^T&l)SG`DG=!Q1kv_7Z_
zZJqd8@1CfF6wK%B#5GSUIpW}RV?KCCzF{1iiC_t8=z~Y0kZZo|=#rBMxMQG{OG-ti
z!q_OaA*KL4(@XiCInYx5KC)8l#rL|^@fOYhd13>|gU>HIk;&v+KOZ&g@C~o?*+Ze{
z6|v{6a{u~y#ZaToLI#e{YX%I2>YUfyM)JbwoP*o7V{qfN)HNyTveY#Y@$u}=PH-#f
zww*k1zc))frg}8;6XlSdq+Egw<B*z^#*%xAUX&mQC6Z&j=3BA(-Vj7Seh*2CPDc*t
z(z0F@7auMzjaDPPJ`f?*R3mF9pfPrP{`*!v@pSbaU)8XIIfD`#l)77&g{5NbH7GvD
z_(AF6bp%QMZbyJ*MYhKUni7^Q*c!IJhKb(ld&BKyCj{L8^TEF#qG<{>K3_41p2{kK
zeR)tig|Uf;IJnR2fTY&6dOF{pNG^w|@`+!>VqBUZiK8}i>k{PHC8?3McN^tF2~*0n
z@k&ki@y{fhldp_a*Oh@5W0B_@nzR2nd{=LqrFQD2_+Ril-L}?jVIMrZxBBOm1}aby
z=-lVGAEh71%2fz^B*c`#mXc+y>Qzs+KBJZ-J3Ako8TP$Am<L~Gq+0N<@yR2U-Y7)V
zDOp{GC62s5Kq47tpgYPqq=E*-ZJ<X}XLM;Fc%=V6{jIjG@9R(0(~(Px6HU08Tr{$o
zmzQU(M1-g+0xg>^EkT};-c2h1upWAdkVwT-#0R%sS1^ghCcBmaJ$7>*EoPP%bgcjb
zFC$H>+<*&M$^GTjg)4XGmZPb$W3?`=zis?cg`&XbR3dL=V`JkDezX6QQlEQjZrsO`
z3ybuI;fNGw!N8#zj6oUtrGr{xSud#!{+5UDiK}8r6>?w%-cgD^QSxmZgdd^O($Xxl
z^q1axC}wWvGUc45;(f;)lE5@w+CLRX<Hv+1O6x{5Z0WQ#ydy^qhp#Ju{R8dR;5)vN
zPTK6wO8<U`x6Q1B`N;7-$xco16LfiiYhR0JKewQaRd<B}V0zl@M<r}he}tEI)cXDT
z?brDir4RiPq}W}4`LKa@JH@9LmA|~O(A*A-0y?b}%gmu2+C8^QkYk;S-+mweglvDo
zYWLW1#C@bsMkO+0J%c`=a+(p6&;e2vkj76Ix0x;c+rcv@?*%uUdWvwD0U%`ev{Y9i
zU)JLRsf1#E&yHb_HBUy8=$OY}IEG<WFXfmdvyaF=cx$oVGUbKv=$(dA+Nws+Pi4E%
ztGo$Ku>Q)PK*PjOg!LPuh?umG&b<BsUh^5R^QEnF3rMI5JC&5PjA!s}{I#My`aHM_
zu*?i-{N=2OP5K=t5vLetz}H@q>Qw-fzG*!4ol6kXFY`*lnhBI}?}r|pOL|Ml#}e9F
zp4>#)h@4J~Ek?&0`=&t1!+5y=7))gL8H?Q|0tv-UDPWaqAJhwT$(0qylBa)7wiVtT
zzdv6|1Hwxk&sUVGBY(006nIn(<<Na_TZx2P^<B$<c`yg-uWo)c@!ORX(IyKBpj5@`
z@aP<Ua8mx(Glg{S=P}RumQ9mSdHcBF;ny8asz-}GymSMAiozhdTkhafFi^udq){%c
zKXrjgT3;%I*By(EpxGBNqO$yS4=r=KsBj&EnDj$E<dnK&ePHDk^CVm15W=s0=FAx$
za#=|UPG;H+nzHj_Qjac&AQ?Q9%Y#u~=a;GKdM?apefQel!&*{M0&%skzhy#qmYhun
zS~5zIZX1SmIDD;!rk5*Tn2F!M*lUG(s)IL|u(I}H4&zjv?;~f$ud%(zTFD&}z(w4s
z`JWTfxJzpze%fU-7^1d%NaPl&5V__a-hsZ6<JBCg+*))H0bdSgRltIc4|%1Ry5nf(
zm}^iv@q*VpF~e45G8;X{;NlbUkmv^<fIyx~Pf>?t1zpJN#D(%3sZ?Oi;?oI9Od|cG
zU5=|~Pae@5Gj;K*jqCqHveesy8!2J`(<QrAj>L1e)=uTW<TX42=W11Ag3{OUBQeXF
z0sw@nkp3ngMkju|*ft)8r|767xgMHP=^gnEf`?B|y2&S@V!d@1hk5ApN#G4*BlyC`
z7<}2A%~b7jzsL8lK-}h)AKlw+j22kNDe+w2t(?J1{O(+Rq?5eWK4F=mm_Gyhw9-;p
zD|67ajUw-QQ2$gVrc}1i|J5}L>QvnLzL%BoslL5N%2f1SU+VnPziX`%+NHGird|_x
z2eWHE0l5}pl{+qy{1P=A4g+nX86>qA))V-j{z|aLoJck&gWa@6Gk4Xp?imWa4s4+u
z!hKh3){h>4n#?;^R;cH@wGZKYqMU`ekW^%6UE&zr--(H9s2f{$vhYNuoHlX%!Fq1K
zl`FxfMAdh7%?JPcq4taT^&=_+3o_shGnYw;-c1`HJe+|-B~x(CLQwzEKOe=pxmWjX
zQOt4qn>oWgu~(rfLa*z8L69HvgMQPWOe_Z1ukaE3nk%_D{C*C~_^v)Hu=bSCLeyV+
z^E!X*4Bv;h5fS9=wn{~8@vBr`9>F;2+0XRj#<Yd?4F1GzPgD!mwN7XAWHt0`>AE+2
z&Qdc58Ag*r&@lJBaz46hn79S-5W%f#K9@u{(y2e^@~4Mc1I65oIT41zKu}L2EyB%v
zK97^xbmka}AQ4T$P3p6+^FbsjHgbTe<q?|{^pkNjMfy|vrFoMlA_$e<bX0``Db&1N
zRmgGfa-dj8kU&rPPvCD4{g((kvg4kqLDF`Cx&(g`5KXmsy!JH)yN)@khjBU&lKISY
zU3_^|7O}^BSD+oKv-{ym&>B3*TQv`sAjB&a(t!EtryZ-i;_-b5SkNGRr4w3~SteiM
z2`zA(HcCBJ?cA`hP_@%ra1(gukfB3*8r8VXeOG@0UI6f8MU?NdEcUNM^=(J%_;YT-
z{X_o6H6q%``$fQOt3umK<ejU+XeAKwuCI=V`hF-LUVwAps&tEV*D$nwGtd%tM2H<h
zWM57;)DRE)DmAK`HRv&4&CUco?DxS(BCA<@$8S9aS0{l%_QG?TJcl+|*ssgi5QYLk
zx|OiBem45^f#UN3CG4comEk6J`MoC+J0>0#kvzr{Lm~@FAjK5-BIcn-&Cl+|vS=m-
z{R}g8ThPp!wY26~(kFuz@>Eqr=P^;jd@h>T=DUUf1zDH1(nN<`eK%8Z=g}1<a1)eN
zFLU^u5+I5}pbp-xA1MMNBg__PlMkY=4F!5P*&x5vxUUFY$+NCPw!RNr2&-0~KY)Zy
zd<rqQqHuFDO3$ut%xwyD<TdtV)lyNX>CfuKzR95ZPNAvQXIn%$^P5J>;hr>LmRcCr
zjX7LBg3`v1t#Uh!ZWGlE{Z3bMzuOVSIV`slHF`4G%D;xERxI2sKMA?`r`2%Kpmo$|
z)rk-t@fyEpP%_}eY4P+>P$0ph&Nlb2fji{Q)sGX8QWzjjMF%XmHr6l|@fTRnA+4*z
z*C*Re@o<+n_^WSf7V_O!Uc4J!VkKHrxLM+&mk<6bmlbQA+e$#Zf%Q9KkeNRCcV{!N
zE?`=pp#xR?hPK}8X05XTy1W>1<QG1<jZ8Kr-RvHccYLmfmX;j4<q;}ECaWbh1Vlyn
zx4WK<s?C^ZFiYwXmdEON@f6|jfp0E^5OQVXvr4*CZYdQM!#EdvOShVlR%cGTVqphX
zV!c%oQ%5n_kwrtI9{aoL@;P<f?r+=5yvRjH2MsR`JEa+B;CYADQ2|>kdiA~6Fhg?9
zC_JMa9+9Gh$Ho%VqHSwqyu7^B8gsZ7&L8jV#>0KfW-&*eI0u{Cc8$NFuJkH1(2%I`
zP213c<9k6tKLp5N?jt5!G;)n*T{Ww|b3adu5wW-7wQJYff@+J5?i-iVCNQ#n++^PI
zqtI5K070pRZh>%e_I;N8kOZ7eLQLXX!dBS99Z2%yd9e8HQrdNSE9O`^Z~OIF?;!;z
z97RXy8wLVl5Xj3>p9zf=Tk3kW>2Zy73xAkSobK+^wd39UIglWyl_^^W<*mB3hN_e8
zu0obW`_)#)7<KTZp(k7&c-<2g8F`qB%1gX^N4aX7byrhMYxGy6cXm;6G5jTda<ZUY
z<UKe0`e_abmR!8JxOn-3Lrwk2$Vh>o&JJ2np66><@3rgKFE>FDhG4)2#g2h>gl7#B
zt|^9GBxl1o*;OCQF$J%Dw(a0mX_vxxS%08B8lZ~!So-o*Dqk*eQzmgcbQff(_arjs
z$h$OAz7>g}nuwn!FNP3IB<gM{HR2q;-LG3a`j?WrAa0&JYWc}jS0=r}rlA|>P+c*y
zc<qj_X{_oG;q8Vn16r27_3BwNg!h!mKsZBdXV2>oJ{>}?MNgYYQ)#+c=bI>0$lhYF
z`>VK-eCsO5eS-1X-Ueb<yr^~V-$Rv2JN-*yg9_;cjR)`F1OVwM_Q7p}{-6zZz>y(A
z<SS0~6-KuI^Pr92h<csF>r{KZlL8rBza*OJCS^4nQOc`zDf=c{*;K8p6*xsSRZkrR
z=uLpLcu)6*(Br#~(oDgIr*<2|)?Mvx+$#?}oJ)?8RlhM&0^Q*eQ~etABdzFI(swt%
zJ8K#fl?Pk8uo`LrCq%a-iKbV8UhwF8E)G-7K7V%_#EtqGi*!NgtS0J<xw3ui^LpP2
z)B~j+p9IN$HCye|rn(!UC)~pNir633tSI&J_D-q)mTNC9m=Fb50sXI|Ih4ad+q-X)
zjiw_eJriYp4_O%m&}miJ`}9l@jcciL_(4~-1MW-T4m?-(&P89g+^_MO;Pn=U0&WW`
zKEq(bv&{RDuU+kaAcS8b>>Rs6J(6a7vu^Cz2d}SHcJnGUyF2i|CN*yFL#>`COm=Dn
znot({T)kM}e-@xkwFhG12a=#RIF5~?F=NbrYKcvN>_5=LRfE62@L-4OtW45dPmvEd
z*;kr>D)W3~d@5b+1>_E7-&4*RQ59{y2=&7coJZ=s$29?$s928-+x`W~hZ2&}Ui2;J
zrK5jF;i(^gskQQPId(Za)EJlNlm`)N@dRd5O%VGr@K^b33RmgB@?K&jl3=zc4xzCy
z#9jti;gJWl3(qJe#>YJ&3Y9}vh}Kz(y<vT@7xN^6z@)n~WX`g&nI~&X0rhP}JIJUc
z;?7#y-ud(p!v=VKVd7|JGa`U13X%8NL7+Z3R)9O2#hZA~t$y5|!-!+&(&^=R@Ed%s
zrD8_#*V2ui>4ufIFUmhEC#dm5Q1B^$iQNh|C_#qcLjG(UiWT}~2>{NjX=hK<SN}Mg
zf*`7Vy$zs*&gti8#6GaJ%UI=x6O(xs{gc31`5FL?&9VCdE>NY~dkWd7h`lCoMIV%K
z+CdoT!RLi%(V2&eu=WDCl?u`eWv!@^-oi&B&S;jkTy^<=)5-Uq8C{P~2aAfW5pfsn
z1*BY)!czG}-9Gr;t)#wy9PvYIlO5_@abP%GtCTPpRLg+8u3x3*G_CMm`tI`Bx6oFc
zj}~~)!wn%+sd9%4B)I;w!CY8%RQG4p?xkI>0uwYtP04ecw}&h{<Rzl~RZQaAO~1&?
z2qD<#D-_-%+Z|OAbUD<Q+g}zhHh&z|mN=zDo}sUOv&(3n5n85i1x<u(IX!j{`gB7z
zD-tu)95C5-5H}i9PlqoU95I)-HqJ~8w2RS{DQ*kh^O2L^AZT}Ia@ekhZ3oqeN>^FB
z!p=AI@q0W!W1O^wg0QHum3wgH8~zv0iegf@%Phxh?8?NLMm;y_BW62xLgI4e?6x*$
e1^*vrC&vA<Wpu)0_!MKh23TFOh1QzgOZY!8X|rnp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/street_icon.png b/app/src/main/res/mipmap-xhdpi/street_icon_on.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/street_icon.png
rename to app/src/main/res/mipmap-xhdpi/street_icon_on.png
diff --git a/app/src/main/res/mipmap-xxhdpi/street_icon_off.png b/app/src/main/res/mipmap-xxhdpi/street_icon_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a3513e8cf82e5e7c43a0fcaa365e4ed0a475c0
GIT binary patch
literal 9079
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/street_icon.png b/app/src/main/res/mipmap-xxhdpi/street_icon_on.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/street_icon.png
rename to app/src/main/res/mipmap-xxhdpi/street_icon_on.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/street_icon_off.png b/app/src/main/res/mipmap-xxxhdpi/street_icon_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c23120eb8c18e55b512e5cf9e927c1601b60f5
GIT binary patch
literal 12009
zcmeHt^<PtO*#8+h$ss5yB}yuc5D=ss3W$J10YM1~fgvGXWAs4U2~0`}K?Nx%Eh#w(
zL6Gk5W-zvApYQAYUp&tbJNx16+^@6yy6)>8*A-)AaG#lhhXDWpW?dZ^obuiD-v>-b
zxxy!0=m9_w(1mF}_Osj!zJR%M-`i*M%Nlb3-c{xgoz^d!JgB%Lpg&w>AR1EFT^u+A
zfy!%i7m-aG|9q*^Z(P_l)RA$B2A}*+(EvlDxhi=o&0IhosIvG-m-fo~)vYhJ%2r<y
zBoo8NR|luREoytQ^VDmmJtb#PCIi=RimaI!TgQrP7}p;KtSZpLm{IR9e0oo%0DKBK
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
L2C#2h)?xnx^eWAw

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/street_icon.png b/app/src/main/res/mipmap-xxxhdpi/street_icon_on.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/street_icon.png
rename to app/src/main/res/mipmap-xxxhdpi/street_icon_on.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 54aa3d4..cb7d7f4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,6 +206,11 @@
     <string name="title_activity_chart">Charts</string>
     <string name="assistLevel">Assist Level</string>
 
+    <string name="on">Force On</string>
+    <string name="off">Force Off</string>
+    <string name="lcd_master">LCD Master</string>
+    <string name="max_speed">Max Speed</string>
+
     <string name="hal_1">HAL 1</string>
     <string name="hal_2">HAL 2</string>
     <string name="hal_3">HAL 3</string>