From 21dfe01f0cf5e815d8b7ee0ff0b8a886fa5a8ffd Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Tue, 18 Jan 2022 11:09:27 +0100 Subject: [PATCH] Removed FEATURE_WIRELESS_CONFIG --- config_allfeatures.cmake | 1 - config_comred.cmake | 1 - config_feedc0de.cmake | 1 - config_greyhash.cmake | 66 ++++++++++++++++++++++++++++++++++++++++ config_mick.cmake | 1 - config_nofeatures.cmake | 1 - config_peter.cmake | 1 - main/ble_bobby.cpp | 14 +-------- main/ble_bobby.h | 2 -- 9 files changed, 67 insertions(+), 21 deletions(-) diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake index b4ca822..903d0c4 100644 --- a/config_allfeatures.cmake +++ b/config_allfeatures.cmake @@ -45,7 +45,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_GAMETRAK -DFEATURE_POWERSUPPLY -DFEATURE_LEDBACKLIGHT - -DFEATURE_WIRELESS_CONFIG -DFEATURE_ESPNOW -DLEDBACKLIGHT_INVERTED diff --git a/config_comred.cmake b/config_comred.cmake index 091ecb6..ccc2f1e 100644 --- a/config_comred.cmake +++ b/config_comred.cmake @@ -45,7 +45,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_GAMETRAK # -DFEATURE_POWERSUPPLY -DFEATURE_LEDBACKLIGHT - -DFEATURE_WIRELESS_CONFIG -DFEATURE_ESPNOW -DLEDBACKLIGHT_INVERTED diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake index f3c644a..57eb17e 100644 --- a/config_feedc0de.cmake +++ b/config_feedc0de.cmake @@ -45,7 +45,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_GAMETRAK -DFEATURE_POWERSUPPLY -DFEATURE_LEDBACKLIGHT - -DFEATURE_WIRELESS_CONFIG # -DFEATURE_ESPNOW -DLEDBACKLIGHT_INVERTED diff --git a/config_greyhash.cmake b/config_greyhash.cmake index 8afda6c..7b799be 100644 --- a/config_greyhash.cmake +++ b/config_greyhash.cmake @@ -16,6 +16,7 @@ add_definitions( ) set(BOBBYCAR_BUILDFLAGS +<<<<<<< HEAD -DFEATURE_ADC_IN -DPINS_GAS=34 -DPINS_BREMS=35 @@ -74,6 +75,71 @@ set(BOBBYCAR_BUILDFLAGS # -DSWITCH_BLINK # -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_ESPNOW +======= +# Pins + -DPINS_GAS=34 + -DPINS_BREMS=35 +# -DPINS_RX1=4 +# -DPINS_TX1=5 +# -DPINS_RX2=22 +# -DPINS_TX2=23 +# -DPINS_MOSFET0=18 +# -DPINS_MOSFET1=19 +# -DPINS_MOSFET2=21 +# -DPINS_GAMETRAKX=34 +# -DPINS_GAMETRAKY=39 +# -DPINS_GAMETRAKDIST=36 + -DPINS_LEDBACKLIGHT=23 + -DPINS_LEDSTRIP=33 + +# Config flags + -DFEATURE_ADC_IN + -DFEATURE_CAN +# -DFEATURE_SERIAL +# -DFEATURE_MOSFETS +# -DFEATURE_WEBSERVER +# -DFEATURE_OTA +# -DFEATURE_BLE +# -DFEATURE_BLUETOOTH +# -DFEATURE_BMS +# -DFEATURE_GAMETRAK +# -DFEATURE_POWERSUPPLY +# -DFEATURE_LEDBACKLIGHT +# -DFEATURE_ESPNOW + + -DLEDBACKLIGHT_INVERTED +# -DLEDSTRIP_WRONG_DIRECTION +# -DHEAP_LRGST_CRASH_TEXT_FIX + +# Default values + -DDEFAULT_SWAPSCREENBYTES=false + -DDEFAULT_INVERTFRONTLEFT=false + -DDEFAULT_INVERTFRONTRIGHT=true + -DDEFAULT_INVERTBACKLEFT=false + -DDEFAULT_INVERTBACKRIGHT=true + -DDEFAULT_WHEELDIAMETER=200 + -DDEFAULT_IMOTMAX=3 + -DDEFAULT_IDCMAX=4 + -DDEFAULT_NMOTMAX=2000 + -DDEFAULT_FIELDWEAKMAX=1 + -DDEFAULT_FIELDADVMAX=40 + +# DPAD + -DFEATURE_DPAD_5WIRESW_2OUT + -DPINS_DPAD_5WIRESW_OUT1=18 + -DPINS_DPAD_5WIRESW_OUT2=19 + -DPINS_DPAD_5WIRESW_IN1=4 + -DPINS_DPAD_5WIRESW_IN2=5 + -DPINS_DPAD_5WIRESW_IN3=27 +# -DFEATURE_DPAD_6WIRESW +# -DPINS_DPAD_6WIRESW_OUT=4 +# -DPINS_DPAD_6WIRESW_IN1=5 +# -DPINS_DPAD_6WIRESW_IN2=27 +# -DPINS_DPAD_6WIRESW_IN3=18 +# -DPINS_DPAD_6WIRESW_IN4=19 +# -DPINS_DPAD_6WIRESW_IN5=26 +# -DFEATURE_GSCHISSENE_DIODE +>>>>>>> fd77427 (Removed FEATURE_WIRELESS_CONFIG) ) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") diff --git a/config_mick.cmake b/config_mick.cmake index e28efd5..6d64e6c 100644 --- a/config_mick.cmake +++ b/config_mick.cmake @@ -45,7 +45,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_GAMETRAK -DFEATURE_POWERSUPPLY -DFEATURE_LEDBACKLIGHT - -DFEATURE_WIRELESS_CONFIG -DFEATURE_ESPNOW -DLEDBACKLIGHT_INVERTED diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake index ff98ba6..ad3afa9 100644 --- a/config_nofeatures.cmake +++ b/config_nofeatures.cmake @@ -45,7 +45,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_GAMETRAK # -DFEATURE_POWERSUPPLY # -DFEATURE_LEDBACKLIGHT -# -DFEATURE_WIRELESS_CONFIG # -DFEATURE_ESPNOW # -DLEDBACKLIGHT_INVERTED diff --git a/config_peter.cmake b/config_peter.cmake index 3ea72c0..c77d6d5 100644 --- a/config_peter.cmake +++ b/config_peter.cmake @@ -45,7 +45,6 @@ set(BOBBYCAR_BUILDFLAGS # -DFEATURE_GAMETRAK -DFEATURE_POWERSUPPLY -DFEATURE_LEDBACKLIGHT - -DFEATURE_WIRELESS_CONFIG -DFEATURE_ESPNOW -DLEDBACKLIGHT_INVERTED diff --git a/main/ble_bobby.cpp b/main/ble_bobby.cpp index 9810f0a..6a77fd7 100644 --- a/main/ble_bobby.cpp +++ b/main/ble_bobby.cpp @@ -25,7 +25,6 @@ public: void onWrite(NimBLECharacteristic* pCharacteristic) override; }; -#ifdef FEATURE_WIRELESS_CONFIG class WirelessSettingsCallbacks : public NimBLECharacteristicCallbacks { public: @@ -37,7 +36,6 @@ class WiFiListCallbacks : public NimBLECharacteristicCallbacks public: void onRead(NimBLECharacteristic* pCharacteristic) override; }; -#endif // FEATURE_WIRELESS_CONFIG } // namespace @@ -45,18 +43,14 @@ BLEServer *pServer{}; BLEService *pService{}; BLECharacteristic *livestatsCharacteristic{}; BLECharacteristic *remotecontrolCharacteristic{}; -#ifdef FEATURE_WIRELESS_CONFIG BLECharacteristic *wirelessConfig{}; BLECharacteristic *getwifilist{}; -#endif // FEATURE_WIRELESS_CONFIG namespace { RemoteControlCallbacks bleRemoteCallbacks; -#ifdef FEATURE_WIRELESS_CONFIG WirelessSettingsCallbacks bleWirelessSettingsCallbacks; WiFiListCallbacks bleWiFiListCallbacks; -#endif // FEATURE_WIRELESS_CONFIG void createBle() { @@ -73,12 +67,11 @@ void createBle() livestatsCharacteristic = pService->createCharacteristic("a48321ea-329f-4eab-a401-30e247211524", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY); remotecontrolCharacteristic = pService->createCharacteristic("4201def0-a264-43e6-946b-6b2d9612dfed", NIMBLE_PROPERTY::WRITE); remotecontrolCharacteristic->setCallbacks(&bleRemoteCallbacks); -#ifdef FEATURE_WIRELESS_CONFIG + wirelessConfig = pService->createCharacteristic("4201def1-a264-43e6-946b-6b2d9612dfed", NIMBLE_PROPERTY::WRITE); wirelessConfig->setCallbacks(&bleWirelessSettingsCallbacks); getwifilist = pService->createCharacteristic("4201def2-a264-43e6-946b-6b2d9612dfed", NIMBLE_PROPERTY::READ); getwifilist->setCallbacks(&bleWiFiListCallbacks); -#endif pService->start(); @@ -98,10 +91,8 @@ void destroyBle() pService = {}; livestatsCharacteristic = {}; remotecontrolCharacteristic = {}; -#ifdef FEATURE_WIRELESS_CONFIG wirelessConfig = {}; getwifilist = {}; -#endif } } // namespace @@ -263,7 +254,6 @@ void RemoteControlCallbacks::onWrite(NimBLECharacteristic* pCharacteristic) } } -#ifdef FEATURE_WIRELESS_CONFIG void WirelessSettingsCallbacks::onWrite(NimBLECharacteristic* pCharacteristic) { const auto &val = pCharacteristic->getValue(); @@ -302,8 +292,6 @@ void WiFiListCallbacks::onRead(NimBLECharacteristic *pCharacteristic) serializeJson(responseDoc, json); pCharacteristic->setValue(json); } -#endif // FEATURE_WIRELESS_CONFIG - } // namespace #endif diff --git a/main/ble_bobby.h b/main/ble_bobby.h index 1ffb091..0e59cc2 100644 --- a/main/ble_bobby.h +++ b/main/ble_bobby.h @@ -9,10 +9,8 @@ extern BLEServer *pServer; extern BLEService *pService; extern BLECharacteristic *livestatsCharacteristic; extern BLECharacteristic *remotecontrolCharacteristic; -#ifdef FEATURE_WIRELESS_CONFIG extern BLECharacteristic *wirelessConfig; extern BLECharacteristic *getwifilist; -#endif // FEATURE_WIRELESS_CONFIG void initBle();