added system passcode, autolock and offroad auto off

Author: Björn Schmidt

ACAcommons.c

@@ -256,8 +256,27 @@ void updatePasStatus(void) {
 	}
 }
 
-void updateOffroadStatus(void) {
-
+void updateSlowLoopStates(void) {
+	
+	if (ui16_motor_speed_erps == 0) {
+		ui16_idle_counter++;
+	} else {
+		ui16_idle_counter = 0;
+	}
+	
+	//disable lock if passcode is 0
+	if (ui16_passcode == 0){
+		ui8_lockstatus = 0;
+	}else if (((ui16_aca_flags & IDLE_LOCKS_CONTROLLER) == IDLE_LOCKS_CONTROLLER) && (ui16_idle_counter > 3000)) {
+		//lock after 60 seconds idle
+		ui8_lockstatus = 1;
+	}
+	
+	if (((ui16_aca_flags & IDLE_DISABLES_OFFROAD) == IDLE_DISABLES_OFFROAD) && (ui8_offroad_state > 4) && (ui16_idle_counter > 3000)) {
+		//disable after 60 seconds idle
+		ui8_offroad_state = 0;
+	}
+	
 	if (((ui16_aca_flags & BRAKE_DISABLES_OFFROAD) == BRAKE_DISABLES_OFFROAD) && (ui8_offroad_state > 4)) {
 		// if disabling is enabled :)
 		if (!GPIO_ReadInputPin(BRAKE__PORT, BRAKE__PIN)) {

ACAcommons.h

@@ -30,7 +30,7 @@ float int2float(uint8_t in, float maxRange);
 void setSignal(uint8_t signal);
 uint8_t readAndClearSignal(uint8_t signal);
 void updateHallOrder(uint8_t hall_sensors);
-void updateOffroadStatus(void);
+void updateSlowLoopStates(void);
 void initErpsRatio(void);
 void updateSpeeds(void);
 void updatePasStatus(void);

ACAcontrollerState.c

@@ -108,6 +108,9 @@ uint16_t ui16_time_ticks_for_speed_calculation = 0; //time tics for speed measur
 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_passcode = 0;
+uint8_t ui8_lockstatus = 1;
 
 uint16_t ui16_aca_flags = 0;
 uint16_t ui16_aca_experimental_flags = 0;
@@ -169,6 +172,10 @@ void controllerstate_init(void) {
 	eepromVal = eeprom_read(OFFSET_BATTERY_CURRENT_MAX_VALUE);
 	if (eepromVal > 0 || eepromHighVal > 0) ui16_battery_current_max_value = ((uint16_t) eepromHighVal << 8) + (uint16_t) eepromVal;
 
+	eepromHighVal = eeprom_read(OFFSET_PASSCODE_HIGH_BYTE);
+	eepromVal = eeprom_read(OFFSET_PASSCODE);
+	if (eepromVal > 0 || eepromHighVal > 0) ui16_passcode = ((uint16_t) eepromHighVal << 8) + (uint16_t) eepromVal;
+	
 	eepromHighVal = eeprom_read(OFFSET_ACA_FLAGS_HIGH_BYTE);
 	eepromVal = eeprom_read(OFFSET_ACA_FLAGS);
 	if (eepromVal > 0 || eepromHighVal > 0) ui16_aca_flags = ((uint16_t) eepromHighVal << 8) + (uint16_t) eepromVal;

ACAcontrollerState.h

@@ -86,6 +86,9 @@ extern uint16_t ui16_time_ticks_between_speed_interrupt; //Counter for bike spee
 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_passcode;
+extern uint8_t ui8_lockstatus;
 
 extern uint16_t ui16_aca_flags;
 extern uint16_t ui16_aca_experimental_flags;
@@ -148,7 +151,12 @@ typedef enum {
 
 	POWER_BASED_CONTROL= ((uint16_t) 1024),
 	TQ_SENSOR_MODE = ((uint16_t) 2048),
-	ANGLE_CORRECTION_ENABLED = ((uint16_t) 4096)		
+	ANGLE_CORRECTION_ENABLED = ((uint16_t) 4096),
+			
+	IDLE_LOCKS_CONTROLLER = ((uint16_t) 8192),
+	IDLE_DISABLES_OFFROAD = ((uint16_t) 16384)
+			
+			
 } ACA_FLAGS;
 
 typedef enum {

ACAeeprom.h

@@ -72,7 +72,10 @@ typedef enum {
 	OFFSET_ASSIST_PERCENT_LEVEL_5 = ((uint8_t) 0x24),
 
 	OFFSET_BATTERY_VOLTAGE_MIN = ((uint8_t) 0x25),
-	OFFSET_BATTERY_VOLTAGE_MAX = ((uint8_t) 0x26)
+	OFFSET_BATTERY_VOLTAGE_MAX = ((uint8_t) 0x26),
+			
+	OFFSET_PASSCODE_HIGH_BYTE = ((uint8_t) 0x27),
+	OFFSET_PASSCODE = ((uint8_t) 0x28)
 
 } BO_EEPROM_OFFSETS;
 

BOdisplay.c

@@ -213,7 +213,7 @@ void addDetailStateInfos(void) {
 	addPayload(CODE_PAS_COUNTER, ui16_time_ticks_between_pas_interrupt);
 	addPayload(CODE_VER_SPEED_HIGH_BYTE, ui16_virtual_erps_speed >> 8);
 	addPayload(CODE_VER_SPEED, ui16_virtual_erps_speed);
-
+	addPayload(CODE_LOCKSTATUS, ui8_lockstatus);
 	// 9 more elements left/avail (max30)
 }
 
@@ -279,6 +279,23 @@ void digestConfigRequest(uint8_t configAddress, uint8_t requestedCodeLowByte, ui
 			ui8_offroad_state = requestedValue;
 			addPayload(requestedCodeLowByte, ui8_offroad_state);
 			break;
+		case CODE_PASSCODE:
+			if ((ui8_lockstatus == 0) && (configAddress == EEPROM_ADDRESS)){
+				// write new passcode only if unlocked
+				ui16_passcode == ((uint16_t) requestedValueHighByte << 8)+(uint16_t) requestedValue;
+				eeprom_write(OFFSET_PASSCODE_HIGH_BYTE, requestedValueHighByte);
+				eeprom_write(OFFSET_PASSCODE, requestedValue);
+				addPayload(CODE_PASSCODE_HIGH_BYTE, ui16_aca_flags >> 8);
+				addPayload(requestedCodeLowByte, ui16_aca_flags);
+			}else if ((ui8_lockstatus == 1) && (configAddress != EEPROM_ADDRESS) && (ui16_passcode == (((uint16_t) requestedValueHighByte << 8)+(uint16_t) requestedValue))){
+				// unlock if locked and correct code
+				ui8_lockstatus = 0;
+				addPayload(CODE_PASSCODE_HIGH_BYTE, ui16_aca_flags >> 8);
+				addPayload(requestedCodeLowByte, ui16_aca_flags);
+			}else{
+				addPayload(CODE_ERROR, CODE_ERROR);
+			}
+			break;
 		case CODE_ACA_FLAGS:
 			ui16_aca_flags = ((uint16_t) requestedValueHighByte << 8)+(uint16_t) requestedValue;
 			if (configAddress == EEPROM_ADDRESS) {

BOdisplay.h

@@ -64,6 +64,9 @@ typedef enum {
 	CODE_ASSIST_PERCENT_LEVEL_3 = ((uint8_t) 0xB2),
 	CODE_ASSIST_PERCENT_LEVEL_4 = ((uint8_t) 0xB3),
 	CODE_ASSIST_PERCENT_LEVEL_5 = ((uint8_t) 0xB4),
+			
+	CODE_PASSCODE_HIGH_BYTE = ((uint8_t) 0xBE),
+	CODE_PASSCODE = ((uint8_t) 0xBF),
 
 	CODE_MOTOR_STATE = ((uint8_t) 0xC0),
 	CODE_BATTERY_VOLTAGE = ((uint8_t) 0xC1),
@@ -112,6 +115,8 @@ typedef enum {
 
 	CODE_CURRENT_CAL_B_HIGH_BYTE = ((uint8_t) 0x88),
 	CODE_CURRENT_CAL_B = ((uint8_t) 0x89),
+			
+	CODE_LOCKSTATUS = ((uint8_t) 0x83),
 
 	CODE_EEPROM_MAGIC_BYTE = ((uint8_t) 0x84),
 	CODE_MAX_SPEED_DEFAULT = ((uint8_t) 0x85),

config.h

@@ -41,7 +41,7 @@
 #define limit_with_throttle_override 25
 #define CORRECTION_AT_ANGLE 127
 #define PWM_CYCLES_SECOND 15625L
-#define DISPLAY_TYPE_KT_LCD3
+#define BLUOSEC
 #define SPEEDSENSOR_INTERNAL
 #define ANGLE_4_0 1
 #define ANGLE_6_60 43

main.c

@@ -158,7 +158,7 @@ int main(void) {
 
 			checkPasInActivity();
 			updateRequestedTorque(); //now calculates tq for sensor as well
-			updateOffroadStatus();
+			updateSlowLoopStates();
 
 			ui16_setpoint = (uint16_t) aca_setpoint(ui16_time_ticks_between_speed_interrupt, ui16_time_ticks_between_pas_interrupt, ui16_setpoint); //update setpoint
 

test/offRoadTest.c

@@ -79,7 +79,7 @@ int kbhit(void) {
 	return 0;
 }
 
-void updateOffroadStatus(void) {
+void updateSlowLoopStates(void) {
 
 	if (((ui16_aca_flags & BRAKE_DISABLES_OFFROAD) == BRAKE_DISABLES_OFFROAD) && (ui8_offroad_state > 4)) {
 		// if disabling is enabled :)
@@ -177,7 +177,7 @@ void main() {
 		nanosleep((const struct timespec[]){
 			{0, 20000000L}
 		}, NULL);
-		updateOffroadStatus();
+		updateSlowLoopStates();
 
 		if (((ui16_aca_flags & BRAKE_DISABLES_OFFROAD) == BRAKE_DISABLES_OFFROAD) && 1 == 1) {
 			printf(" disabler on  ");