From c04fb9fdd478a32566184ff13bb0f7b8baacee75 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 25 Apr 2025 12:55:39 +1000 Subject: [PATCH] chore(simulator): fix build of simulator libraries (#6142) Co-authored-by: philmoz --- radio/src/hal/CMakeLists.txt | 7 ------- radio/src/targets/simu/led_driver.cpp | 9 --------- radio/src/targets/simu/opentxsimulator.cpp | 12 ++++++++++++ radio/src/tests/gtests.cpp | 12 ++++++++++++ 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/radio/src/hal/CMakeLists.txt b/radio/src/hal/CMakeLists.txt index 481ca96a4..3ab8aef21 100644 --- a/radio/src/hal/CMakeLists.txt +++ b/radio/src/hal/CMakeLists.txt @@ -30,13 +30,6 @@ set(BOOTLOADER_SRC ${BOOTLOADER_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/hal/key_driver.cpp ) - -if(FUNCTION_SWITCHES_WITH_RGB) - set(SRC ${SRC} - hal/rgbleds.cpp - ) -endif() - if (NOT NATIVE_BUILD) set(SRC ${SRC} hal/storage.cpp diff --git a/radio/src/targets/simu/led_driver.cpp b/radio/src/targets/simu/led_driver.cpp index 6299b04b7..ec1f6f58d 100644 --- a/radio/src/targets/simu/led_driver.cpp +++ b/radio/src/targets/simu/led_driver.cpp @@ -23,20 +23,11 @@ #include "hal/rgbleds.h" #include "definitions.h" -#if defined(SIMU) - #define __weak -#elif !defined(__weak) - #define __weak __attribute__((weak)) -#endif - bool usbChargerLed() { return true; } void ledRed() {} void ledGreen() {} void ledBlue() {} void ledOff() {} -__weak void fsLedOn(uint8_t) {} -__weak void fsLedOff(uint8_t) {} -__weak void fsLedRGB(uint8_t, uint32_t) {} bool fsLedState(uint8_t) { return false;} void rgbSetLedColor(unsigned char, unsigned char, unsigned char, unsigned char) {} void rgbLedColorApply() {} diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp index 0254f04c7..63a8753f8 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -88,6 +88,18 @@ void firmwareTraceCb(const char * text) } } +void fsLedRGB(uint8_t idx, uint32_t color) +{ +} + +void fsLedOn(uint8_t idx) +{ +} + +void fsLedOff(uint8_t idx) +{ +} + // Serial port handling needs to know about OpenTxSimulator, so we we // need to update what's in simpgmspace.cpp when we have a simulator // to point at. diff --git a/radio/src/tests/gtests.cpp b/radio/src/tests/gtests.cpp index 45b94ba8d..91157bb73 100644 --- a/radio/src/tests/gtests.cpp +++ b/radio/src/tests/gtests.cpp @@ -128,6 +128,18 @@ uint16_t simu_get_analog(uint8_t idx) return 0; } +void fsLedRGB(uint8_t idx, uint32_t color) +{ +} + +void fsLedOn(uint8_t idx) +{ +} + +void fsLedOff(uint8_t idx) +{ +} + static char _stringResult[200]; const char * nchar2string(const char * string, int size)