Add torque sensor threshold

Author: casainho

firmware/common/include/eeprom.h

@@ -152,6 +152,7 @@ typedef struct eeprom_data {
   uint8_t ui8_adc_lights_current_offset;
   uint8_t ui8_throttle_virtual_step;
   uint8_t ui8_torque_sensor_filter;
+  uint8_t ui8_torque_sensor_adc_threshold;
   uint8_t ui8_coast_brake_enable;
 
 // FIXME align to 32 bit value by end of structure and pack other fields
@@ -280,6 +281,7 @@ void eeprom_init_defaults(void);
 #define DEFAULT_ADC_LIGHTS_CURRENT_OFFSET                           1
 #define DEFAULT_THROTTLE_VIRTUAL_STEP                               5
 #define DEFAULT_TORQUE_SENSOR_FILTER                                20 // 20%
+#define DEFAULT_TORQUE_SENSOR_ADC_THRESHOLD                         20
 #define DEFAULT_COAST_BRAKE_ENABLE                                  0 // disable
 
 #define BICYCLE_1

firmware/common/include/state.h

@@ -139,6 +139,7 @@ typedef struct rt_vars_struct {
   uint16_t ui16_adc_battery_current;
   uint8_t ui8_throttle_virtual;
   uint8_t ui8_torque_sensor_filter;
+  uint8_t ui8_torque_sensor_adc_threshold;
   uint8_t ui8_coast_brake_enable;
 
   battery_energy_h_km_t battery_energy_h_km;
@@ -350,6 +351,7 @@ typedef struct ui_vars_struct {
   uint8_t ui8_throttle_virtual;
   uint8_t ui8_throttle_virtual_step;
   uint8_t ui8_torque_sensor_filter;
+  uint8_t ui8_torque_sensor_adc_threshold;
   uint8_t ui8_coast_brake_enable;
 } ui_vars_t;
 

firmware/common/include/uart.h

@@ -8,5 +8,5 @@ uint8_t* uart_get_tx_buffer(void);
 void uart_send_tx_buffer(uint8_t *tx_buffer, uint8_t ui8_len);
 
 #define UART_NUMBER_DATA_BYTES_TO_RECEIVE       29
-#define UART_NUMBER_DATA_BYTES_TO_SEND          87
+#define UART_NUMBER_DATA_BYTES_TO_SEND          88
 

firmware/common/src/configscreen.c

@@ -9,6 +9,14 @@ static Field wheelMenus[] =
 						FIELD_EDITABLE_UINT(_S("Circumference", "Circumfere"), &ui_vars.ui16_wheel_perimeter, "mm", 750, 3000, .inc_step = 10),
 				FIELD_END };
 
+static Field batterySOCMenus[] =
+    {
+            FIELD_EDITABLE_ENUM("Text", &ui_vars.ui8_battery_soc_enable, "disable", "SOC %", "volts"),
+            FIELD_EDITABLE_UINT(_S("Reset at voltage", "Reset at"), &ui_vars.ui16_battery_voltage_reset_wh_counter_x10, "volts", 160, 630, .div_digits = 1),
+            FIELD_EDITABLE_UINT(_S("Battery total Wh", "Batt total"), &ui_vars.ui32_wh_x10_100_percent, "whr", 0, 9990, .div_digits = 1, .inc_step = 100),
+            FIELD_EDITABLE_UINT("Used Wh", &ui_vars.ui32_wh_x10, "whr", 0, 99900, .div_digits = 1, .inc_step = 100, .onSetEditable = onSetConfigurationBatterySOCUsedWh),
+        FIELD_END };
+
 static Field batteryMenus[] =
 		{
 						FIELD_EDITABLE_UINT(_S("Max current", "Max curren"), &ui_vars.ui8_battery_max_current, "amps", 1, 20),
@@ -20,14 +28,6 @@ static Field batteryMenus[] =
 						FIELD_READONLY_UINT(_S("Power loss est", "Power loss"), &ui_vars.ui16_battery_power_loss, "watts", false, .div_digits = 0),
 				FIELD_END };
 
-static Field batterySOCMenus[] =
-		{
-						FIELD_EDITABLE_ENUM("Text", &ui_vars.ui8_battery_soc_enable, "disable", "SOC %", "volts"),
-						FIELD_EDITABLE_UINT(_S("Reset at voltage", "Reset at"), &ui_vars.ui16_battery_voltage_reset_wh_counter_x10, "volts", 160, 630, .div_digits = 1),
-						FIELD_EDITABLE_UINT(_S("Battery total Wh", "Batt total"), &ui_vars.ui32_wh_x10_100_percent, "whr", 0, 9990, .div_digits = 1, .inc_step = 100),
-						FIELD_EDITABLE_UINT("Used Wh", &ui_vars.ui32_wh_x10, "whr", 0, 99900, .div_digits = 1, .inc_step = 100, .onSetEditable = onSetConfigurationBatterySOCUsedWh),
-				FIELD_END };
-
 static Field motorMenus[] = {
             FIELD_EDITABLE_ENUM(_S("Motor voltage", "Motor volt"), &ui_vars.ui8_motor_type, "48V", "36V"),
             FIELD_EDITABLE_UINT(_S("Max current", "Max curren"), &ui_vars.ui8_motor_max_current, "amps", 1, 30),
@@ -37,7 +37,7 @@ static Field motorMenus[] = {
             FIELD_EDITABLE_ENUM(_S("Field weakening", "Field weak"), &ui_vars.ui8_field_weakening, "disable", "enable"),
         FIELD_END };
 
-static Field torqueSensorMenus[] =
+static Field torqueSensorCalibrationMenus[] =
     {
             FIELD_EDITABLE_ENUM(_S("Calibration", "Calibrat"), &ui_vars.ui8_torque_sensor_calibration_feature_enabled, "disable", "enable"),
             FIELD_EDITABLE_UINT(_S("Torque sensor filter", "Torq s fil"), &ui_vars.ui8_torque_sensor_filter, "", 0, 100),
@@ -76,6 +76,15 @@ static Field torqueSensorMenus[] =
             FIELD_EDITABLE_UINT("Right ADC 8", &ui_vars.ui16_torque_sensor_calibration_table_right[7][1], "", 0, 1023),
         FIELD_END };
 
+static Field torqueSensorMenus[] =
+    {
+            FIELD_EDITABLE_UINT(_S("Torque sensor ADC threshold", "Torq s thr"), &ui_vars.ui8_torque_sensor_adc_threshold, "", 5, 75),
+            FIELD_EDITABLE_ENUM(_S("Assist w/o pedal rot", "A w/o ped"), &ui_vars.ui8_motor_assistance_startup_without_pedal_rotation, "disable", "enable"), // FIXME, share one array of disable/enable strings
+            FIELD_EDITABLE_ENUM(_S("Coast brake", "Coast brak"), &ui_vars.ui8_coast_brake_enable, "disable", "enable"),
+            FIELD_EDITABLE_UINT(_S("Coast brake ADC", "Coa bk ADC"), &ui_vars.ui8_coast_brake_adc, "", 5, 255),
+            FIELD_SCROLLABLE("Calibration", torqueSensorCalibrationMenus),
+        FIELD_END };
+
 static Field assistMenus[] =
 		{
 						FIELD_EDITABLE_UINT(_S("Num assist levels", "Num Levels"), &ui_vars.ui8_number_of_assist_levels, "", 1, 20),
@@ -195,9 +204,6 @@ static Field variousMenus[] = {
     FIELD_EDITABLE_ENUM(_S("Cadence fast stop", "Cadenc stp"), &ui_vars.ui8_pedal_cadence_fast_stop, "no", "yes"),
     FIELD_EDITABLE_UINT(_S("ADC lights offset", "ADC lights"), &ui_vars.ui8_adc_lights_current_offset, "", 0, 4),
     FIELD_EDITABLE_UINT(_S("Virtual throttle step", "V thr step"), &ui_vars.ui8_throttle_virtual_step, "", 1, 100),
-    FIELD_EDITABLE_ENUM(_S("Coast brake", "Coast brak"), &ui_vars.ui8_coast_brake_enable, "disable", "enable"),
-    FIELD_EDITABLE_UINT(_S("Coast brake ADC", "Coa bk ADC"), &ui_vars.ui8_coast_brake_adc, "", 5, 255),
-    FIELD_EDITABLE_ENUM(_S("Assist w/o pedal rot", "A w/o ped"), &ui_vars.ui8_motor_assistance_startup_without_pedal_rotation, "disable", "enable"), // FIXME, share one array of disable/enable strings
     FIELD_EDITABLE_UINT("Odometer", &ui_vars.ui32_odometer_x10, "km", 0, UINT32_MAX, .div_digits = 1, .inc_step = 100, .onSetEditable = onSetConfigurationWheelOdometer),
   FIELD_END };
 

firmware/common/src/eeprom.c

@@ -275,6 +275,7 @@ const eeprom_data_t m_eeprom_data_defaults = {
   .ui8_adc_lights_current_offset = DEFAULT_ADC_LIGHTS_CURRENT_OFFSET,
   .ui8_throttle_virtual_step = DEFAULT_THROTTLE_VIRTUAL_STEP,
   .ui8_torque_sensor_filter = DEFAULT_TORQUE_SENSOR_FILTER,
+  .ui8_torque_sensor_adc_threshold = DEFAULT_TORQUE_SENSOR_FILTER,
   .ui8_coast_brake_enable = DEFAULT_COAST_BRAKE_ENABLE,
 };
 
@@ -569,6 +570,8 @@ void eeprom_init_variables(void) {
       m_eeprom_data.ui8_throttle_virtual_step;
   ui_vars->ui8_torque_sensor_filter =
       m_eeprom_data.ui8_torque_sensor_filter;
+  ui_vars->ui8_torque_sensor_adc_threshold =
+      m_eeprom_data.ui8_torque_sensor_adc_threshold;
   ui_vars->ui8_coast_brake_enable =
       m_eeprom_data.ui8_coast_brake_enable;
 }
@@ -753,6 +756,8 @@ void eeprom_write_variables(void) {
       ui_vars->ui8_throttle_virtual_step;
   m_eeprom_data.ui8_torque_sensor_filter =
       ui_vars->ui8_torque_sensor_filter;
+  m_eeprom_data.ui8_torque_sensor_adc_threshold =
+      ui_vars->ui8_torque_sensor_adc_threshold;
   m_eeprom_data.ui8_coast_brake_enable =
       ui_vars->ui8_coast_brake_enable;
 

firmware/common/src/state.c

@@ -300,8 +300,9 @@ void rt_send_tx_package(frame_type_t type) {
       ui8_usart1_tx_buffer[81] = rt_vars.ui8_coast_brake_adc;
       ui8_usart1_tx_buffer[82] = rt_vars.ui8_adc_lights_current_offset;
       ui8_usart1_tx_buffer[83] = rt_vars.ui8_torque_sensor_filter;
+      ui8_usart1_tx_buffer[84] = rt_vars.ui8_torque_sensor_adc_threshold;
 
-      crc_len = 85;
+      crc_len = 86;
       ui8_usart1_tx_buffer[1] = crc_len;
 	    break;
 
@@ -719,6 +720,7 @@ void copy_rt_to_ui_vars(void) {
   rt_vars.ui8_adc_lights_current_offset = ui_vars.ui8_adc_lights_current_offset;
   rt_vars.ui8_throttle_virtual = ui_vars.ui8_throttle_virtual;
   rt_vars.ui8_torque_sensor_filter = ui_vars.ui8_torque_sensor_filter;
+  rt_vars.ui8_torque_sensor_adc_threshold = ui_vars.ui8_torque_sensor_adc_threshold;
   rt_vars.ui8_coast_brake_enable = ui_vars.ui8_coast_brake_enable;
 }