diff --git a/Software/platformio.ini b/Software/platformio.ini index 05e02db..b7c46aa 100644 --- a/Software/platformio.ini +++ b/Software/platformio.ini @@ -32,12 +32,13 @@ build_flags = -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password} -DWIFI_AP_IP_GW=10,0,0,1 -DATOMIC_FS_UPDATE - -DFEATURE_ENABLE_WIFI_CLIENT + ;-DFEATURE_ENABLE_WIFI_CLIENT -DFEATURE_ENABLE_OLED + ;-DFEATURE_ENABLE_TIMER -DFEATURE_ENABLE_CAN ;-DFEATURE_ENABLE_GPS -DFEATURE_ENABLE_WEBSOCKETS - -DPCB_REV=4 + -DPCB_REV=3 ;-DNO_MODE_FLASH ;build_type = debug diff --git a/Software/src/config.h b/Software/src/config.h index b0bd76e..175b3db 100644 --- a/Software/src/config.h +++ b/Software/src/config.h @@ -16,7 +16,9 @@ typedef enum SpeedSource_e { +#ifdef FEATURE_ENABLE_TIMER SOURCE_TIME, +#endif SOURCE_IMPULSE, #ifdef FEATURE_ENABLE_GPS SOURCE_GPS, @@ -27,7 +29,9 @@ typedef enum SpeedSource_e } SpeedSource_t; const char SpeedSourceString[][8] = { +#ifdef FEATURE_ENABLE_TIMER "Timer", +#endif "Impuls", #ifdef FEATURE_ENABLE_GPS "GPS", diff --git a/Software/src/main.cpp b/Software/src/main.cpp index 1061f77..843e139 100644 --- a/Software/src/main.cpp +++ b/Software/src/main.cpp @@ -101,9 +101,11 @@ void setup() Init_GPS(); break; #endif +#ifdef FEATURE_ENABLE_TIMER case SOURCE_TIME: break; +#endif #ifdef FEATURE_ENABLE_CAN case SOURCE_CAN: Init_CAN(); @@ -175,8 +177,10 @@ void loop() wheelDistance = Process_CAN_WheelSpeed(); break; #endif +#ifdef FEATURE_ENABLE_TIMER case SOURCE_TIME: break; +#endif #ifdef FEATURE_ENABLE_GPS case SOURCE_GPS: wheelDistance = Process_GPS_WheelSpeed(); @@ -585,4 +589,3 @@ uint32_t Process_Impulse_WheelSpeed() return add_milimeters; } -