From 1afd65eb269b309c7f7533c145b17d6fdf2c9641 Mon Sep 17 00:00:00 2001 From: Christos Themelis Date: Sun, 10 May 2026 17:13:03 +0300 Subject: [PATCH] v.1.15 --- examples/companion_radio/uiManager.cpp | 8 +-- examples/simple_secure_chat_ui/main.cpp | 4 +- examples/simple_secure_chat_ui/uiManager.cpp | 8 +-- variants/elecrow_espnow/platformio.ini | 52 ------------------- variants/elecrow_espnow/target.cpp | 44 ---------------- variants/elecrow_espnow/target.h | 16 ------ .../sensecap_indicator-espnow/platformio.ini | 2 +- 7 files changed, 11 insertions(+), 123 deletions(-) delete mode 100644 variants/elecrow_espnow/platformio.ini delete mode 100644 variants/elecrow_espnow/target.cpp delete mode 100644 variants/elecrow_espnow/target.h diff --git a/examples/companion_radio/uiManager.cpp b/examples/companion_radio/uiManager.cpp index 0234a1a35..bdcd4dbbd 100644 --- a/examples/companion_radio/uiManager.cpp +++ b/examples/companion_radio/uiManager.cpp @@ -612,10 +612,10 @@ void UIManager::ui_Screen1_screen_init(void) ui_TabView1 = tabView.raw(); #if defined(LANG_EN) - ui_TabPageHome = ui_TabView1.addTab("Home"); - ui_TabPageContacts = ui_TabView1.addTab("Contacts"); - ui_TabPageChannels = ui_TabView1.addTab("Channels"); - ui_TabPageSettings = ui_TabView1.addTab("Settings"); + ui_TabPageHome = tabView.addTab("Home"); + ui_TabPageContacts = tabView.addTab("Contacts"); + ui_TabPageChannels = tabView.addTab("Channels"); + ui_TabPageSettings = tabView.addTab("Settings"); #elif defined(LANG_GR) ui_TabPageHome = tabView.addTab("Αρχική"); ui_TabPageContacts = tabView.addTab("Επαφές"); diff --git a/examples/simple_secure_chat_ui/main.cpp b/examples/simple_secure_chat_ui/main.cpp index 052f39e73..7356cdb95 100644 --- a/examples/simple_secure_chat_ui/main.cpp +++ b/examples/simple_secure_chat_ui/main.cpp @@ -402,11 +402,11 @@ struct NodePrefs { // persisted to file }; #ifndef FIRMWARE_BUILD_DATE - #define FIRMWARE_BUILD_DATE "29 Jan 2026" + #define FIRMWARE_BUILD_DATE "19 Apr 2026" #endif #ifndef FIRMWARE_VERSION - #define FIRMWARE_VERSION "v1.12.0" + #define FIRMWARE_VERSION "v1.15.0" #endif #define FIRMWARE_ROLE "Chat" diff --git a/examples/simple_secure_chat_ui/uiManager.cpp b/examples/simple_secure_chat_ui/uiManager.cpp index 553f117f9..290e4fa9b 100644 --- a/examples/simple_secure_chat_ui/uiManager.cpp +++ b/examples/simple_secure_chat_ui/uiManager.cpp @@ -1046,10 +1046,10 @@ void UIManager::ui_Screen1_screen_init(void) ui_TabView1 = tabView.raw(); #if defined(LANG_EN) - ui_TabPageHome = ui_TabView1.addTab("Home"); - ui_TabPageContacts = ui_TabView1.addTab("Contacts"); - ui_TabPageChannels = ui_TabView1.addTab("Channels"); - ui_TabPageSettings = ui_TabView1.addTab("Settings"); + ui_TabPageHome = tabView.addTab("Home"); + ui_TabPageContacts = tabView.addTab("Contacts"); + ui_TabPageChannels = tabView.addTab("Channels"); + ui_TabPageSettings = tabView.addTab("Settings"); #elif defined(LANG_GR) ui_TabPageHome = tabView.addTab("Αρχική"); ui_TabPageContacts = tabView.addTab("Επαφές"); diff --git a/variants/elecrow_espnow/platformio.ini b/variants/elecrow_espnow/platformio.ini deleted file mode 100644 index 4c68e6c92..000000000 --- a/variants/elecrow_espnow/platformio.ini +++ /dev/null @@ -1,52 +0,0 @@ -; ----------- Elecrow Panels ESP32-S3 ------------ -; No LoRa module - Only ESP-NOW -; Works with repeaters with esp_now -[Elecrow_ESPNOW] -extends = esp32_base -board = esp32-s3-devkitc-1-myboard -build_flags = - ${esp32_base.build_flags} - -I variants/Elecrow_espnow - -D LORA_FREQ=869.525 - -D LORA_BW=250 - -D LORA_SF=11 - -D LORA_CR=5 - -D PIN_BOARD_SDA=-1 - -D PIN_BOARD_SCL=-1 - -D PIN_USER_BTN=0 -; -D ESPNOW_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -build_src_filter = ${esp32_base.build_src_filter} - + - +<../variants/Elecrow_espnow> - -[env:Elecrow_ESPNOW_terminal_chat] -extends = Elecrow_ESPNOW -build_flags = - ${Elecrow_ESPNOW.build_flags} - -I./include - -D${PIOENV} - -D CORE_DEBUG_LEVEL=4 ; 0: None, 1: Error, 2: Warn, 3: Info, 4: Debug, 5: Verbose - -D LV_CONF_PATH=lv_conf.h - -D ELECROW_DISPLAY_50 - -D CLIENT_WITHOUT_LORA - -D LANG_GR - -D ADVERT_NAME='"Elecrow Terminal"' - -D MAX_CONTACTS=350 - -D MAX_GROUP_CHANNELS=8 - -D MESH_DEBUG=1 - -D BOARD_HAS_PSRAM=1 -build_src_filter = ${Elecrow_ESPNOW.build_src_filter} - +<../examples/simple_secure_chat_ui/*.cpp> - + - + -lib_deps = - ${esp32_base.lib_deps} - adafruit/Adafruit SSD1306 @ ^2.5.15 - fbiego/ESP32Time@^2.0.6 - lvgl/lvgl@8.3.11 - lovyan03/LovyanGFX@^1.1.16 - bitbank2/PNGdec@^1.1.6 - tamctec/TAMC_GT911@^1.0.2 - densaugeo/base64 @ ~1.4.0 diff --git a/variants/elecrow_espnow/target.cpp b/variants/elecrow_espnow/target.cpp deleted file mode 100644 index 6b5d4e444..000000000 --- a/variants/elecrow_espnow/target.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include "target.h" -#include - -ESP32Board board; - -ESPNOWRadio radio_driver; - -ESP32RTCClock rtc_clock; -SensorManager sensors; - -bool radio_init() { - rtc_clock.begin(); - - radio_driver.init(); - - return true; // success -} - -uint32_t radio_get_rng_seed() { - return millis() + radio_driver.intID(); // TODO: where to get some entropy? -} - -void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) { - // no-op -} - -void radio_set_tx_power(uint8_t dbm) { - radio_driver.setTxPower(dbm); -} - -// NOTE: as we are using the WiFi radio, the ESP_IDF will have enabled hardware RNG: -// https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-reference/system/random.html -class ESP_RNG : public mesh::RNG { -public: - void random(uint8_t* dest, size_t sz) override { - esp_fill_random(dest, sz); - } -}; - -mesh::LocalIdentity radio_new_identity() { - ESP_RNG rng; - return mesh::LocalIdentity(&rng); // create new random identity -} diff --git a/variants/elecrow_espnow/target.h b/variants/elecrow_espnow/target.h deleted file mode 100644 index 99b6f5778..000000000 --- a/variants/elecrow_espnow/target.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include -#include -#include - -extern ESP32Board board; -extern ESPNOWRadio radio_driver; -extern ESP32RTCClock rtc_clock; -extern SensorManager sensors; - -bool radio_init(); -uint32_t radio_get_rng_seed(); -void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); -void radio_set_tx_power(uint8_t dbm); -mesh::LocalIdentity radio_new_identity(); diff --git a/variants/sensecap_indicator-espnow/platformio.ini b/variants/sensecap_indicator-espnow/platformio.ini index 2190f6dbb..404f9b930 100644 --- a/variants/sensecap_indicator-espnow/platformio.ini +++ b/variants/sensecap_indicator-espnow/platformio.ini @@ -45,7 +45,7 @@ build_flags = -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=SenseCapSX1262Wrapper -D PIN_USER_BTN=38 - -D LANG_GR + -D LANG_EN -D LORA_FREQ=869.525 -D LORA_BW=250.0 -D LORA_SF=11