From 41ee895dd514dc49814cf653611ccf47f3b8a6c9 Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Fri, 23 Feb 2024 20:28:15 +0300 Subject: [PATCH] Academy: second attempt to fix Actions CI build for 'Uno R4 WiFi' target --- software/firmware/source/SoftRF/src/Logo.h | 3 ++- software/firmware/source/SoftRF/src/ui/Web.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/software/firmware/source/SoftRF/src/Logo.h b/software/firmware/source/SoftRF/src/Logo.h index 670ed8d48..703a99ae6 100644 --- a/software/firmware/source/SoftRF/src/Logo.h +++ b/software/firmware/source/SoftRF/src/Logo.h @@ -1,3 +1,4 @@ +static const char Logo[] PROGMEM = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x44, 0x08, 0x06, 0x00, 0x00, 0x00, 0x22, 0x2F, 0x73, 0x3C, 0x00, 0x00, 0x00, 0x04, 0x67, 0x41, 0x4D, 0x41, 0x00, 0x00, 0xB1, 0x8E, 0x7C, 0xFB, 0x51, @@ -583,4 +584,4 @@ 0x0E, 0x2A, 0x8B, 0x9B, 0x4B, 0x67, 0x61, 0x47, 0xDB, 0x35, 0x39, 0xA4, 0x51, 0xFC, 0xE6, 0xF3, 0x2E, 0x61, 0x10, 0x52, 0x82, 0xF6, 0x14, 0xB6, 0xF2, 0x2D, 0x00, 0xFE, 0x1F, 0xDA, 0x07, 0x3D, 0x43, 0x6C, 0xFE, 0xE0, 0x45, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, - 0x82 \ No newline at end of file + 0x82 } ; diff --git a/software/firmware/source/SoftRF/src/ui/Web.cpp b/software/firmware/source/SoftRF/src/ui/Web.cpp index 340d740a1..5ae055752 100644 --- a/software/firmware/source/SoftRF/src/ui/Web.cpp +++ b/software/firmware/source/SoftRF/src/ui/Web.cpp @@ -49,11 +49,15 @@ void Web_fini() {} static uint32_t prev_rx_pkt_cnt = 0; -static const char Logo[] PROGMEM = { +#if !defined(ARDUINO_ARCH_RP2040) && \ + !defined(CONFIG_IDF_TARGET_ESP32C6) && \ + !defined(ARDUINO_ARCH_RENESAS) #include "../Logo.h" - } ; +#endif /* ARDUINO_ARCH_RP2040 CONFIG_IDF_TARGET_ESP32C6 ARDUINO_ARCH_RENESAS */ +#if !defined(ARDUINO_ARCH_RP2040) && !defined(ARDUINO_ARCH_RENESAS) #include "jquery_min_js.h" +#endif /* ARDUINO_ARCH_RP2040 ARDUINO_ARCH_RENESAS */ #include WiFiWebServer server ( 80 );