Added configuration for motor current control as torque mode as also keeping the previous power mode. Changed Walk assist max speed to 6 km/h. Added a few configuration to clock field, like disabling or show battery SOC

Author: casainho

firmware/common/include/eeprom.h

@@ -15,8 +15,8 @@
 
 // For compatible changes, just add new fields at the end of the table (they will be inited to 0xff for old eeprom images).  For incompatible
 // changes bump up EEPROM_MIN_COMPAT_VERSION and the user's EEPROM settings will be discarded.
-#define EEPROM_MIN_COMPAT_VERSION 0x39
-#define EEPROM_VERSION 0x39
+#define EEPROM_MIN_COMPAT_VERSION 0x3A
+#define EEPROM_VERSION 0x3A
 
 typedef struct {
   graph_auto_max_min_t auto_max_min;
@@ -34,6 +34,7 @@ typedef struct eeprom_data {
 	uint32_t ui32_wh_x10_offset;
 	uint32_t ui32_wh_x10_100_percent;
 	uint8_t ui8_battery_soc_enable;
+	uint8_t ui8_time_field_enable;
 	uint8_t ui8_target_max_battery_power_div25;
 	uint8_t ui8_battery_max_current;
 	uint8_t ui8_motor_max_current;
@@ -42,6 +43,7 @@ typedef struct eeprom_data {
 	uint8_t ui8_ramp_up_amps_per_second_x10;
 	uint16_t ui16_battery_low_voltage_cut_off_x10;
 	uint8_t ui8_motor_type;
+	uint8_t ui8_motor_current_control_mode;
 	uint8_t ui8_motor_assistance_startup_without_pedal_rotation;
 	uint16_t ui16_assist_level_factor[ASSIST_LEVEL_NUMBER];
 	uint8_t ui8_number_of_assist_levels;
@@ -170,13 +172,15 @@ void eeprom_init_defaults(void);
 #define DEFAULT_VALUE_WH_X10_OFFSET                                 0
 #define DEFAULT_VALUE_HW_X10_100_PERCENT                            4000 // default to a battery of 400 Wh
 #define DEAFULT_VALUE_SHOW_NUMERIC_BATTERY_SOC                      1 // SOC
+#define DEAFULT_VALUE_TIME_FIELD                                    1 // 1 i show clock
 #define DEFAULT_VALUE_BATTERY_MAX_CURRENT                           16 // 16 amps
 #define DEFAULT_VALUE_MOTOR_MAX_CURRENT                             16 // 16 amps
 #define DEFAULT_VALUE_CURRENT_MIN_ADC                               1 // 1 unit, 0.156 A
 #define DEFAULT_VALUE_RAMP_UP_AMPS_PER_SECOND_X10                   80 // 8.0 amps per second ramp up
 #define DEFAULT_VALUE_TARGET_MAX_BATTERY_POWER                      60 // e.g. 20 = 20 * 25 = 500, 0 is disabled
 #define DEFAULT_VALUE_BATTERY_LOW_VOLTAGE_CUT_OFF_X10               420 // 52v battery, LVC = 42.0 (3.0 * 14)
-#define DEFAULT_VALUE_MOTOR_TYPE                                    0 // ui8_motor_type = 0 = 48V
+#define DEFAULT_VALUE_MOTOR_CURRENT_CONTROL_MODE                    0 // 0 power; 1 torque
+#define DEFAULT_VALUE_MOTOR_TYPE                                    0 // 0 = 48V
 #define DEFAULT_VALUE_MOTOR_ASSISTANCE_WITHOUT_PEDAL_ROTATION       0 // 0 to keep this feature disable
 #define DEFAULT_VALUE_ASSIST_LEVEL_FACTOR_1                         5 // 0.005 and each next increase +33%
 #define DEFAULT_VALUE_ASSIST_LEVEL_FACTOR_2                         9

firmware/common/include/state.h

@@ -84,7 +84,6 @@ typedef struct rt_vars_struct {
 	uint8_t ui8_units_type;
 	uint32_t ui32_wh_x10_offset;
 	uint32_t ui32_wh_x10_100_percent;
-	uint8_t ui8_battery_soc_enable;
 	uint8_t ui8_target_max_battery_power_div25;
 	uint8_t ui8_battery_max_current;
 	uint8_t ui8_motor_max_current;
@@ -95,6 +94,7 @@ typedef struct rt_vars_struct {
 	uint16_t ui16_battery_voltage_reset_wh_counter_x10;
 	uint16_t ui16_battery_pack_resistance_x1000;
 	uint8_t ui8_motor_type;
+	uint8_t ui8_motor_current_control_mode;
 	uint8_t ui8_motor_assistance_startup_without_pedal_rotation;
 	uint16_t ui16_assist_level_factor[ASSIST_LEVEL_NUMBER];
 	uint8_t ui8_walk_assist_feature_enabled;
@@ -198,6 +198,7 @@ typedef struct ui_vars_struct {
 	uint32_t ui32_wh_x10_offset;
 	uint32_t ui32_wh_x10_100_percent;
 	uint8_t ui8_battery_soc_enable;
+	uint8_t ui8_time_field_enable;
 	uint8_t ui8_target_max_battery_power_div25;
 	uint8_t ui8_battery_max_current;
 	uint8_t ui8_motor_max_current;
@@ -209,6 +210,7 @@ typedef struct ui_vars_struct {
 	uint16_t ui16_battery_pack_resistance_x1000;
 	uint16_t ui16_battery_pack_resistance_estimated_x1000;
 	uint8_t ui8_motor_type;
+	uint8_t ui8_motor_current_control_mode;
 	uint8_t ui8_motor_assistance_startup_without_pedal_rotation;
 	uint16_t ui16_assist_level_factor[ASSIST_LEVEL_NUMBER];
 	uint8_t ui8_walk_assist_feature_enabled;

firmware/common/src/configscreen.c

@@ -31,6 +31,7 @@ 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),
             FIELD_EDITABLE_UINT(_S("Current ramp", "Curre ramp"), &ui_vars.ui8_ramp_up_amps_per_second_x10, "amps", 4, 100, .div_digits = 1),
+            FIELD_EDITABLE_ENUM(_S("Motor control", "Motor ctrl"), &ui_vars.ui8_motor_current_control_mode, "power", "torque"),
             FIELD_EDITABLE_UINT(_S("Min current ADC step", "Min ADC st"), &ui_vars.ui8_motor_current_min_adc, "amps", 0, 13), // 13 ADC steps = 2 amps
             FIELD_EDITABLE_ENUM(_S("Field weakening", "Field weak"), &ui_vars.ui8_field_weakening, "disable", "enable"),
         FIELD_END };
@@ -172,6 +173,7 @@ static Field streetModeMenus[] =
 static Field displayMenus[] =
 		{
 #ifndef SW102
+  FIELD_EDITABLE_ENUM("Clock field", &ui_vars.ui8_time_field_enable, "disable", "clock", "batt SOC %", "batt volts"),
   FIELD_EDITABLE_UINT("Clock hours", &ui8_g_configuration_clock_hours, "", 0, 23, .onSetEditable = onSetConfigurationClockHours),
   FIELD_EDITABLE_UINT("Clock minutes", &ui8_g_configuration_clock_minutes, "", 0, 59, .onSetEditable = onSetConfigurationClockMinutes),
   FIELD_EDITABLE_UINT("Brightness on", &ui_vars.ui8_lcd_backlight_on_brightness, "", 5, 100, .inc_step = 5, .onSetEditable = onSetConfigurationDisplayLcdBacklightOnBrightness),

firmware/common/src/eeprom.c

@@ -28,6 +28,7 @@ const eeprom_data_t m_eeprom_data_defaults = {
   .ui32_wh_x10_offset = DEFAULT_VALUE_WH_X10_OFFSET,
   .ui32_wh_x10_100_percent = DEFAULT_VALUE_HW_X10_100_PERCENT,
   .ui8_battery_soc_enable = DEAFULT_VALUE_SHOW_NUMERIC_BATTERY_SOC,
+  .ui8_time_field_enable = DEAFULT_VALUE_TIME_FIELD,
   .ui8_battery_max_current = DEFAULT_VALUE_BATTERY_MAX_CURRENT,
   .ui8_target_max_battery_power_div25 = DEFAULT_VALUE_TARGET_MAX_BATTERY_POWER,
   .ui8_motor_max_current = DEFAULT_VALUE_MOTOR_MAX_CURRENT,
@@ -36,6 +37,7 @@ const eeprom_data_t m_eeprom_data_defaults = {
   .ui8_ramp_up_amps_per_second_x10 = DEFAULT_VALUE_RAMP_UP_AMPS_PER_SECOND_X10,
   .ui16_battery_low_voltage_cut_off_x10 = DEFAULT_VALUE_BATTERY_LOW_VOLTAGE_CUT_OFF_X10,
   .ui8_motor_type = DEFAULT_VALUE_MOTOR_TYPE,
+  .ui8_motor_current_control_mode = DEFAULT_VALUE_MOTOR_CURRENT_CONTROL_MODE,
   .ui8_motor_assistance_startup_without_pedal_rotation = DEFAULT_VALUE_MOTOR_ASSISTANCE_WITHOUT_PEDAL_ROTATION,
   .ui16_assist_level_factor = {
   DEFAULT_VALUE_ASSIST_LEVEL_FACTOR_1,
@@ -329,6 +331,8 @@ void eeprom_init_variables(void) {
 			m_eeprom_data.ui32_wh_x10_100_percent;
 	ui_vars->ui8_battery_soc_enable =
 			m_eeprom_data.ui8_battery_soc_enable;
+  ui_vars->ui8_time_field_enable =
+      m_eeprom_data.ui8_time_field_enable;
   ui_vars->ui8_target_max_battery_power_div25 =
       m_eeprom_data.ui8_target_max_battery_power_div25;
 	ui_vars->ui8_battery_max_current =
@@ -344,6 +348,7 @@ void eeprom_init_variables(void) {
 	ui_vars->ui16_battery_low_voltage_cut_off_x10 =
 			m_eeprom_data.ui16_battery_low_voltage_cut_off_x10;
 	ui_vars->ui8_motor_type = m_eeprom_data.ui8_motor_type;
+	ui_vars->ui8_motor_current_control_mode = m_eeprom_data.ui8_motor_current_control_mode;
 	ui_vars->ui8_motor_assistance_startup_without_pedal_rotation =
 			m_eeprom_data.ui8_motor_assistance_startup_without_pedal_rotation;
 	ui_vars->ui8_temperature_limit_feature_enabled =
@@ -580,6 +585,8 @@ void eeprom_write_variables(void) {
 			ui_vars->ui32_wh_x10_100_percent;
 	m_eeprom_data.ui8_battery_soc_enable =
 			ui_vars->ui8_battery_soc_enable;
+  m_eeprom_data.ui8_time_field_enable =
+      ui_vars->ui8_time_field_enable;
   m_eeprom_data.ui8_target_max_battery_power_div25 =
       ui_vars->ui8_target_max_battery_power_div25;
   m_eeprom_data.ui8_motor_max_current =
@@ -593,6 +600,7 @@ void eeprom_write_variables(void) {
 	m_eeprom_data.ui16_battery_low_voltage_cut_off_x10 =
 			ui_vars->ui16_battery_low_voltage_cut_off_x10;
 	m_eeprom_data.ui8_motor_type = ui_vars->ui8_motor_type;
+	m_eeprom_data.ui8_motor_current_control_mode = ui_vars->ui8_motor_current_control_mode;
 	m_eeprom_data.ui8_motor_assistance_startup_without_pedal_rotation =
 			ui_vars->ui8_motor_assistance_startup_without_pedal_rotation;
 	m_eeprom_data.ui8_temperature_limit_feature_enabled =

firmware/common/src/mainscreen.c

@@ -1055,17 +1055,39 @@ void battery_soc(void) {
 
 
 void time(void) {
-	rtc_time_t *p_rtc_time = rtc_get_time();
+#ifndef SW102
+  rtc_time_t *p_rtc_time = rtc_get_time();
 
-	// force to be [0 - 12]
-	if (ui_vars.ui8_units_type) { // FIXME, should be based on a different eeprom config value, just because someone is using mph doesn't mean they want 12 hr time
-		if (p_rtc_time->ui8_hours > 12) {
-			p_rtc_time->ui8_hours -= 12;
-		}
-	}
+  switch (ui_vars.ui8_time_field_enable) {
+    default:
+    case 0:
+      // clear the area
+      fieldPrintf(&timeField, "");
+      break;
+
+    case 1:
+      // force to be [0 - 12]
+      if (ui_vars.ui8_units_type) { // FIXME, should be based on a different eeprom config value, just because someone is using mph doesn't mean they want 12 hr time
+        if (p_rtc_time->ui8_hours > 12) {
+          p_rtc_time->ui8_hours -= 12;
+        }
+      }
 
-	fieldPrintf(&timeField, "%d:%02d", p_rtc_time->ui8_hours,
-			p_rtc_time->ui8_minutes);
+      fieldPrintf(&timeField, "%d:%02d", p_rtc_time->ui8_hours,
+          p_rtc_time->ui8_minutes);
+      break;
+
+    case 2:
+      fieldPrintf(&timeField, "%3d%%", ui8_g_battery_soc);
+      break;
+
+    case 3:
+      fieldPrintf(&timeField, "%u.%1uV",
+          ui_vars.ui16_battery_voltage_soc_x10 / 10,
+          ui_vars.ui16_battery_voltage_soc_x10 % 10);
+      break;
+  }
+#endif
 }
 
 void walk_assist_state(void) {

firmware/common/src/state.c

@@ -295,7 +295,8 @@ void rt_send_tx_package(frame_type_t type) {
       ui8_usart1_tx_buffer[79] = rt_vars.ui8_motor_current_min_adc;
       ui8_usart1_tx_buffer[80] = (rt_vars.ui8_pedal_cadence_fast_stop |
           (rt_vars.ui8_field_weakening << 1) |
-          (rt_vars.ui8_coast_brake_enable << 2));
+          (rt_vars.ui8_coast_brake_enable << 2) |
+          (rt_vars.ui8_motor_current_control_mode << 3));
       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;
@@ -672,6 +673,7 @@ void copy_rt_to_ui_vars(void) {
 	rt_vars.ui16_wheel_perimeter = ui_vars.ui16_wheel_perimeter;
 	rt_vars.ui8_wheel_max_speed = ui_vars.wheel_max_speed_x10 / 10;
 	rt_vars.ui8_motor_type = ui_vars.ui8_motor_type;
+	rt_vars.ui8_motor_current_control_mode = ui_vars.ui8_motor_current_control_mode;
 	rt_vars.ui8_motor_assistance_startup_without_pedal_rotation =
 			ui_vars.ui8_motor_assistance_startup_without_pedal_rotation;
 	rt_vars.ui8_temperature_limit_feature_enabled =