Adding a way to disable ON/OFF beeps, change wheels size

Author: EmerickH

.gitignore

@@ -2,6 +2,7 @@ build/*
 !build/hover.hex
 .pioenvs
 .piolibdeps
+.pio
 .vscode/*
 lib/readme.txt
 _autosave*

inc/config.h

@@ -260,6 +260,10 @@
   #define TEMP_POWEROFF           65        // overheat poweroff. (while not driving) [°C]
 #endif
 
+#ifndef ENABLE_INACTIVITY_TIMEOUT
+  #define ENABLE_INACTIVITY_TIMEOUT 1
+#endif
+
 #ifndef INACTIVITY_TIMEOUT
   #define INACTIVITY_TIMEOUT 8        // minutes of not driving until poweroff. it is not very precise.
 #endif
@@ -354,8 +358,9 @@
 // left sensor board cable. keep cable short, use shielded cable, use ferrits, stabalize voltage in nunchuck, use the right one of the 2 types of nunchucks, add i2c pullups. use original nunchuck. most clones does not work very well.
 //#define CONTROL_NUNCHUCK            // use nunchuck as input. disable DEBUG_SERIAL_USART3!
 
-
-//#define WHEEL_SIZE_INCHES 8.5 - set to your wheelsize to override the default 6.5
+#ifndef WHEEL_SIZE_INCHES
+  #define WHEEL_SIZE_INCHES 6.5  //set to your wheelsize to override the default 6.5
+#endif
 
 
 // ############################### SOFTWARE SERIAL ###############################
@@ -403,7 +408,10 @@
   #define SWITCH_WHEELS       0    // switch right and left wheel. Watch out, you probably also need to invert directions.
 #endif
 #ifndef BEEPS_BACKWARD
-  #define BEEPS_BACKWARD 0    // 0 or 1
+  #define BEEPS_BACKWARD      0    // 0 or 1
+#endif
+#ifndef BEEPS_ON_OFF
+  #define BEEPS_ON_OFF        1    // Beeps on starting/stopping hoverboard
 #endif
 
 

inc/hallinterrupts.h

@@ -71,7 +71,6 @@ extern TIME_STATS timeStats;
 #define HALL_INTERRUPT_TIMER_FREQ 100000
 
 #define HALL_POSN_PER_REV 90
-#define DEFAULT_WHEEL_SIZE_INCHES 6.5
 
 //////////////////////////////////////////////////////////////
 // this is the Hall data we gather, and can be read elsewhere

src/hallinterrupts.c

@@ -80,7 +80,7 @@ volatile HALL_PARAMS local_hall_params[2];
 
 volatile long long timerwraps = 0;
 
-static float WheelSize_mm = (DEFAULT_WHEEL_SIZE_INCHES * 25.4);
+static float WheelSize_mm = (WHEEL_SIZE_INCHES * 25.4);
 
 
 
@@ -92,11 +92,6 @@ void HallInterruptinit(void){
     local_hall_params[0].direction = -1;
     local_hall_params[1].direction = 1;
 
-    // overrides local fle default
-    #ifdef WHEEL_SIZE_INCHES
-    WheelSize_mm = (WHEEL_SIZE_INCHES * 25.4);
-    #endif
-
     HallData[0].HallPosnMultiplier = (float)((WheelSize_mm*3.14159265359)/(float)HALL_POSN_PER_REV);
     HallData[1].HallPosnMultiplier = (float)((WheelSize_mm*3.14159265359)/(float)HALL_POSN_PER_REV);
 

src/main.c

@@ -122,10 +122,12 @@ void poweroff() {
     if (ABS(speed) < 20) {
         buzzerPattern = 0;
         enable = 0;
+        #if BEEPS_ON_OFF
         for (int i = 0; i < 8; i++) {
             buzzerFreq = i;
             HAL_Delay(100);
         }
+        #endif
         HAL_GPIO_WritePin(OFF_PORT, OFF_PIN, 0);
 
         // if we are powered from sTLink, this bit allows the system to be started again with the button.
@@ -260,7 +262,7 @@ int main(void) {
     & HallData[0].HallPosn,
     & HallData[1].HallPosn,
     HALL_POSN_PER_REV,
-    (DEFAULT_WHEEL_SIZE_INCHES*25.4),
+    (WHEEL_SIZE_INCHES*25.4),
     WHEELBASE_MM, 1);
 #endif
 
@@ -319,12 +321,13 @@ int main(void) {
   electrical_measurements.dcCurLim = MIN(DC_CUR_LIMIT*100, FlashContent.MaxCurrLim);
 
 
-
+  #if BEEPS_ON_OFF
   for (int i = 8; i >= 0; i--) {
     buzzerFreq = i;
     HAL_Delay(100);
   }
   buzzerFreq = 0;
+  #endif
 
   HAL_GPIO_WritePin(LED_PORT, LED_PIN, 1);
 
@@ -807,31 +810,39 @@ int main(void) {
 
     // if we plug in the charger, keep us alive
     // also if we have deliberately turned off poweroff over serial
+    #if ENABLE_INACTIVITY_TIMEOUT
     if (electrical_measurements.charging || disablepoweroff){
       inactivity_timeout_counter = 0;
     }
+    #endif
 
     // ####### BEEP AND EMERGENCY POWEROFF #######
-    if (TEMP_POWEROFF_ENABLE && board_temp_deg_c >= TEMP_POWEROFF && ABS(speed) < 20){  // poweroff before mainboard burns OR low bat 3
+    #if TEMP_POWEROFF_ENABLE
+    if (board_temp_deg_c >= TEMP_POWEROFF && ABS(speed) < 20){  // poweroff before mainboard burns OR low bat 3
       consoleLog("power off by temp\r\n");
       poweroff();
     }
+    #endif
 
     if (batteryVoltage < ((float)BAT_LOW_DEAD * (float)BAT_NUMBER_OF_CELLS) && ABS(speed) < 20) {  // poweroff before mainboard burns OR low bat 3
       consoleLog("power off by low voltage\r\n");
       poweroff();
-    } else if (TEMP_WARNING_ENABLE && board_temp_deg_c >= TEMP_WARNING) {  // beep if mainboard gets hot
+    #if TEMP_WARNING_ENABLE
+    } else if (board_temp_deg_c >= TEMP_WARNING) {  // beep if mainboard gets hot
       buzzerFreq = 4;
       buzzerPattern = 1;
+    #endif
     } else if (batteryVoltage < ((float)BAT_LOW_LVL1 * (float)BAT_NUMBER_OF_CELLS) && batteryVoltage > ((float)BAT_LOW_LVL2 * (float)BAT_NUMBER_OF_CELLS) && BAT_LOW_LVL1_ENABLE) {  // low bat 1: slow beep
       buzzerFreq = 5;
       buzzerPattern = 42;
     } else if (batteryVoltage < ((float)BAT_LOW_LVL2 * (float)BAT_NUMBER_OF_CELLS) && batteryVoltage > ((float)BAT_LOW_DEAD * (float)BAT_NUMBER_OF_CELLS) && BAT_LOW_LVL2_ENABLE) {  // low bat 2: fast beep
       buzzerFreq = 5;
       buzzerPattern = 6;
-    } else if (BEEPS_BACKWARD && speed < -50) {  // backward beep
+    #if BEEPS_BACKWARD
+    } else if (speed < -50) {  // backward beep
       buzzerFreq = 5;
       buzzerPattern = 1;
+    #endif
     } else {  // do not beep
       if (buzzerLen > 0){
         buzzerLen--;
@@ -843,6 +854,7 @@ int main(void) {
 
 
     // ####### INACTIVITY TIMEOUT #######
+    #if ENABLE_INACTIVITY_TIMEOUT
     if (ABS(pwms[0]) > 50 || ABS(pwms[1]) > 50) {
       inactivity_timeout_counter = 0;
     } else {
@@ -871,6 +883,7 @@ int main(void) {
       consoleLog("power off by 60s inactivity\r\n");
       poweroff();
     }
+    #endif
 
 
     if (powerofftimer > 0){