minor changes, see last commit ...

Author: Bjoern Schmidt

ACAcommons.c

@@ -258,6 +258,10 @@ void updatePasStatus(void) {
 
 void updateSlowLoopStates(void) {
 
+	if (ui16_no_pass_counter < 64000){
+		ui16_no_pass_counter++;
+	}
+	
 	if (ui16_motor_speed_erps == 0) {
 		if (ui16_idle_counter < 64000){
 			ui16_idle_counter++;
@@ -267,13 +271,15 @@ void updateSlowLoopStates(void) {
 	}
 
 	// debug only
+	ui8_variableDebugC = ui16_no_pass_counter>>8;
 	ui8_variableDebugA = ui16_passcode;
 	ui8_variableDebugB = ui16_passcode >>8;
 
 	//disable lock if passcode is not at least 4 digits
 	if (ui16_passcode < 1001){
 		ui8_lockstatus = 16;
-	}else if (((ui16_aca_flags & IDLE_LOCKS_CONTROLLER) == IDLE_LOCKS_CONTROLLER) && (ui16_idle_counter > 3000)) {
+		ui16_no_pass_counter =0;
+	}else if (ui16_no_pass_counter > 3000) {
 		//lock after 60 seconds idle
 		ui8_lockstatus = 255;
 	}

ACAcontrollerState.c

@@ -109,6 +109,7 @@ uint16_t ui16_time_ticks_for_uart_timeout = 0;
 uint8_t ui8_SPEED_Flag = 0; //flag for SPEED interrupt
 uint8_t ui8_offroad_counter = 0; //counter for offroad switching procedure
 uint16_t ui16_idle_counter = 0;
+uint16_t ui16_no_pass_counter = 3000;
 uint16_t ui16_passcode = 0;
 uint8_t ui8_lockstatus = 255;
 

ACAcontrollerState.h

@@ -87,6 +87,7 @@ extern uint8_t ui8_SPEED_Flag; //Flag for PAS Interrupt detected
 extern uint16_t ui16_time_ticks_between_speed_interrupt; //Speed duration of one wheel revolution (tics * 64us)
 extern uint8_t ui8_offroad_counter;
 extern uint16_t ui16_idle_counter;
+extern uint16_t ui16_no_pass_counter;
 extern uint16_t ui16_passcode;
 extern uint8_t ui8_lockstatus;
 
@@ -153,7 +154,6 @@ typedef enum {
 	TQ_SENSOR_MODE = ((uint16_t) 2048),
 	ANGLE_CORRECTION_ENABLED = ((uint16_t) 4096),
 
-	IDLE_LOCKS_CONTROLLER = ((uint16_t) 8192),
 	IDLE_DISABLES_OFFROAD = ((uint16_t) 16384)
 
 

BOdisplay.c

@@ -289,6 +289,7 @@ void digestConfigRequest(uint8_t configAddress, uint8_t requestedCodeLowByte, ui
 				addPayload(requestedCodeLowByte, ui16_passcode);
 			}else if ((configAddress != EEPROM_ADDRESS) && (ui16_passcode == (((uint16_t) requestedValueHighByte << 8)+(uint16_t) requestedValue))){
 				// unlock if correct code was sent
+				ui16_no_pass_counter = 0;
 				ui8_lockstatus = 16;
 				addPayload(CODE_PASSCODE_HIGH_BYTE, ui16_passcode >> 8);
 				addPayload(requestedCodeLowByte, ui16_passcode);

config.h

@@ -52,7 +52,7 @@
 #define TQS_CALIB 0.0
 #define ACA 4764
 #define EEPROM_NOINIT // eeprom will not be cleared
-#define EEPROM_INIT_MAGIC_BYTE 85 // makes sure (chance of fail 1/255) eeprom is invalidated after flashing new config
+#define EEPROM_INIT_MAGIC_BYTE 123 // makes sure (chance of fail 1/255) eeprom is invalidated after flashing new config
 #define ADC_BATTERY_VOLTAGE_K 68
 #define ACA_EXPERIMENTAL 128
 #define BATTERY_VOLTAGE_MAX_VALUE 200

nbproject/private/private.xml

@@ -27,37 +27,12 @@
             <file>file:/home/overlord/workspaces/Osec/ACAcommons.h</file>
         </group>
         <group>
-            <file>file:/G:/osebikefw/config.h</file>
+            <file>file:/G:/osebikefw/ACAcommons.c</file>
             <file>file:/G:/osebikefw/BOdisplay.c</file>
-            <file>file:/G:/osebikefw/ACAeeprom.c</file>
-            <file>file:/G:/osebikefw/StdPeriphLib/inc/stm8s.h</file>
-            <file>file:/G:/osebikefw/Start_Compiling.bat</file>
-            <file>file:/G:/osebikefw/ACAcontrollerState.c</file>
             <file>file:/G:/osebikefw/BOdisplay.h</file>
-            <file>file:/G:/osebikefw/ACAcontrollerState.h</file>
-            <file>file:/G:/osebikefw/ACAcommons.h</file>
-            <file>file:/G:/osebikefw/motor.c</file>
-            <file>file:/G:/osebikefw/Makefile_linux</file>
-            <file>file:/G:/osebikefw/StdPeriphLib/src/stm8s_tim1.c</file>
-            <file>file:/G:/osebikefw/WriteOptionBytes.bat</file>
-            <file>file:/G:/osebikefw/timers.c</file>
+            <file>file:/G:/osebikefw/ACAcontrollerState.c</file>
             <file>file:/G:/osebikefw/ACAeeprom.h</file>
-            <file>file:/G:/osebikefw/Makefile_windows</file>
-            <file>file:/G:/osebikefw/motor.h</file>
-            <file>file:/G:/osebikefw/display_kingmeter.h</file>
-            <file>file:/G:/osebikefw/pwm.c</file>
-            <file>file:/G:/osebikefw/main.c</file>
-            <file>file:/G:/osebikefw/cruise_control.c</file>
-            <file>file:/G:/osebikefw/display_kingmeter.c</file>
-            <file>file:/G:/osebikefw/main.h</file>
-            <file>file:/G:/osebikefw/ACAsetPoint.c</file>
-            <file>file:/G:/osebikefw/gpio.c</file>
-            <file>file:/G:/osebikefw/uart.c</file>
-            <file>file:/G:/osebikefw/gpio.h</file>
-            <file>file:/G:/osebikefw/brake.c</file>
-            <file>file:/G:/osebikefw/adc.c</file>
-            <file>file:/G:/osebikefw/cruise_control.h</file>
-            <file>file:/G:/osebikefw/display.c</file>
+            <file>file:/G:/osebikefw/ACAcommons.h</file>
         </group>
     </open-files>
 </project-private>