Corrected issue with SW102 not working on previous version. Corrected issue on build script of SW102. Removed configuration for motor 36V and 48V experimental high cadence

Author: casainho

firmware/SW102/Makefile

@@ -353,3 +353,8 @@ SDK_CONFIG_FILE := $(PROJ_DIR)/include/sdk_config.h
 CMSIS_CONFIG_TOOL := $(SDK_ROOT)/external_tools/cmsisconfig/CMSIS_Configuration_Wizard.jar
 sdk_config:
 	java -jar $(CMSIS_CONFIG_TOOL) $(SDK_CONFIG_FILE)
+	
+clean_project: clean
+	rm -rf $(OUTPUT_DIRECTORY)
+	rm -rf $(RELEASE_DIRECTORY)
+	

firmware/SW102/src/sw102/uart.c

@@ -35,7 +35,7 @@ static const app_uart_comm_params_t comm_params =
     //Below values are defined in ser_config.h common for application and connectivity
     .flow_control = APP_UART_FLOW_CONTROL_DISABLED,
     .use_parity   = false,
-    .baud_rate    = UART_BAUDRATE_BAUDRATE_Baud9600
+    .baud_rate    = UART_BAUDRATE_BAUDRATE_Baud19200
 };
 
 uint8_t ui8_rx_buffer[UART_NUMBER_DATA_BYTES_TO_RECEIVE];
@@ -62,12 +62,6 @@ void usart1_reset_received_package(void)
   ui8_received_package_flag = 0;
 }
 
-/**@brief   Function for handling UART interrupts.
- *
- * @details This function will receive a single character from the UART and append it to a string.
- *          The string will be be sent over BLE when the last character received was a 'new line'
- *          i.e '\n' (hex 0x0D) or if the string has reached a length of @ref NUS_MAX_DATA_LENGTH.
- */
 void uart_evt_callback(app_uart_evt_t * uart_evt)
 {
   uint8_t ui8_byte_received;
@@ -89,8 +83,11 @@ void uart_evt_callback(app_uart_evt_t * uart_evt)
           ui8_rx[0] = ui8_byte_received;
           ui8_state_machine = 1;
         }
-        else
+        else {
           ui8_state_machine = 0;
+        }
+
+        ui8_rx_cnt = 0;
         break;
 
         case 1:
@@ -105,7 +102,6 @@ void uart_evt_callback(app_uart_evt_t * uart_evt)
         // reset if it is the last byte of the package and index is out of bounds
         if (ui8_rx_cnt >= ui8_rx[1])
         {
-          ui8_rx_cnt = 0;
           ui8_state_machine = 0;
 
           // just to make easy next calculations

firmware/common/src/configscreen.c

@@ -28,7 +28,7 @@ static Field batterySOCMenus[] =
 				FIELD_END };
 
 static Field motorMenus[] = {
-            FIELD_EDITABLE_ENUM(_S("Motor voltage", "Motor volt"), &ui_vars.ui8_motor_type, "48V", "36V", "exp 48V", "exp 36V"),
+            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_UINT(_S("Min current ADC step", "Min ADC st"), &ui_vars.ui8_motor_current_min_adc, "amps", 0, 13), // 13 ADC steps = 2 amps

firmware/common/src/state.c

@@ -250,7 +250,7 @@ void rt_send_tx_package(frame_type_t type) {
           (rt_vars.ui8_torque_sensor_calibration_feature_enabled << 3) |
           (rt_vars.ui8_torque_sensor_calibration_pedal_ground << 4) |
           (rt_vars.ui8_motor_assistance_startup_without_pedal_rotation << 5) |
-          ((rt_vars.ui8_motor_type & 0x3) << 6);
+          ((rt_vars.ui8_motor_type & 1) << 6);
 
       // motor max current
       ui8_usart1_tx_buffer[9] = rt_vars.ui8_motor_max_current;

firmware/release-SW102_ota.sh

@@ -18,7 +18,7 @@ fi
 mkdir -p $RELEASE_FOLDER
 
 cd SW102
-make -f Makefile clean
+make -f Makefile clean_project
 make -f Makefile generate_dfu_package VERSION=$VERSION
 cp _release/sw102-otaupdate-xxx.zip $RELEASE_FOLDER/sw102-otaupdate-$VERSION.zip
 cd ..

firmware/release-all.sh

@@ -18,7 +18,7 @@ fi
 mkdir -p $RELEASE_FOLDER
 
 cd SW102
-make -f Makefile clean
+make -f Makefile clean_project
 make -f Makefile generate_dfu_package VERSION=$VERSION
 cp _release/sw102-otaupdate-xxx.zip $RELEASE_FOLDER/sw102-otaupdate-$VERSION.zip
 cd ..