removed feature-defines for CAN and Websockets

This commit is contained in:
2023-12-25 00:44:24 +01:00
parent e8a93a600e
commit 3d7e798310
10 changed files with 27 additions and 67 deletions

View File

@@ -20,12 +20,8 @@ typedef enum SpeedSource_e
SOURCE_TIME,
#endif
SOURCE_IMPULSE,
#ifdef FEATURE_ENABLE_GPS
SOURCE_GPS,
#endif
#if FEATURE_ENABLE_CAN
SOURCE_CAN
#endif
} SpeedSource_t;
const char SpeedSourceString[][8] = {
@@ -33,15 +29,10 @@ const char SpeedSourceString[][8] = {
"Timer",
#endif
"Impuls",
#ifdef FEATURE_ENABLE_GPS
"GPS",
#endif
#if FEATURE_ENABLE_CAN
"CAN-Bus"
#endif
};
#ifdef FEATURE_ENABLE_GPS
typedef enum GPSBaudRate_e
{
BAUD_9600,
@@ -53,9 +44,7 @@ const char GPSBaudRateString[][7] = {
"115200"};
const size_t GPSBaudRateString_Elements = sizeof(GPSBaudRateString) / sizeof(GPSBaudRateString[0]);
#endif
#ifdef FEATURE_ENABLE_CAN
typedef enum CANSource_e
{
KTM_890_ADV_R_2021,
@@ -67,7 +56,6 @@ const char CANSourceString[][30] = {
"KTM 1290 Superduke R (2023)"};
const size_t CANSourceString_Elements = sizeof(CANSourceString) / sizeof(CANSourceString[0]);
#endif
const size_t SpeedSourceString_Elements = sizeof(SpeedSourceString) / sizeof(SpeedSourceString[0]);
@@ -96,12 +84,8 @@ typedef struct
uint32_t DistancePerRevolution_mm = 2000;
uint16_t BleedingPulses = 25;
SpeedSource_t SpeedSource = SOURCE_IMPULSE;
#ifdef FEATURE_ENABLE_GPS
GPSBaudRate_t GPSBaudRate = BAUD_115200;
#endif
#ifdef FEATURE_ENABLE_CAN
CANSource_t CANSource = KTM_890_ADV_R_2021;
#endif
bool LED_Mode_Flash = false;
uint8_t LED_Max_Brightness = 255;
uint8_t LED_Min_Brightness = 5;
@@ -110,12 +94,8 @@ typedef struct
const LubeConfig_t LubeConfig_defaults = {
0, 8000, 4000, 320, DEFAULT_PUMP_DOSE, 30, 1, 150, 70, 18, 2000, 25, SOURCE_IMPULSE,
#ifdef FEATURE_ENABLE_GPS
BAUD_115200,
#endif
#ifdef FEATURE_ENABLE_CAN
KTM_890_ADV_R_2021,
#endif
false,
255,
5,

View File

@@ -5,6 +5,7 @@
#include "config.h"
#include "common.h"
#include "dtc.h"
#include "debugger.h"
void Init_GPS();
uint32_t Process_GPS_WheelSpeed();

View File

@@ -16,12 +16,6 @@
#endif
#endif
#ifdef CAN_DEBUG_MESSAGE
#ifndef FEATURE_ENABLE_CAN
#error "You cannot enable CAN-Debug-Message without FEATURE_ENABLE_CAN"
#endif
#endif
#ifndef ADMIN_PASSWORD
#error "You need to define ADMIN_PASSWORD for OTA-Update"
#endif

View File

@@ -20,8 +20,6 @@
void initWebUI();
void Webserver_Process();
#ifdef FEATURE_ENABLE_WEBSOCKETS
void Websocket_PushLiveDebug(String Message);
#endif
#endif