made "Timer"-Feature disabled by define
This commit is contained in:
parent
f02a53e161
commit
cb3d49ad13
@ -32,12 +32,13 @@ build_flags =
|
|||||||
-DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
|
-DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
|
||||||
-DWIFI_AP_IP_GW=10,0,0,1
|
-DWIFI_AP_IP_GW=10,0,0,1
|
||||||
-DATOMIC_FS_UPDATE
|
-DATOMIC_FS_UPDATE
|
||||||
-DFEATURE_ENABLE_WIFI_CLIENT
|
;-DFEATURE_ENABLE_WIFI_CLIENT
|
||||||
-DFEATURE_ENABLE_OLED
|
-DFEATURE_ENABLE_OLED
|
||||||
|
;-DFEATURE_ENABLE_TIMER
|
||||||
-DFEATURE_ENABLE_CAN
|
-DFEATURE_ENABLE_CAN
|
||||||
;-DFEATURE_ENABLE_GPS
|
;-DFEATURE_ENABLE_GPS
|
||||||
-DFEATURE_ENABLE_WEBSOCKETS
|
-DFEATURE_ENABLE_WEBSOCKETS
|
||||||
-DPCB_REV=4
|
-DPCB_REV=3
|
||||||
;-DNO_MODE_FLASH
|
;-DNO_MODE_FLASH
|
||||||
|
|
||||||
;build_type = debug
|
;build_type = debug
|
||||||
|
@ -16,7 +16,9 @@
|
|||||||
|
|
||||||
typedef enum SpeedSource_e
|
typedef enum SpeedSource_e
|
||||||
{
|
{
|
||||||
|
#ifdef FEATURE_ENABLE_TIMER
|
||||||
SOURCE_TIME,
|
SOURCE_TIME,
|
||||||
|
#endif
|
||||||
SOURCE_IMPULSE,
|
SOURCE_IMPULSE,
|
||||||
#ifdef FEATURE_ENABLE_GPS
|
#ifdef FEATURE_ENABLE_GPS
|
||||||
SOURCE_GPS,
|
SOURCE_GPS,
|
||||||
@ -27,7 +29,9 @@ typedef enum SpeedSource_e
|
|||||||
} SpeedSource_t;
|
} SpeedSource_t;
|
||||||
|
|
||||||
const char SpeedSourceString[][8] = {
|
const char SpeedSourceString[][8] = {
|
||||||
|
#ifdef FEATURE_ENABLE_TIMER
|
||||||
"Timer",
|
"Timer",
|
||||||
|
#endif
|
||||||
"Impuls",
|
"Impuls",
|
||||||
#ifdef FEATURE_ENABLE_GPS
|
#ifdef FEATURE_ENABLE_GPS
|
||||||
"GPS",
|
"GPS",
|
||||||
|
@ -101,9 +101,11 @@ void setup()
|
|||||||
Init_GPS();
|
Init_GPS();
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef FEATURE_ENABLE_TIMER
|
||||||
case SOURCE_TIME:
|
case SOURCE_TIME:
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
#ifdef FEATURE_ENABLE_CAN
|
#ifdef FEATURE_ENABLE_CAN
|
||||||
case SOURCE_CAN:
|
case SOURCE_CAN:
|
||||||
Init_CAN();
|
Init_CAN();
|
||||||
@ -175,8 +177,10 @@ void loop()
|
|||||||
wheelDistance = Process_CAN_WheelSpeed();
|
wheelDistance = Process_CAN_WheelSpeed();
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef FEATURE_ENABLE_TIMER
|
||||||
case SOURCE_TIME:
|
case SOURCE_TIME:
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
#ifdef FEATURE_ENABLE_GPS
|
#ifdef FEATURE_ENABLE_GPS
|
||||||
case SOURCE_GPS:
|
case SOURCE_GPS:
|
||||||
wheelDistance = Process_GPS_WheelSpeed();
|
wheelDistance = Process_GPS_WheelSpeed();
|
||||||
@ -585,4 +589,3 @@ uint32_t Process_Impulse_WheelSpeed()
|
|||||||
|
|
||||||
return add_milimeters;
|
return add_milimeters;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user