Corrections after previous merge. Changed to version 1.1.0

Author: casainho

firmware/common/Makefile.common

@@ -8,10 +8,10 @@
 VERSION_NUM := 25
 
 # This is the user visible string for the version
-VERSION_STRING := 1.0.0
+VERSION_STRING := 1.1.0
 
 # This is the expected version of the motor firmware. Display will stop to work with correct TSDZ2 firmware version
 TSDZ2_FIRMWARE_MAJOR := 1
-TSDZ2_FIRMWARE_MINOR := 0
+TSDZ2_FIRMWARE_MINOR := 1
 
 CFLAGS += -DVERSION_STRING=\"$(VERSION_STRING)\" -DTSDZ2_FIRMWARE_MAJOR=\"$(TSDZ2_FIRMWARE_MAJOR)\" -DTSDZ2_FIRMWARE_MINOR=\"$(TSDZ2_FIRMWARE_MINOR)\"

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 0x3C
-#define EEPROM_VERSION 0x3C
+#define EEPROM_MIN_COMPAT_VERSION 0x3D
+#define EEPROM_VERSION 0x3D
 
 typedef struct {
   graph_auto_max_min_t auto_max_min;

firmware/common/src/eeprom.c

@@ -279,14 +279,20 @@ const eeprom_data_t m_eeprom_data_defaults = {
   .ui8_torque_sensor_adc_threshold = DEFAULT_TORQUE_SENSOR_ADC_THRESHOLD,
   .ui8_coast_brake_enable = DEFAULT_COAST_BRAKE_ENABLE,
 
+#ifndef SW102
   .ui8_trip_a_auto_reset = DEFAULT_VALUE_TRIP_AUTO_RESET_ENABLE,
   .ui16_trip_a_auto_reset_hours = DEFAULT_VALUE_TRIP_A_AUTO_RESET_HOURS,
+#endif
+
   .ui32_trip_a_distance_x1000 = DEFAULT_VALUE_TRIP_DISTANCE,
   .ui32_trip_a_time = DEFAULT_VALUE_TRIP_TIME,
   .ui16_trip_a_max_speed_x10 = DEFAULT_VALUE_TRIP_MAX_SPEED,
 
+#ifndef SW102
   .ui8_trip_b_auto_reset = DEFAULT_VALUE_TRIP_AUTO_RESET_ENABLE,
   .ui16_trip_b_auto_reset_hours = DEFAULT_VALUE_TRIP_B_AUTO_RESET_HOURS,
+#endif
+
   .ui32_trip_b_distance_x1000 = DEFAULT_VALUE_TRIP_DISTANCE,
   .ui32_trip_b_time = DEFAULT_VALUE_TRIP_TIME,
   .ui16_trip_b_max_speed_x10 = DEFAULT_VALUE_TRIP_MAX_SPEED,
@@ -812,25 +818,31 @@ void eeprom_write_variables(void) {
   m_eeprom_data.ui8_coast_brake_enable =
       ui_vars->ui8_coast_brake_enable;
 
+#ifndef SW102
   m_eeprom_data.ui8_trip_a_auto_reset =
     ui_vars->ui8_trip_a_auto_reset;
   m_eeprom_data.ui16_trip_a_auto_reset_hours = 
     ui_vars->ui16_trip_a_auto_reset_hours;
   m_eeprom_data.ui32_trip_a_last_update_time =
     ui_vars->ui32_trip_a_last_update_time;
+#endif
+
   m_eeprom_data.ui32_trip_a_distance_x1000 =
       ui_vars->ui32_trip_a_distance_x1000;
   m_eeprom_data.ui32_trip_a_time =
       ui_vars->ui32_trip_a_time;
   m_eeprom_data.ui16_trip_a_max_speed_x10 =
       ui_vars->ui16_trip_a_max_speed_x10;
 
+#ifndef SW102
   m_eeprom_data.ui8_trip_b_auto_reset =
     ui_vars->ui8_trip_b_auto_reset;
   m_eeprom_data.ui16_trip_b_auto_reset_hours = 
     ui_vars->ui16_trip_b_auto_reset_hours;
   m_eeprom_data.ui32_trip_b_last_update_time =
     ui_vars->ui32_trip_b_last_update_time;
+#endif
+
   m_eeprom_data.ui32_trip_b_distance_x1000 =
       ui_vars->ui32_trip_b_distance_x1000;
   m_eeprom_data.ui32_trip_b_time =

firmware/common/src/mainscreen.c

@@ -24,6 +24,7 @@
 #include "configscreen.h"
 #include "state.h"
 #include "timer.h"
+#include "rtc.h"
 #ifdef SW102
 #include "peer_manager.h"
 #endif
@@ -1284,9 +1285,12 @@ void TripMemoriesReset(void) {
   if (ui8_g_configuration_trip_a_reset) {
     ui8_g_configuration_trip_a_reset = 0;
 
+#ifndef SW102
     uint32_t current_time = RTC_GetCounter();
 
     rt_vars.ui32_trip_a_last_update_time = current_time;
+#endif
+
     rt_vars.ui32_trip_a_distance_x1000 = 0;
     rt_vars.ui32_trip_a_time = 0;
     rt_vars.ui16_trip_a_avg_speed_x10 = 0;
@@ -1296,9 +1300,12 @@ void TripMemoriesReset(void) {
   if (ui8_g_configuration_trip_b_reset) {
     ui8_g_configuration_trip_b_reset = 0;
 
+#ifndef SW102
     uint32_t current_time = RTC_GetCounter();
 
     rt_vars.ui32_trip_b_last_update_time = current_time;
+#endif
+
     rt_vars.ui32_trip_b_distance_x1000 = 0;
     rt_vars.ui32_trip_b_time = 0;
     rt_vars.ui16_trip_b_avg_speed_x10 = 0;