From b7d5dd8670844b267a1cd371e0d0bba2d9c5b144 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 25 Apr 2025 11:45:22 +1000 Subject: [PATCH] revert: "chore(simulator): fix build of simulator libraries (#6138)" (#6140) --- radio/src/targets/simu/led_driver.cpp | 9 +++++++++ radio/src/targets/simu/opentxsimulator.cpp | 12 ------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/radio/src/targets/simu/led_driver.cpp b/radio/src/targets/simu/led_driver.cpp index ec1f6f58d..6299b04b7 100644 --- a/radio/src/targets/simu/led_driver.cpp +++ b/radio/src/targets/simu/led_driver.cpp @@ -23,11 +23,20 @@ #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 63a8753f8..0254f04c7 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -88,18 +88,6 @@ 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.