From 32d91ed85944523d358b190c81f5599e70fb2760 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Mar 2025 14:35:51 -0500 Subject: [PATCH 001/100] [create-pull-request] automated change (#6464) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> --- protobufs | 2 +- src/mesh/generated/meshtastic/mesh.pb.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/protobufs b/protobufs index f00e96f12..5e032099b 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit f00e96f12da48abfa9a992f8b5546fd75a370250 +Subproject commit 5e032099be353f1bebdda021bf66e2c90943f4dd diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index daee04f90..2f47d5503 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -326,7 +326,9 @@ typedef enum _meshtastic_ExcludedModules { /* Detection Sensor module */ meshtastic_ExcludedModules_DETECTIONSENSOR_CONFIG = 2048, /* Paxcounter module */ - meshtastic_ExcludedModules_PAXCOUNTER_CONFIG = 4096 + meshtastic_ExcludedModules_PAXCOUNTER_CONFIG = 4096, + /* Bluetooth module */ + meshtastic_ExcludedModules_BLUETOOTH_CONFIG = 8192 } meshtastic_ExcludedModules; /* How the location was acquired: manual, onboard GPS, external (EUD) GPS */ @@ -1122,8 +1124,8 @@ extern "C" { #define _meshtastic_CriticalErrorCode_ARRAYSIZE ((meshtastic_CriticalErrorCode)(meshtastic_CriticalErrorCode_FLASH_CORRUPTION_UNRECOVERABLE+1)) #define _meshtastic_ExcludedModules_MIN meshtastic_ExcludedModules_EXCLUDED_NONE -#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_PAXCOUNTER_CONFIG -#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_PAXCOUNTER_CONFIG+1)) +#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_BLUETOOTH_CONFIG +#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_BLUETOOTH_CONFIG+1)) #define _meshtastic_Position_LocSource_MIN meshtastic_Position_LocSource_LOC_UNSET #define _meshtastic_Position_LocSource_MAX meshtastic_Position_LocSource_LOC_EXTERNAL From 95523a9659efe2a4e711d7e42f84e1b99f8a4b54 Mon Sep 17 00:00:00 2001 From: Andrew Yong Date: Mon, 31 Mar 2025 08:21:47 +0800 Subject: [PATCH 002/100] Fix: Update xiao_ble E22-900M30S regulatory gain to 7 dB (#6466) Allow 3 dBm increase in power from previous value of 10 dB gain, based on actual measurements from https://github.com/S5NC/EBYTE_ESP32-S3/blob/main/E22-900M30S%20power%20output%20testing.txt Signed-off-by: Andrew Yong --- variants/xiao_ble/variant.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/variants/xiao_ble/variant.h b/variants/xiao_ble/variant.h index a86ddfde2..d00f8be89 100644 --- a/variants/xiao_ble/variant.h +++ b/variants/xiao_ble/variant.h @@ -143,9 +143,10 @@ static const uint8_t SCK = PIN_SPI_SCK; #define SX126X_DIO2_AS_RF_SWITCH #define SX126X_DIO3_TCXO_VOLTAGE 1.8 #ifdef EBYTE_E22_900M30S -// 10dB PA gain and 30dB rated output; based on PA output table from Ebyte Robin -#define REGULATORY_GAIN_LORA 10 -#define SX126X_MAX_POWER 20 +// 10dB PA gain and 30dB rated output; based on measurements from +// https://github.com/S5NC/EBYTE_ESP32-S3/blob/main/E22-900M30S%20power%20output%20testing.txt +#define REGULATORY_GAIN_LORA 7 +#define SX126X_MAX_POWER 22 #endif #ifdef EBYTE_E22_900M33S // 25dB PA gain and 33dB rated output; based on TX Power Curve from E22-900M33S_UserManual_EN_v1.0.pdf From e79d4492e8c56458b75d47d8cb3388a76b85bc39 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Mar 2025 20:33:22 -0500 Subject: [PATCH 003/100] [create-pull-request] automated change (#6468) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> --- protobufs | 2 +- src/mesh/generated/meshtastic/mesh.pb.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/protobufs b/protobufs index 5e032099b..484d002a5 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 5e032099be353f1bebdda021bf66e2c90943f4dd +Subproject commit 484d002a52bc20fa9f91ebf1b216d585c5f93a1b diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index 2f47d5503..defaaad28 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -327,8 +327,10 @@ typedef enum _meshtastic_ExcludedModules { meshtastic_ExcludedModules_DETECTIONSENSOR_CONFIG = 2048, /* Paxcounter module */ meshtastic_ExcludedModules_PAXCOUNTER_CONFIG = 4096, - /* Bluetooth module */ - meshtastic_ExcludedModules_BLUETOOTH_CONFIG = 8192 + /* Bluetooth config (not technically a module, but used to indicate bluetooth capabilities) */ + meshtastic_ExcludedModules_BLUETOOTH_CONFIG = 8192, + /* Network config (not technically a module, but used to indicate network capabilities) */ + meshtastic_ExcludedModules_NETWORK_CONFIG = 16384 } meshtastic_ExcludedModules; /* How the location was acquired: manual, onboard GPS, external (EUD) GPS */ @@ -1124,8 +1126,8 @@ extern "C" { #define _meshtastic_CriticalErrorCode_ARRAYSIZE ((meshtastic_CriticalErrorCode)(meshtastic_CriticalErrorCode_FLASH_CORRUPTION_UNRECOVERABLE+1)) #define _meshtastic_ExcludedModules_MIN meshtastic_ExcludedModules_EXCLUDED_NONE -#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_BLUETOOTH_CONFIG -#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_BLUETOOTH_CONFIG+1)) +#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_NETWORK_CONFIG +#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_NETWORK_CONFIG+1)) #define _meshtastic_Position_LocSource_MIN meshtastic_Position_LocSource_LOC_UNSET #define _meshtastic_Position_LocSource_MAX meshtastic_Position_LocSource_LOC_EXTERNAL From b52c355f2f560078ff27d2516a8b0ae639c3e1b0 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Mon, 31 Mar 2025 03:37:08 +0200 Subject: [PATCH 004/100] Update ScreenFonts.h (#6412) --- src/graphics/ScreenFonts.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/graphics/ScreenFonts.h b/src/graphics/ScreenFonts.h index 910d1b0b9..079a3e282 100644 --- a/src/graphics/ScreenFonts.h +++ b/src/graphics/ScreenFonts.h @@ -16,6 +16,10 @@ #include "graphics/fonts/OLEDDisplayFontsCS.h" #endif +#ifdef CROWPANEL_ESP32S3_5_EPAPER +#include "graphics/fonts/EinkDisplayFonts.h" +#endif + #ifdef OLED_PL #define FONT_SMALL_LOCAL ArialMT_Plain_10_PL #else @@ -74,13 +78,12 @@ #endif #if defined(CROWPANEL_ESP32S3_5_EPAPER) -#include "graphics/fonts/EinkDisplayFonts.h" #undef FONT_SMALL #undef FONT_MEDIUM #undef FONT_LARGE -#define FONT_SMALL FONT_LARGE_LOCAL // Height: 30 -#define FONT_MEDIUM FONT_LARGE_LOCAL // Height: 30 -#define FONT_LARGE FONT_LARGE_LOCAL // Height: 30 +#define FONT_SMALL Monospaced_plain_30 +#define FONT_MEDIUM Monospaced_plain_30 +#define FONT_LARGE Monospaced_plain_30 #endif #define _fontHeight(font) ((font)[1] + 1) // height is position 1 From e08177ba986d915894d7f95a6a2b498b6c8fee2e Mon Sep 17 00:00:00 2001 From: Tavis Date: Sun, 30 Mar 2025 15:38:24 -1000 Subject: [PATCH 005/100] update to handle ws80 as well (#6440) Small change to make the string parsing of Name = value less brittle. Adds a function to parse a line without knowing how many spaces are after the = sign. This allows it to also work with the ws80 serial output. --- src/modules/SerialModule.cpp | 127 ++++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 55 deletions(-) diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp index f3f23b080..e088b4612 100644 --- a/src/modules/SerialModule.cpp +++ b/src/modules/SerialModule.cpp @@ -408,6 +408,49 @@ uint32_t SerialModule::getBaudRate() return BAUD; } +// Add this structure to help with parsing WindGust = 24.4 serial lines. +struct ParsedLine { + String name; + String value; +}; + +/** + * Parse a line of format "Name = Value" into name/value pair + * @param line Input line to parse + * @return ParsedLine containing name and value, or empty strings if parse failed + */ +ParsedLine parseLine(const char *line) +{ + ParsedLine result = {"", ""}; + + // Find equals sign + const char *equals = strchr(line, '='); + if (!equals) { + return result; + } + + // Extract name by copying substring + char nameBuf[64]; // Temporary buffer + size_t nameLen = equals - line; + if (nameLen >= sizeof(nameBuf)) { + nameLen = sizeof(nameBuf) - 1; + } + strncpy(nameBuf, line, nameLen); + nameBuf[nameLen] = '\0'; + + // Create trimmed name string + String name = String(nameBuf); + name.trim(); + + // Extract value after equals sign + String value = String(equals + 1); + value.trim(); + + result.name = name; + result.value = value; + return result; +} + /** * Process the received weather station serial data, extract wind, voltage, and temperature information, * calculate averages and send telemetry data over the mesh network. @@ -453,6 +496,7 @@ void SerialModule::processWXSerial() // WindSpeed = 0.5 // WindGust = 0.6 // GXTS04Temp = 24.4 + // Temperature = 23.4 // WS80 // RainIntSum = 0 // Rain = 0.0 @@ -471,75 +515,48 @@ void SerialModule::processWXSerial() memset(line, '\0', sizeof(line)); if (lineEnd - lineStart < sizeof(line) - 1) { memcpy(line, &serialBytes[lineStart], lineEnd - lineStart); - if (strstr(line, "Wind") != NULL) // we have a wind line - { - gotwind = true; - // Find the positions of "=" signs in the line - char *windDirPos = strstr(line, "WindDir = "); - char *windSpeedPos = strstr(line, "WindSpeed = "); - char *windGustPos = strstr(line, "WindGust = "); - if (windDirPos != NULL) { - // Extract data after "=" for WindDir - strlcpy(windDir, windDirPos + 15, sizeof(windDir)); // Add 15 to skip "WindDir = " + ParsedLine parsed = parseLine(line); + if (parsed.name.length() > 0) { + if (parsed.name == "WindDir") { + strlcpy(windDir, parsed.value.c_str(), sizeof(windDir)); double radians = GeoCoord::toRadians(strtof(windDir, nullptr)); dir_sum_sin += sin(radians); dir_sum_cos += cos(radians); dirCount++; - } else if (windSpeedPos != NULL) { - // Extract data after "=" for WindSpeed - strlcpy(windVel, windSpeedPos + 15, sizeof(windVel)); // Add 15 to skip "WindSpeed = " + gotwind = true; + } else if (parsed.name == "WindSpeed") { + strlcpy(windVel, parsed.value.c_str(), sizeof(windVel)); float newv = strtof(windVel, nullptr); velSum += newv; velCount++; - if (newv < lull || lull == -1) + if (newv < lull || lull == -1) { lull = newv; - - } else if (windGustPos != NULL) { - strlcpy(windGust, windGustPos + 15, sizeof(windGust)); // Add 15 to skip "WindSpeed = " + } + gotwind = true; + } else if (parsed.name == "WindGust") { + strlcpy(windGust, parsed.value.c_str(), sizeof(windGust)); float newg = strtof(windGust, nullptr); - if (newg > gust) + if (newg > gust) { gust = newg; - } - - // these are also voltage data we care about possibly - } else if (strstr(line, "BatVoltage") != NULL) { // we have a battVoltage line - char *batVoltagePos = strstr(line, "BatVoltage = "); - if (batVoltagePos != NULL) { - strlcpy(batVoltage, batVoltagePos + 17, sizeof(batVoltage)); // 18 for ws 80, 17 for ws85 + } + gotwind = true; + } else if (parsed.name == "BatVoltage") { + strlcpy(batVoltage, parsed.value.c_str(), sizeof(batVoltage)); batVoltageF = strtof(batVoltage, nullptr); break; // last possible data we want so break - } - } else if (strstr(line, "CapVoltage") != NULL) { // we have a cappVoltage line - char *capVoltagePos = strstr(line, "CapVoltage = "); - if (capVoltagePos != NULL) { - strlcpy(capVoltage, capVoltagePos + 17, sizeof(capVoltage)); // 18 for ws 80, 17 for ws85 + } else if (parsed.name == "CapVoltage") { + strlcpy(capVoltage, parsed.value.c_str(), sizeof(capVoltage)); capVoltageF = strtof(capVoltage, nullptr); - } - // GXTS04Temp = 24.4 - } else if (strstr(line, "GXTS04Temp") != NULL) { // we have a temperature line - char *tempPos = strstr(line, "GXTS04Temp = "); - if (tempPos != NULL) { - strlcpy(temperature, tempPos + 15, sizeof(temperature)); // 15 spaces for ws85 + } else if (parsed.name == "GXTS04Temp" || parsed.name == "Temperature") { + strlcpy(temperature, parsed.value.c_str(), sizeof(temperature)); temperatureF = strtof(temperature, nullptr); - } - - } else if (strstr(line, "RainIntSum") != NULL) { // we have a rainsum line - // LOG_INFO(line); - char *pos = strstr(line, "RainIntSum = "); - if (pos != NULL) { - strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85 + } else if (parsed.name == "RainIntSum") { + strlcpy(rainStr, parsed.value.c_str(), sizeof(rainStr)); rainSum = int(strtof(rainStr, nullptr)); - } - - } else if (strstr(line, "Rain") != NULL) { // we have a rain line - if (strstr(line, "WaveRain") == NULL) { // skip WaveRain lines though. - // LOG_INFO(line); - char *pos = strstr(line, "Rain = "); - if (pos != NULL) { - strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85 - rain = strtof(rainStr, nullptr); - } + } else if (parsed.name == "Rain") { + strlcpy(rainStr, parsed.value.c_str(), sizeof(rainStr)); + rain = strtof(rainStr, nullptr); } } @@ -557,7 +574,7 @@ void SerialModule::processWXSerial() } if (gotwind) { - LOG_INFO("WS85 : %i %.1fg%.1f %.1fv %.1fv %.1fC rain: %.1f, %i sum", atoi(windDir), strtof(windVel, nullptr), + LOG_INFO("WS8X : %i %.1fg%.1f %.1fv %.1fv %.1fC rain: %.1f, %i sum", atoi(windDir), strtof(windVel, nullptr), strtof(windGust, nullptr), batVoltageF, capVoltageF, temperatureF, rain, rainSum); } if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) { @@ -607,7 +624,7 @@ void SerialModule::processWXSerial() m.variant.environment_metrics.wind_lull = lull; m.variant.environment_metrics.has_wind_lull = true; - LOG_INFO("WS85 Transmit speed=%fm/s, direction=%d , lull=%f, gust=%f, voltage=%f temperature=%f", + LOG_INFO("WS8X Transmit speed=%fm/s, direction=%d , lull=%f, gust=%f, voltage=%f temperature=%f", m.variant.environment_metrics.wind_speed, m.variant.environment_metrics.wind_direction, m.variant.environment_metrics.wind_lull, m.variant.environment_metrics.wind_gust, m.variant.environment_metrics.voltage, m.variant.environment_metrics.temperature); From 850d21dcb9b7ab82016a464d6c05e5950da6fb9f Mon Sep 17 00:00:00 2001 From: "Jason B. Cox" Date: Sun, 30 Mar 2025 18:39:01 -0700 Subject: [PATCH 006/100] Add a static_assert to verify assumption about NodeInfoLite size (#6428) Co-authored-by: Ben Meadors --- src/mesh/mesh-pb-constants.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h index 1c86653dc..f748d295e 100644 --- a/src/mesh/mesh-pb-constants.h +++ b/src/mesh/mesh-pb-constants.h @@ -18,6 +18,10 @@ #define MAX_RX_TOPHONE 32 #endif +/// Verify baseline assumption of node size. If it increases, we need to reevaluate +/// the impact of its memory footprint, notably on MAX_NUM_NODES. +static_assert(sizeof(meshtastic_NodeInfoLite) <= 192, "NodeInfoLite size increased. Reconsider impact on MAX_NUM_NODES."); + /// max number of nodes allowed in the nodeDB #ifndef MAX_NUM_NODES #if defined(ARCH_STM32WL) From f18f60cd0b38cb333a6ca2ebcf28669391b50b85 Mon Sep 17 00:00:00 2001 From: Austin Date: Sun, 30 Mar 2025 21:47:15 -0400 Subject: [PATCH 007/100] meshtasticd: CH341 / HAT+ Auto Configuration (#6446) --- bin/config-dist.yaml | 6 ++ ...dafruit-RFM9x => lora-Adafruit-RFM9x.yaml} | 0 src/platform/portduino/PortduinoGlue.cpp | 71 +++++++++++++++++-- src/platform/portduino/PortduinoGlue.h | 11 +++ 4 files changed, 84 insertions(+), 4 deletions(-) rename bin/config.d/{lora-Adafruit-RFM9x => lora-Adafruit-RFM9x.yaml} (100%) diff --git a/bin/config-dist.yaml b/bin/config-dist.yaml index da4c192c7..722f80fae 100644 --- a/bin/config-dist.yaml +++ b/bin/config-dist.yaml @@ -6,6 +6,12 @@ ### Including the "Module:" line! --- Lora: + # Default to auto-detecting the module type + # This will be overridden by configs from config.d + Module: auto + +# # Uncomment to enable Simulation mode, or use --sim +# Module: sim # Module: sx1262 # Waveshare SX1302 LISTEN ONLY AT THIS TIME! # CS: 7 diff --git a/bin/config.d/lora-Adafruit-RFM9x b/bin/config.d/lora-Adafruit-RFM9x.yaml similarity index 100% rename from bin/config.d/lora-Adafruit-RFM9x rename to bin/config.d/lora-Adafruit-RFM9x.yaml diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index 7b13971b4..a4050e702 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -33,6 +33,7 @@ std::ofstream traceFile; Ch341Hal *ch341Hal = nullptr; char *configPath = nullptr; char *optionMac = nullptr; +bool forceSimulated = false; // FIXME - move setBluetoothEnable into a HALPlatform class void setBluetoothEnable(bool enable) @@ -61,6 +62,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) case 'c': configPath = arg; break; + case 's': + forceSimulated = true; + break; case 'h': optionMac = arg; break; @@ -78,6 +82,7 @@ void portduinoCustomInit() static struct argp_option options[] = {{"port", 'p', "PORT", 0, "The TCP port to use."}, {"config", 'c', "CONFIG_PATH", 0, "Full path of the .yaml config file to use."}, {"hwid", 'h', "HWID", 0, "The mac address to assign to this virtual machine"}, + {"sim", 's', 0, 0, "Run in Simulated radio mode"}, {0}}; static void *childArguments; static char doc[] = "Meshtastic native build."; @@ -157,7 +162,9 @@ void portduinoSetup() YAML::Node yamlConfig; - if (configPath != nullptr) { + if (forceSimulated == true) { + settingsMap[use_simradio] = true; + } else if (configPath != nullptr) { if (loadConfig(configPath)) { std::cout << "Using " << configPath << " as config file" << std::endl; } else { @@ -179,7 +186,12 @@ void portduinoSetup() exit(EXIT_FAILURE); } } else { - std::cout << "No 'config.yaml' found, running simulated." << std::endl; + std::cout << "No 'config.yaml' found..." << std::endl; + settingsMap[use_simradio] = true; + } + + if (settingsMap[use_simradio] == true) { + std::cout << "Running in simulated mode." << std::endl; settingsMap[maxnodes] = 200; // Default to 200 nodes settingsMap[logoutputlevel] = level_debug; // Default to debug // Set the random seed equal to TCPPort to have a different seed per instance @@ -197,6 +209,56 @@ void portduinoSetup() } } } + + // If LoRa `Module: auto` (default in config.yaml), + // attempt to auto config based on Product Strings + if (settingsMap[use_autoconf] == true) { + char autoconf_product[96] = {0}; + // Try CH341 + try { + std::cout << "autoconf: Looking for CH341 device..." << std::endl; + ch341Hal = + new Ch341Hal(0, settingsStrings[lora_usb_serial_num], settingsMap[lora_usb_vid], settingsMap[lora_usb_pid]); + ch341Hal->getProductString(autoconf_product, 95); + delete ch341Hal; + std::cout << "autoconf: Found CH341 device " << autoconf_product << std::endl; + } catch (...) { + std::cout << "autoconf: Could not locate CH341 device" << std::endl; + } + // Try Pi HAT+ + std::cout << "autoconf: Looking for Pi HAT+..." << std::endl; + if (access("/proc/device-tree/hat/product", R_OK) == 0) { + std::ifstream hatProductFile("/proc/device-tree/hat/product"); + if (hatProductFile.is_open()) { + hatProductFile.read(autoconf_product, 95); + hatProductFile.close(); + } + std::cout << "autoconf: Found Pi HAT+ " << autoconf_product << " at /proc/device-tree/hat/product" << std::endl; + } else { + std::cout << "autoconf: Could not locate Pi HAT+ at /proc/device-tree/hat/product" << std::endl; + } + // Load the config file based on the product string + if (strlen(autoconf_product) > 0) { + // From configProducts map in PortduinoGlue.h + std::string product_config = ""; + try { + product_config = configProducts.at(autoconf_product); + } catch (std::out_of_range &e) { + std::cerr << "autoconf: Unable to find config for " << autoconf_product << std::endl; + exit(EXIT_FAILURE); + } + if (loadConfig(("/etc/meshtasticd/available.d/" + product_config).c_str())) { + std::cout << "autoconf: Using " << product_config << " as config file for " << autoconf_product << std::endl; + } else { + std::cerr << "autoconf: Unable to use " << product_config << " as config file for " << autoconf_product + << std::endl; + exit(EXIT_FAILURE); + } + } else { + std::cerr << "autoconf: Could not locate any devices" << std::endl; + } + } + // if we're using a usermode driver, we need to initialize it here, to get a serial number back for mac address uint8_t dmac[6] = {0}; if (settingsStrings[spidev] == "ch341") { @@ -358,8 +420,9 @@ bool loadConfig(const char *configPath) const struct { configNames cfgName; std::string strName; - } loraModules[] = {{use_rf95, "RF95"}, {use_sx1262, "sx1262"}, {use_sx1268, "sx1268"}, {use_sx1280, "sx1280"}, - {use_lr1110, "lr1110"}, {use_lr1120, "lr1120"}, {use_lr1121, "lr1121"}, {use_llcc68, "LLCC68"}}; + } loraModules[] = {{use_simradio, "sim"}, {use_autoconf, "auto"}, {use_rf95, "RF95"}, {use_sx1262, "sx1262"}, + {use_sx1268, "sx1268"}, {use_sx1280, "sx1280"}, {use_lr1110, "lr1110"}, {use_lr1120, "lr1120"}, + {use_lr1121, "lr1121"}, {use_llcc68, "LLCC68"}}; for (auto &loraModule : loraModules) { settingsMap[loraModule.cfgName] = false; } diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h index a52ca88f8..a7aea1c3e 100644 --- a/src/platform/portduino/PortduinoGlue.h +++ b/src/platform/portduino/PortduinoGlue.h @@ -1,9 +1,18 @@ #pragma once #include #include +#include #include "platform/portduino/USBHal.h" +// Product strings for auto-configuration +// {"PRODUCT_STRING", "CONFIG.YAML"} +// YAML paths are relative to `meshtastic/available.d` +inline const std::unordered_map configProducts = {{"MESHTOAD", "lora-usb-meshtoad-e22.yaml"}, + {"MESHSTICK", "lora-meshstick-1262.yaml"}, + {"MESHADV-PI", "lora-MeshAdv-900M30S.yaml"}, + {"POWERPI", "lora-MeshAdv-900M30S.yaml"}}; + enum configNames { default_gpiochip, cs_pin, @@ -34,6 +43,8 @@ enum configNames { rf95_max_power, dio2_as_rf_switch, dio3_tcxo_voltage, + use_simradio, + use_autoconf, use_rf95, use_sx1262, use_sx1268, From f626f02005bfafd0553ebebe8d1db251fae7c8e5 Mon Sep 17 00:00:00 2001 From: Plant Daddy <5402293+PlantDaddy@users.noreply.github.com> Date: Mon, 31 Mar 2025 02:14:48 -0500 Subject: [PATCH 008/100] Add 'bluetooth' option to the LilyGo T-Watch-S3 definition. --- boards/t-watch-s3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/t-watch-s3.json b/boards/t-watch-s3.json index e6e363305..5d4afd322 100644 --- a/boards/t-watch-s3.json +++ b/boards/t-watch-s3.json @@ -23,7 +23,7 @@ "mcu": "esp32s3", "variant": "t-watch-s3" }, - "connectivity": ["wifi"], + "connectivity": ["wifi", "bluetooth"], "debug": { "openocd_target": "esp32s3.cfg" }, From da26ff5b95d6723cd415d0b328d0eaac32e7e87d Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Mon, 31 Mar 2025 20:15:54 +1300 Subject: [PATCH 009/100] feat: more toggles for InkHUD menu (#6469) GPS on/off Wifi off -> Bluetooth on 12 / 24 hour clock --- src/graphics/niche/InkHUD/Applet.cpp | 7 ++- .../InkHUD/Applets/System/Menu/MenuAction.h | 6 +- .../InkHUD/Applets/System/Menu/MenuApplet.cpp | 63 +++++++++++-------- 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/graphics/niche/InkHUD/Applet.cpp b/src/graphics/niche/InkHUD/Applet.cpp index 9fda9a87e..459f30213 100644 --- a/src/graphics/niche/InkHUD/Applet.cpp +++ b/src/graphics/niche/InkHUD/Applet.cpp @@ -582,9 +582,12 @@ std::string InkHUD::Applet::getTimeString(uint32_t epochSeconds) uint32_t hour = hms / SEC_PER_HOUR; uint32_t min = (hms % SEC_PER_HOUR) / SEC_PER_MIN; - // Format the clock string + // Format the clock string, either 12 hour or 24 hour char clockStr[11]; - sprintf(clockStr, "%u:%02u %s", (hour % 12 == 0 ? 12 : hour % 12), min, hour > 11 ? "PM" : "AM"); + if (config.display.use_12h_clock) + sprintf(clockStr, "%u:%02u %s", (hour % 12 == 0 ? 12 : hour % 12), min, hour > 11 ? "PM" : "AM"); + else + sprintf(clockStr, "%02u:%02u", hour, min); return clockStr; } diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h index 6950bb110..4f8205647 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h @@ -22,15 +22,17 @@ enum MenuAction { SEND_POSITION, SHUTDOWN, NEXT_TILE, + TOGGLE_BACKLIGHT, + TOGGLE_GPS, + ENABLE_BLUETOOTH, TOGGLE_APPLET, - ACTIVATE_APPLETS, // Todo: remove? Possible redundant, handled by TOGGLE_APPLET? TOGGLE_AUTOSHOW_APPLET, SET_RECENTS, ROTATE, LAYOUT, TOGGLE_BATTERY_ICON, TOGGLE_NOTIFICATIONS, - TOGGLE_BACKLIGHT, + TOGGLE_12H_CLOCK, }; } // namespace NicheGraphics::InkHUD diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp index 7397f7e9f..4c411bb85 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp @@ -5,8 +5,13 @@ #include "RTC.h" #include "airtime.h" +#include "main.h" #include "power.h" +#if !MESHTASTIC_EXCLUDE_GPS +#include "GPS.h" +#endif + using namespace NicheGraphics; static constexpr uint8_t MENU_TIMEOUT_SEC = 60; // How many seconds before menu auto-closes @@ -161,12 +166,6 @@ void InkHUD::MenuApplet::execute(MenuItem item) case TOGGLE_APPLET: settings->userApplets.active[cursor] = !settings->userApplets.active[cursor]; inkhud->updateAppletSelection(); - // requestUpdate(Drivers::EInk::UpdateTypes::FULL); // Select FULL, seeing how this action doesn't auto exit - break; - - case ACTIVATE_APPLETS: - // Todo: remove this action? Already handled by TOGGLE_APPLET? - inkhud->updateAppletSelection(); break; case TOGGLE_AUTOSHOW_APPLET: @@ -205,6 +204,25 @@ void InkHUD::MenuApplet::execute(MenuItem item) backlight->latch(); break; + case TOGGLE_12H_CLOCK: + config.display.use_12h_clock = !config.display.use_12h_clock; + nodeDB->saveToDisk(SEGMENT_CONFIG); + break; + + case TOGGLE_GPS: + gps->toggleGpsMode(); + nodeDB->saveToDisk(SEGMENT_CONFIG); + break; + + case ENABLE_BLUETOOTH: + // This helps users recover from a bad wifi config + LOG_INFO("Enabling Bluetooth"); + config.network.wifi_enabled = false; + config.bluetooth.enabled = true; + nodeDB->saveToDisk(); + rebootAtMsec = millis() + 2000; + break; + default: LOG_WARN("Action not implemented"); } @@ -242,13 +260,21 @@ void InkHUD::MenuApplet::showPage(MenuPage page) case OPTIONS: // Optional: backlight - if (settings->optionalMenuItems.backlight) { - assert(backlight); + if (settings->optionalMenuItems.backlight) items.push_back(MenuItem(backlight->isLatched() ? "Backlight Off" : "Keep Backlight On", // Label MenuAction::TOGGLE_BACKLIGHT, // Action MenuPage::EXIT // Exit once complete )); - } + + // Optional: GPS + if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_DISABLED) + items.push_back(MenuItem("Enable GPS", MenuAction::TOGGLE_GPS, MenuPage::EXIT)); + if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) + items.push_back(MenuItem("Disable GPS", MenuAction::TOGGLE_GPS, MenuPage::EXIT)); + + // Optional: Enable Bluetooth, in case of lost wifi connection + if (!config.bluetooth.enabled || config.network.wifi_enabled) + items.push_back(MenuItem("Enable Bluetooth", MenuAction::ENABLE_BLUETOOTH, MenuPage::EXIT)); items.push_back(MenuItem("Applets", MenuPage::APPLETS)); items.push_back(MenuItem("Auto-show", MenuPage::AUTOSHOW)); @@ -260,26 +286,14 @@ void InkHUD::MenuApplet::showPage(MenuPage page) &settings->optionalFeatures.notifications)); items.push_back(MenuItem("Battery Icon", MenuAction::TOGGLE_BATTERY_ICON, MenuPage::OPTIONS, &settings->optionalFeatures.batteryIcon)); - - // TODO - GPS and Wifi switches - /* - // Optional: has GPS - if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_DISABLED) - items.push_back(MenuItem("Enable GPS", MenuPage::EXIT)); // TODO - if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) - items.push_back(MenuItem("Disable GPS", MenuPage::EXIT)); // TODO - - // Optional: using wifi - if (!config.bluetooth.enabled) - items.push_back(MenuItem("Enable Bluetooth", MenuPage::EXIT)); // TODO: escape hatch if wifi configured wrong - */ - + items.push_back( + MenuItem("12-Hour Clock", MenuAction::TOGGLE_12H_CLOCK, MenuPage::OPTIONS, &config.display.use_12h_clock)); items.push_back(MenuItem("Exit", MenuPage::EXIT)); break; case APPLETS: populateAppletPage(); - items.push_back(MenuItem("Exit", MenuAction::ACTIVATE_APPLETS)); + items.push_back(MenuItem("Exit", MenuPage::EXIT)); break; case AUTOSHOW: @@ -293,7 +307,6 @@ void InkHUD::MenuApplet::showPage(MenuPage page) case EXIT: sendToBackground(); // Menu applet dismissed, allow normal behavior to resume - // requestUpdate(Drivers::EInk::UpdateTypes::FULL); break; default: From bd2d2981c963bcd86fedf727ae15ebb028e68ff3 Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Mon, 31 Mar 2025 20:17:24 +1300 Subject: [PATCH 010/100] Add InkHUD driver for WeAct Studio 4.2" display module (#6384) * chore: todo.txt * chore: InkHUD documentation Word salad for maintainers * refactor: don't init system applets using onActivate System applets cannot be deactivated, so we will avoid using onActivate / onDeactivate methods entirely. * chore: update the example applets * fix: SSD16XX reset pulse Allow time for controller IC to wake. Aligns with manufacturer's suggestions. T-Echo button timing adjusted to prevent bouncing as a result(?) of slightly faster refreshes. * fix: allow timeout if display update fails Result is not graceful, but avoids total display lockup requiring power cycle. Typical cause of failure is poor wiring / power supply. * fix: improve display health on shutdown Two extra full refreshes, masquerading as a "shutting down" screen. One is drawn white-on-black, to really shake the pixels up. * feat: driver for display HINK_E042A87 As of Feb. 2025, these panels are used for "WeActStudio 4.2in B&W" display modules. * fix: inkhud rotation should default to 0 * Revert "chore: todo.txt" This reverts commit bea7df44a7cbf2f92e8c67c965e53d26a7885b11. * fix: more generous timeout for display updates Previously this was tied to the expected duration of the update, but this didn't account for any delay if our polling thread got held up by an unrelated firmware task. * fix: don't use the full shutdown screen during reboot * fix: cooldown period during the display shutdown display sequence Observed to prevent border pixels from being locked in place with some residual charge? --- src/graphics/niche/Drivers/EInk/EInk.cpp | 22 +- src/graphics/niche/Drivers/EInk/EInk.h | 5 +- .../niche/Drivers/EInk/HINK_E042A87.cpp | 58 ++ .../niche/Drivers/EInk/HINK_E042A87.h | 43 ++ src/graphics/niche/Drivers/EInk/README.md | 49 +- src/graphics/niche/Drivers/EInk/SSD16XX.cpp | 34 +- src/graphics/niche/Drivers/EInk/SSD16XX.h | 2 +- src/graphics/niche/InkHUD/Applet.cpp | 16 +- src/graphics/niche/InkHUD/Applet.h | 3 +- .../BasicExample/BasicExampleApplet.cpp | 2 +- .../NewMsgExample/NewMsgExampleApplet.cpp | 5 +- .../InkHUD/Applets/System/Logo/LogoApplet.cpp | 44 +- .../InkHUD/Applets/System/Logo/LogoApplet.h | 2 + .../InkHUD/Applets/System/Menu/MenuApplet.cpp | 2 - .../InkHUD/Applets/System/Menu/MenuApplet.h | 1 - .../InkHUD/Applets/System/Tips/TipsApplet.cpp | 2 - .../InkHUD/Applets/System/Tips/TipsApplet.h | 1 - src/graphics/niche/InkHUD/Events.cpp | 16 +- src/graphics/niche/InkHUD/Persistence.h | 2 +- src/graphics/niche/InkHUD/README.md | 12 - src/graphics/niche/InkHUD/SystemApplet.h | 2 + src/graphics/niche/InkHUD/docs/README.md | 640 ++++++++++++++++++ src/graphics/niche/InkHUD/docs/appletfont.png | Bin 0 -> 7797 bytes src/graphics/niche/InkHUD/docs/disclaimer.jpg | Bin 0 -> 17942 bytes src/graphics/niche/InkHUD/docs/rendering.gif | Bin 0 -> 78402 bytes .../niche/InkHUD/docs/tile_translation.png | Bin 0 -> 5832 bytes .../heltec_vision_master_e213/nicheGraphics.h | 19 +- .../heltec_vision_master_e290/nicheGraphics.h | 26 +- .../heltec_wireless_paper/nicheGraphics.h | 21 +- variants/t-echo/nicheGraphics.h | 4 +- 30 files changed, 945 insertions(+), 88 deletions(-) create mode 100644 src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp create mode 100644 src/graphics/niche/Drivers/EInk/HINK_E042A87.h delete mode 100644 src/graphics/niche/InkHUD/README.md create mode 100644 src/graphics/niche/InkHUD/docs/README.md create mode 100644 src/graphics/niche/InkHUD/docs/appletfont.png create mode 100644 src/graphics/niche/InkHUD/docs/disclaimer.jpg create mode 100644 src/graphics/niche/InkHUD/docs/rendering.gif create mode 100644 src/graphics/niche/InkHUD/docs/tile_translation.png diff --git a/src/graphics/niche/Drivers/EInk/EInk.cpp b/src/graphics/niche/Drivers/EInk/EInk.cpp index 043788b13..cd2e9dc98 100644 --- a/src/graphics/niche/Drivers/EInk/EInk.cpp +++ b/src/graphics/niche/Drivers/EInk/EInk.cpp @@ -6,7 +6,7 @@ using namespace NicheGraphics::Drivers; // Separate from EInk::begin method, as derived class constructors can probably supply these parameters as constants EInk::EInk(uint16_t width, uint16_t height, UpdateTypes supported) - : concurrency::OSThread("E-Ink Driver"), width(width), height(height), supportedUpdateTypes(supported) + : concurrency::OSThread("EInkDriver"), width(width), height(height), supportedUpdateTypes(supported) { OSThread::disable(); } @@ -31,8 +31,8 @@ bool EInk::supports(UpdateTypes type) void EInk::beginPolling(uint32_t interval, uint32_t expectedDuration) { updateRunning = true; - updateBegunAt = millis(); pollingInterval = interval; + pollingBegunAt = millis(); // To minimize load, we can choose to delay polling for a few seconds, if we know roughly how long the update will take // By default, expectedDuration is 0, and we'll start polling immediately @@ -45,10 +45,26 @@ void EInk::beginPolling(uint32_t interval, uint32_t expectedDuration) // This is what allows us to update the display asynchronously int32_t EInk::runOnce() { + // Check for polling timeout + // Manually set at 10 seconds, in case some big task holds up the firmware's cooperative multitasking + if (millis() - pollingBegunAt > 10000) + failed = true; + + // Handle failure + // - polling timeout + // - other error (derived classes) + if (failed) { + LOG_WARN("Display update failed. Check wiring & power supply."); + updateRunning = false; + failed = false; + return disable(); + } + + // If update not yet done if (!isUpdateDone()) return pollingInterval; // Poll again in a few ms - // If update done: + // If update done finalizeUpdate(); // Any post-update code: power down panel hardware, hibernate, etc updateRunning = false; // Change what we report via EInk::busy() return disable(); // Stop polling diff --git a/src/graphics/niche/Drivers/EInk/EInk.h b/src/graphics/niche/Drivers/EInk/EInk.h index facb8ce72..3c51d4f1d 100644 --- a/src/graphics/niche/Drivers/EInk/EInk.h +++ b/src/graphics/niche/Drivers/EInk/EInk.h @@ -24,7 +24,7 @@ class EInk : private concurrency::OSThread enum UpdateTypes : uint8_t { UNSPECIFIED = 0, FULL = 1 << 0, - FAST = 1 << 1, + FAST = 1 << 1, // "Partial Refresh" }; EInk(uint16_t width, uint16_t height, UpdateTypes supported); @@ -41,14 +41,15 @@ class EInk : private concurrency::OSThread void beginPolling(uint32_t interval, uint32_t expectedDuration); // Begin checking repeatedly if update finished virtual bool isUpdateDone() = 0; // Check once if update finished virtual void finalizeUpdate() {} // Run any post-update code + bool failed = false; // If an error occurred during update private: int32_t runOnce() override; // Repeated checking if update finished const UpdateTypes supportedUpdateTypes; // Capabilities of a derived display class bool updateRunning = false; // see EInk::busy() - uint32_t updateBegunAt = 0; // For initial pause before polling for update completion uint32_t pollingInterval = 0; // How often to check if update complete (ms) + uint32_t pollingBegunAt = 0; // To timeout during polling }; } // namespace NicheGraphics::Drivers diff --git a/src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp b/src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp new file mode 100644 index 000000000..1b72bc4a9 --- /dev/null +++ b/src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp @@ -0,0 +1,58 @@ +#include "./HINK_E042A87.h" + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +using namespace NicheGraphics::Drivers; + +// Load settings about how the pixels are moved from old state to new state during a refresh +// - manually specified, +// - or with stored values from displays OTP memory +void HINK_E042A87::configWaveform() +{ + sendCommand(0x3C); // Border waveform: + sendData(0x01); // Follow LUT for VSH1 + + sendCommand(0x18); // Temperature sensor: + sendData(0x80); // Use internal temperature sensor to select an appropriate refresh waveform +} + +// Describes the sequence of events performed by the displays controller IC during a refresh +// Includes "power up", "load settings from memory", "update the pixels", etc +void HINK_E042A87::configUpdateSequence() +{ + switch (updateType) { + case FAST: + sendCommand(0x21); // Use both "old" and "new" image memory (differential) + sendData(0x00); + sendData(0x00); + + sendCommand(0x22); // Set "update sequence" + sendData(0xFF); // Differential, load waveform from OTP + break; + + case FULL: + default: + sendCommand(0x21); // Bypass "old" image memory (non-differential) + sendData(0x40); + sendData(0x00); + + sendCommand(0x22); // Set "update sequence": + sendData(0xF7); // Non-differential, load waveform from OTP + break; + } +} + +// Once the refresh operation has been started, +// begin periodically polling the display to check for completion, using the normal Meshtastic threading code +// Only used when refresh is "async" +void HINK_E042A87::detachFromUpdate() +{ + switch (updateType) { + case FAST: + return beginPolling(50, 1000); // At least 1 second, then check every 50ms + case FULL: + default: + return beginPolling(100, 3500); // At least 3.5 seconds, then check every 100ms + } +} +#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/HINK_E042A87.h b/src/graphics/niche/Drivers/EInk/HINK_E042A87.h new file mode 100644 index 000000000..ac03b65ef --- /dev/null +++ b/src/graphics/niche/Drivers/EInk/HINK_E042A87.h @@ -0,0 +1,43 @@ +/* + +E-Ink display driver + - HINK-E042A87 + - Manufacturer: Holitech + - Size: 4.2 inch + - Resolution: 400px x 300px + - Flex connector marking: HINK-E042A07-FPC-A1 + - Silver sticker with QR code, marked: HE042A87 + + Note: as of Feb. 2025, these panels are used for "WeActStudio 4.2in B&W" display modules + +*/ + +#pragma once + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +#include "configuration.h" + +#include "./SSD16XX.h" + +namespace NicheGraphics::Drivers +{ +class HINK_E042A87 : public SSD16XX +{ + // Display properties + private: + static constexpr uint32_t width = 400; + static constexpr uint32_t height = 300; + static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST); + + public: + HINK_E042A87() : SSD16XX(width, height, supported) {} + + protected: + void configWaveform() override; + void configUpdateSequence() override; + void detachFromUpdate() override; +}; + +} // namespace NicheGraphics::Drivers +#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/README.md b/src/graphics/niche/Drivers/EInk/README.md index 04a23a31f..eca91c6a8 100644 --- a/src/graphics/niche/Drivers/EInk/README.md +++ b/src/graphics/niche/Drivers/EInk/README.md @@ -28,6 +28,17 @@ void setupNicheGraphics() } ``` +- [Methods](#methods) + - [`update(uint8_t *imageData, UpdateTypes type)`](#updateuint8_t-imagedata-updatetypes-type) + - [`await()`](#await) + - [`supports(UpdateTypes type)`](#supportsupdatetypes-type) + - [`busy()`](#busy) + - [`width()`](#width) + - [`height()`](#height) +- [Supporting New Displays](#supporting-new-displays) + - [Controller IC](#controller-ic) + - [Finding Information](#finding-information) + ## Methods ### `update(uint8_t *imageData, UpdateTypes type)` @@ -37,7 +48,7 @@ Update the image on the display - _`imageData`_ to draw to the display. - _`type`_ which type of update to perform. - `FULL` - - `FAST` + - `FAST` (partial refresh) - (Other custom types may be possible) The imageData is a 1-bit image. X-Pixels are 8-per byte, with the MSB being the leftmost pixel. This was not an InkHUD design decision; it is the raw format accepted by the E-Ink display controllers ICs. @@ -83,3 +94,39 @@ Width of the display, in pixels. Note: most displays are portrait. Your UI will ### `height()` Height of the display, in pixels. Note: most displays are portrait. Your UI will need to implement rotation in software. + +## Supporting New Displays + +_This topic is not covered in depth, but these notes may be helpful._ + +The `InkHUD::Drivers::EInk` class contains only the mechanism for implementing an E-Ink driver on-top of Meshtastic's `OSThread`. A driver for a specific display needs to extend this class. + +### Controller IC + +If your display uses a controller IC from Solomon Systech, you can probably extend the existing `Drivers::SSD16XX` class, making only minor modifications. + +At this stage, displays using controller ICS from other manufacturers (UltraChip, Fitipower, etc) need to manually implemented. See `Drivers::LCMEN2R13EFC1` for an example. + +Generic base classes for manufacturers other than Solomon Systech might be added here in future. + +### Finding Information + +#### Flex-Connector Labels + +The orange flex-connector attached to E-Ink displays is often printed with an identifying label. This is not a _totally_ unique identifier, but does give a very strong clue as to the true model of the display, which can be used to search out further information. + +#### Datasheets + +The manufacturer of a DIY display module may publish a datasheet. These are often incomplete, but might reveal the true model of the display, or the controller IC. + +If you can determine the true model name of the display, you can likely find a more complete datasheet on the display manufacturer's website. This will often provide a "typical operating sequence"; a general overview of the code used to drive the display + +#### Example Code + +The manufacturer of a DIY module may publish example code. You may have more luck finding example code published by the display manufacturer themselves, if you can determine the true model of the panel. These examples are a very valuable reference. + +#### Other E-Ink drivers + +Libraries like ZinggJM's GxEPD2 can be valuable sources of information, although your panel may not be _specifically_ supported, and only _compatible_ with a driver there, so some caution is advised. + +The display selection file in GxEPD2's Hello World example is also a useful resource for matching "flex connector labels" with display models, but the flex connector label is _not_ a unique identifier, so this is only another clue. diff --git a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp index 07d02a2ae..5a5397dbd 100644 --- a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp +++ b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp @@ -37,11 +37,26 @@ void SSD16XX::begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_b reset(); } -void SSD16XX::wait() +// Poll the displays busy pin until an operation is complete +// Timeout and set fail flag if something went wrong and the display got stuck +void SSD16XX::wait(uint32_t timeout) { + // Don't bother waiting if part of the update sequence failed + // In that situation, we're now just failing-through the process, until we can try again with next update. + if (failed) + return; + + uint32_t startMs = millis(); + // Busy when HIGH - while (digitalRead(pin_busy) == HIGH) + while (digitalRead(pin_busy) == HIGH) { + // Check for timeout + if (millis() - startMs > timeout) { + failed = true; + break; + } yield(); + } } void SSD16XX::reset() @@ -50,8 +65,9 @@ void SSD16XX::reset() if (pin_rst != 0xFF) { pinMode(pin_rst, OUTPUT); digitalWrite(pin_rst, LOW); - delay(50); - pinMode(pin_rst, INPUT_PULLUP); + delay(10); + digitalWrite(pin_rst, HIGH); + delay(10); wait(); } @@ -61,6 +77,11 @@ void SSD16XX::reset() void SSD16XX::sendCommand(const uint8_t command) { + // Abort if part of the update sequence failed + // This will unlock again once we have failed-through the entire process + if (failed) + return; + spi->beginTransaction(spiSettings); digitalWrite(pin_dc, LOW); // DC pin low indicates command digitalWrite(pin_cs, LOW); @@ -77,6 +98,11 @@ void SSD16XX::sendData(uint8_t data) void SSD16XX::sendData(const uint8_t *data, uint32_t size) { + // Abort if part of the update sequence failed + // This will unlock again once we have failed-through the entire process + if (failed) + return; + spi->beginTransaction(spiSettings); digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command digitalWrite(pin_cs, LOW); diff --git a/src/graphics/niche/Drivers/EInk/SSD16XX.h b/src/graphics/niche/Drivers/EInk/SSD16XX.h index 88fe4dc25..799a378c0 100644 --- a/src/graphics/niche/Drivers/EInk/SSD16XX.h +++ b/src/graphics/niche/Drivers/EInk/SSD16XX.h @@ -27,7 +27,7 @@ class SSD16XX : public EInk virtual void update(uint8_t *imageData, UpdateTypes type) override; protected: - virtual void wait(); + virtual void wait(uint32_t timeout = 1000); virtual void reset(); virtual void sendCommand(const uint8_t command); virtual void sendData(const uint8_t data); diff --git a/src/graphics/niche/InkHUD/Applet.cpp b/src/graphics/niche/InkHUD/Applet.cpp index 459f30213..6c6245ec3 100644 --- a/src/graphics/niche/InkHUD/Applet.cpp +++ b/src/graphics/niche/InkHUD/Applet.cpp @@ -802,7 +802,7 @@ uint16_t InkHUD::Applet::getLogoHeight(uint16_t limitWidth, uint16_t limitHeight // // \\ */ -void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height) +void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height, Color color) { struct Point { int x; @@ -908,24 +908,24 @@ void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width, Point aq2{a2.x - fromPath.x, a2.y - fromPath.y}; Point aq3{a2.x + fromPath.x, a2.y + fromPath.y}; Point aq4{a1.x + fromPath.x, a1.y + fromPath.y}; - fillTriangle(aq1.x, aq1.y, aq2.x, aq2.y, aq3.x, aq3.y, BLACK); - fillTriangle(aq1.x, aq1.y, aq3.x, aq3.y, aq4.x, aq4.y, BLACK); + fillTriangle(aq1.x, aq1.y, aq2.x, aq2.y, aq3.x, aq3.y, color); + fillTriangle(aq1.x, aq1.y, aq3.x, aq3.y, aq4.x, aq4.y, color); // Make the path thick: path b becomes quad b Point bq1{b1.x - fromPath.x, b1.y - fromPath.y}; Point bq2{b2.x - fromPath.x, b2.y - fromPath.y}; Point bq3{b2.x + fromPath.x, b2.y + fromPath.y}; Point bq4{b1.x + fromPath.x, b1.y + fromPath.y}; - fillTriangle(bq1.x, bq1.y, bq2.x, bq2.y, bq3.x, bq3.y, BLACK); - fillTriangle(bq1.x, bq1.y, bq3.x, bq3.y, bq4.x, bq4.y, BLACK); + fillTriangle(bq1.x, bq1.y, bq2.x, bq2.y, bq3.x, bq3.y, color); + fillTriangle(bq1.x, bq1.y, bq3.x, bq3.y, bq4.x, bq4.y, color); // Make the path thick: path c becomes quad c Point cq1{c1.x - fromPath.x, c1.y + fromPath.y}; Point cq2{c2.x - fromPath.x, c2.y + fromPath.y}; Point cq3{c2.x + fromPath.x, c2.y - fromPath.y}; Point cq4{c1.x + fromPath.x, c1.y - fromPath.y}; - fillTriangle(cq1.x, cq1.y, cq2.x, cq2.y, cq3.x, cq3.y, BLACK); - fillTriangle(cq1.x, cq1.y, cq3.x, cq3.y, cq4.x, cq4.y, BLACK); + fillTriangle(cq1.x, cq1.y, cq2.x, cq2.y, cq3.x, cq3.y, color); + fillTriangle(cq1.x, cq1.y, cq3.x, cq3.y, cq4.x, cq4.y, color); // Radius the intersection of quad b and quad c /* @@ -944,7 +944,7 @@ void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width, // The radius for the cap *should* be the same as logoTh, but it's not, due to accumulated rounding // We get better results just re-deriving it int16_t capRad = sqrt(pow(fromPath.x, 2) + pow(fromPath.y, 2)); - fillCircle(b2.x, b2.y, capRad, BLACK); + fillCircle(b2.x, b2.y, capRad, color); } } diff --git a/src/graphics/niche/InkHUD/Applet.h b/src/graphics/niche/InkHUD/Applet.h index 028b24f9c..8f4466647 100644 --- a/src/graphics/niche/InkHUD/Applet.h +++ b/src/graphics/niche/InkHUD/Applet.h @@ -130,7 +130,8 @@ class Applet : public GFX static constexpr float LOGO_ASPECT_RATIO = 1.9; // Width:Height for drawing the Meshtastic logo uint16_t getLogoWidth(uint16_t limitWidth, uint16_t limitHeight); // Size Meshtastic logo to fit within region uint16_t getLogoHeight(uint16_t limitWidth, uint16_t limitHeight); // Size Meshtastic logo to fit within region - void drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height); // Draw the meshtastic logo + void drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height, + Color color = BLACK); // Draw the Meshtastic logo std::string hexifyNodeNum(NodeNum num); // Style as !0123abdc SignalStrength getSignalStrength(float snr, float rssi); // Interpret SNR and RSSI, as an easy to understand value diff --git a/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp b/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp index 17458ab96..b12ea4809 100644 --- a/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp @@ -8,7 +8,7 @@ using namespace NicheGraphics; // Our basic example doesn't do anything useful. It just passively prints some text. void InkHUD::BasicExampleApplet::onRender() { - print("Hello, World!"); + printAt(0, 0, "Hello, World!"); } #endif \ No newline at end of file diff --git a/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp b/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp index e31f534ac..6b02f4c92 100644 --- a/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp @@ -4,11 +4,12 @@ using namespace NicheGraphics; -// We configured MeshModule API to call this method when we receive a new text message +// We configured the Module API to call this method when we receive a new text message ProcessMessage InkHUD::NewMsgExampleApplet::handleReceived(const meshtastic_MeshPacket &mp) { // Abort if applet fully deactivated + // Don't waste time: we wouldn't be rendered anyway if (!isActive()) return ProcessMessage::CONTINUE; @@ -25,7 +26,7 @@ ProcessMessage InkHUD::NewMsgExampleApplet::handleReceived(const meshtastic_Mesh requestUpdate(); } - // Tell MeshModule API to continue informing other firmware components about this message + // Tell Module API to continue informing other firmware components about this message // We're not the only component which is interested in new text messages return ProcessMessage::CONTINUE; } diff --git a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp index 24c2d88a4..520b3ef65 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp @@ -34,7 +34,15 @@ void InkHUD::LogoApplet::onRender() int16_t logoCX = X(0.5); int16_t logoCY = Y(0.5 - 0.05); - drawLogo(logoCX, logoCY, logoW, logoH); + // Invert colors if black-on-white + // Used during shutdown, to resport display health + // Todo: handle this in InkHUD::Renderer instead + if (inverted) { + fillScreen(BLACK); + setTextColor(WHITE); + } + + drawLogo(logoCX, logoCY, logoW, logoH, inverted ? WHITE : BLACK); if (!textLeft.empty()) { setFont(fontSmall); @@ -74,13 +82,45 @@ void InkHUD::LogoApplet::onBackground() // Begin displaying the screen which is shown at shutdown void InkHUD::LogoApplet::onShutdown() { + bringToForeground(); + + textLeft = ""; + textRight = ""; + textTitle = "Shutting Down..."; + fontTitle = fontSmall; + + // Draw a shutting down screen, twice. + // Once white on black, once black on white. + // Intention is to restore display health. + + inverted = true; + inkhud->forceUpdate(Drivers::EInk::FULL, false); + delay(1000); // Cooldown. Back to back updates aren't great for health. + inverted = false; + inkhud->forceUpdate(Drivers::EInk::FULL, false); + delay(1000); // Cooldown + + // Prepare for the powered-off screen now + // We can change these values because the initial "shutting down" screen has already rendered at this point textLeft = ""; textRight = ""; textTitle = owner.short_name; fontTitle = fontLarge; + // This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update, after InkHUD's flash write is complete +} + +void InkHUD::LogoApplet::onReboot() +{ bringToForeground(); - // This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update + + textLeft = ""; + textRight = ""; + textTitle = "Rebooting..."; + fontTitle = fontSmall; + + inkhud->forceUpdate(Drivers::EInk::FULL, false); + // Perform the update right now, waiting here until complete } int32_t InkHUD::LogoApplet::runOnce() diff --git a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h index b55d4a2d9..3f604baed 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h +++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h @@ -25,6 +25,7 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread void onForeground() override; void onBackground() override; void onShutdown() override; + void onReboot() override; protected: int32_t runOnce() override; @@ -33,6 +34,7 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread std::string textRight; std::string textTitle; AppletFont fontTitle; + bool inverted = false; // Invert colors. Used during shutdown, to restore display health. }; } // namespace NicheGraphics::InkHUD diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp index 4c411bb85..f59579230 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp @@ -32,8 +32,6 @@ InkHUD::MenuApplet::MenuApplet() : concurrency::OSThread("MenuApplet") } } -void InkHUD::MenuApplet::onActivate() {} - void InkHUD::MenuApplet::onForeground() { // We do need this before we render, but we can optimize by just calculating it once now diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h index fe72d826b..d9297c8ed 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h @@ -21,7 +21,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread { public: MenuApplet(); - void onActivate() override; void onForeground() override; void onBackground() override; void onButtonShortPress() override; diff --git a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp index 1abf3ccfa..82a196cb1 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp @@ -207,8 +207,6 @@ void InkHUD::TipsApplet::onBackground() inkhud->forceUpdate(EInk::UpdateTypes::FULL); } -void InkHUD::TipsApplet::onActivate() {} - // While our SystemApplet::handleInput flag is true void InkHUD::TipsApplet::onButtonShortPress() { diff --git a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h index e7bb7bedc..db88585e9 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h +++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h @@ -33,7 +33,6 @@ class TipsApplet : public SystemApplet TipsApplet(); void onRender() override; - void onActivate() override; void onForeground() override; void onBackground() override; void onButtonShortPress() override; diff --git a/src/graphics/niche/InkHUD/Events.cpp b/src/graphics/niche/InkHUD/Events.cpp index 10072b302..ddd01b7e1 100644 --- a/src/graphics/niche/InkHUD/Events.cpp +++ b/src/graphics/niche/InkHUD/Events.cpp @@ -70,6 +70,9 @@ void InkHUD::Events::onButtonLong() // Returns 0 to signal that we agree to sleep now int InkHUD::Events::beforeDeepSleep(void *unused) { + // If a previous display update is in progress, wait for it to complete. + inkhud->awaitUpdate(); + // Notify all applets that we're shutting down for (Applet *ua : inkhud->userApplets) { ua->onDeactivate(); @@ -87,9 +90,12 @@ int InkHUD::Events::beforeDeepSleep(void *unused) inkhud->persistence->saveSettings(); inkhud->persistence->saveLatestMessage(); - // LogoApplet::onShutdown will have requested an update, to draw the shutdown screen - // Draw that now, and wait here until the update is complete + // LogoApplet::onShutdown attempted to heal the display by drawing a "shutting down" screen twice, + // then prepared a final powered-off screen for us, which shows device shortname. + // We're updating to show that one now. + inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FULL, false); + delay(1000); // Cooldown, before potentially yanking display power return 0; // We agree: deep sleep now } @@ -106,16 +112,16 @@ int InkHUD::Events::beforeReboot(void *unused) a->onDeactivate(); a->onShutdown(); } - for (Applet *sa : inkhud->systemApplets) { + for (SystemApplet *sa : inkhud->systemApplets) { // Note: no onDeactivate. System applets are always active. - sa->onShutdown(); + sa->onReboot(); } inkhud->persistence->saveSettings(); inkhud->persistence->saveLatestMessage(); // Note: no forceUpdate call here - // Because OSThread will not be given another chance to run before reboot, this means that no display update will occur + // We don't have any final screen to draw, although LogoApplet::onReboot did already display a "rebooting" screen return 0; // No special status to report. Ignored anyway by this Observable } diff --git a/src/graphics/niche/InkHUD/Persistence.h b/src/graphics/niche/InkHUD/Persistence.h index 28841d4d9..40f1dd521 100644 --- a/src/graphics/niche/InkHUD/Persistence.h +++ b/src/graphics/niche/InkHUD/Persistence.h @@ -99,7 +99,7 @@ class Persistence // Rotation of the display // Multiples of 90 degrees clockwise // Most commonly: rotation is 0 when flex connector is oriented below display - uint8_t rotation = 1; + uint8_t rotation = 0; // How long do we consider another node to be "active"? // Used when applets want to filter for "active nodes" only diff --git a/src/graphics/niche/InkHUD/README.md b/src/graphics/niche/InkHUD/README.md deleted file mode 100644 index 8d788ffa8..000000000 --- a/src/graphics/niche/InkHUD/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# InkHUD - -A heads-up-display for E-Ink devices, intended to supplement a connected phone / client. Implemented as a "NicheGraphics" UI. - -Supported devices (as of 1st Feb. 2025): - -- Heltec Vision Master E213 -- Heltec Vision Master E290 -- Heltec Wireless Paper V1.1 -- LILYGO T-Echo - -More to follow diff --git a/src/graphics/niche/InkHUD/SystemApplet.h b/src/graphics/niche/InkHUD/SystemApplet.h index 0f8ceedc7..7ee47eeb9 100644 --- a/src/graphics/niche/InkHUD/SystemApplet.h +++ b/src/graphics/niche/InkHUD/SystemApplet.h @@ -26,6 +26,8 @@ class SystemApplet : public Applet bool lockRendering = false; // - prevent other applets from being rendered during an update bool lockRequests = false; // - prevent other applets from triggering display updates + virtual void onReboot() { onShutdown(); } // - handle reboot specially + // Other system applets may take precedence over our own system applet though // The order an applet is passed to WindowManager::addSystemApplet determines this hierarchy (added earlier = higher rank) diff --git a/src/graphics/niche/InkHUD/docs/README.md b/src/graphics/niche/InkHUD/docs/README.md new file mode 100644 index 000000000..07fe6c942 --- /dev/null +++ b/src/graphics/niche/InkHUD/docs/README.md @@ -0,0 +1,640 @@ +# InkHUD + +This document is intended as a reference for maintainers. A haphazard collection of notes which _might_ be helpful. + +self deprecating meme + +--- + +- [Purpose](#purpose) +- [Design Principles](#design-principles) + - [Self-Contained](#self-contained) + - [Static](#static) + - [Non-interactive](#non-interactive) + - [Customizable](#customizable) + - [Event-Driven Rendering](#event-driven-rendering) + - [No `#ifdef` spaghetti](#no-ifdef-spaghetti) +- [The Implementation](#the-implementation) +- [The Rendering Process](#the-rendering-process) +- [Concepts](#concepts) + - [NicheGraphics Framework](#nichegraphics-framework) + - [NicheGraphics E-Ink Drivers](#nichegraphics-e-ink-drivers) + - [InkHUD Applets](#inkhud-applets) +- [Adding a Variant](#adding-a-variant) + - [platformio.ini](#platformioini) + - [nicheGraphics.h](#nichegraphicsh) +- [Class Notes](#class-notes) + - [`InkHUD::InkHUD`](#inkhudinkhud) + - [`InkHUD::Persistence`](#inkhudpersistence) + - [`InkHUD::Persistence::Settings`](#inkhudpersistencesettings) + - [`InkHUD::Persistence::LatestMessage`](#inkhudpersistencelatestmessage) + - [`InkHUD::WindowManager`](#inkhudwindowmanager) + - [`InkHUD::Renderer`](#inkhudrenderer) + - [`InkHUD::Renderer::DisplayHealth`](#inkhudrendererdisplayhealth) + - [`InkHUD::Events`](#inkhudevents) + - [`InkHUD::Applet`](#inkhudapplet) + - [`InkHUD::SystemApplet`](#inkhudsystemapplet) + - [`InkHUD::Tile`](#inkhudtile) + - [`InkHUD::AppletFont`](#inkhudappletfont) + +## Purpose + +InkHUD is a minimal UI for E-Ink devices. It displays the user's choice of info, as statically as possible, to minimize the amount of display refreshing. + +It is intended to supplement a connected client app. + +## Design Principles + +### Self-Contained + +- Keep InkHUD code within `/src/graphics/niche/InkHUD`. +- Place reusable components within `/src/graphics/niche`, for other UIs to take advantage of. +- Interact with the firmware code using the **Module API**, **Observables**, and other similarly non-intrusive hooks. + +### Static + +Information should be displayed as statically as possible. Unnecessary updates should be avoided. + +As as example, fixed timestamps are used instead of `X seconds ago` labels, as these need to be constantly updated to remain current. + +### Non-interactive + +InkHUD aims to be a "heads up display". The intention is for the user to glance at the display. The intention is _not_ for the user to frequently interact with the display. + +Some interactivity is tolerated as a means to an end: the display _should_ be customizable, but this should be minimized as much as possible. + +_Edit: there's significant demand for keyboard support, so some sort of free-text feature will need to be added eventually, although it does go against the original design principles._ + +### Customizable + +The user should be given the choice to decide which information they would like to receive, and how they would like to receive it. + +### Event-Driven Rendering + +The display image does not update "automatically". Individual applets are responsible for deciding when they have new information to show, and then requesting a display update. + +### No `#ifdef` spaghetti + +**Don't** use preprocessor macros for device-specific configuration. This should be achieved with config methods, in [`nicheGraphics.h`](#nichegraphicsh). + +**Do** use preprocessor macros to guard all files + +- `#ifdef MESHTASTIC_INCLUDE_INKHUD` for InkHUD files +- `#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS` for reusable components (drivers, etc) + +## The Implementation + +- Variant's platformio.ini file extends `inkhud` (defined in InkHUD/PlatformioConfig.ini) + - original screen class suppressed: `MESHTASTIC_EXCLUDE_SCREEN` + - ButtonThread suppressed: `HAS_BUTTON=0` + - NicheGraphics components included: `MESHTASTIC_INCLUDE_NICHE_GRAPHICS` + - InkHUD components included: `MESHTASTIC_INCLUDE_INKHUD` +- `main.cpp` + - includes `nicheGraphics.h` (from variant folder) + - calls `setupNicheGraphics`, (from nicheGraphics.h) +- `nicheGraphics.h` + - includes InkHUD components + - includes shared NicheGraphics components + - `setupNicheGraphics` + - configures and connects components + - `inkhud->begin` + +## The Rendering Process + +(animated diagram) + +animated process diagram of InkHUD rendering + +An overview: + +- A component calls `requestUpdate` (applets only) or `InkHUD::forceUpdate` +- `Renderer` schedules a render cycle for the next loop(), using `Renderer::runOnce` +- `Renderer` determines whether the update request is valid +- `Renderer` asks relevant applets to render +- Applet dimensions are updated (by Applet's `Tile`) +- Applets generate pixel output, and pass this to their `Tile` +- Tiles shift these "relative" pixels to their true region, for multiplexing +- Tiles pass the pixels to `Renderer` +- `Renderer` applies any global display rotation to the pixels +- `Renderer` combines the pixels into the finished image +- The finished image is passed to the display driver, starting the physical update process + +## Concepts + +### NicheGraphics Framework + +InkHUD is implemented as a _NicheGraphics_ UI. + +Intended as a pattern / philosophy for implementing self-contained UIs, to suit various niche devices, which are best served by their own custom user interface. + +Hypothetical examples: E-Ink, 1602 LCDs, tiny OLEDs, smart watches, etc + +A NicheGraphics UI: + +- Is self-contained +- Makes use of the loose collection of resources (drivers, input methods, etc) gathered in the `/src/graphics/niche` folder. +- Implements a `setupNicheGraphics()` method. + +### NicheGraphics E-Ink Drivers + +InkHUD uses a set of custom E-Ink drivers. These are not based on GxEPD2, or any other code base. They are written directly on-top of the Meshtastic firmware, to make use of the OSThread class for asynchronous display updates. + +Interacting with the drivers is straightforward. InkHUD generates a frame of 1-bit image data. This image data is passed to the driver, along with the type of refresh to use (FULL or FAST). + +`driver->update(uint8_t* buffer, EInk::UpdateTypes::FULL)` + +For more information, see the documentation in `src/graphics/niche/Drivers/EInk` + +### InkHUD Applets + +An InkHUD applet is a class which generates a screen of info for the display. + +Consider: `DMApplet.h` (displays most recent direct message) and `RecentsList.h` (displays a list of recently heard nodes) + +- Applets are modular: they are easy to write, and easy to implement. Users select which applets they want, using the menu. +- Applets use responsive design. They should scale for different screens / layouts / fonts. +- Applets decide when to update. They use the Module API, Observers, etc, to retrieve information, and request a display update when they have something interesting to show. + +See `src/graphics/niche/InkHUD/Applets/Examples` for example code. + +#### Writing an Applet + +Your new applet class will inherit `InkHUD::Applet`. + +```cpp +class BasicExampleApplet : public Applet +{ + public: + // You must have an onRender() method + // All drawing happens here + + void onRender() override; +}; +``` + +The `onRender` method is called when the display image is redrawn. This can happen at any time, so be ready! + +```cpp +// All drawing happens here +// Our basic example doesn't do anything useful. It just passively prints some text. +void InkHUD::BasicExampleApplet::onRender() +{ + printAt(0, 0, "Hello, world!"); +} +``` + +Your applet will need to scale automatically, to suit a variety of screens / layouts / fonts. Make sure you draw relative to applet's size. + +| edge | coordinate | shorthand | +| ------ | ---------- | --------- | +| left | 0 | `X(0.0)` | +| top | 0 | `Y(0.0)` | +| right | `width()` | `X(1.0)` | +| bottom | `height()` | `Y(1.0)` | + +The same principles apply for drawing text. Methods like `AppletFont::lineHeight` and `getTextWidth` are useful here. + +```cpp +std::string line1 = "Line 1"; +printAt(0, Y(0.5), line1); +drawRect(0, Y(0.5), getTextWidth(line1), fontSmall.lineHeight(), BLACK); +``` + +Your applet will only be redrawn when _something_ requests a display update. Your applet is welcome to request a display update, when it determines that it has new info to display, by calling `requestUpdate`. + +Exactly how you determine this, depends on what your applet actually does. Here's a code snippet from one of the example applets. The applet is requesting an update when a new message is received. + +```cpp +// We configured the Module API to call this method when we receive a new text message +ProcessMessage InkHUD::NewMsgExampleApplet::handleReceived(const meshtastic_MeshPacket &mp) +{ + + // Abort if applet fully deactivated + // Don't waste time: we wouldn't be rendered anyway + if (!isActive()) + return ProcessMessage::CONTINUE; + + // Check that this is an incoming message + // Outgoing messages (sent by us) will also call handleReceived + + if (!isFromUs(&mp)) { + // Store the sender's nodenum + // We need to keep this information, so we can re-use it anytime render() is called + haveMessage = true; + fromWho = mp.from; + + // Tell InkHUD that we have something new to show on the screen + requestUpdate(); + } + + // Tell Module API to continue informing other firmware components about this message + // We're not the only component which is interested in new text messages + return ProcessMessage::CONTINUE; +} +``` + +#### Implementing an Applet + +Incorporating your new applet into InkHUD is easy. + +In a variant's `nicheGraphics.h`: + +- `#include` your applet +- `inkhud->addApplet("My Applet", new InkHUD::MyApplet);` + +You will need to add these lines to any variants which will use your applet. + +#### Applet Bases + +If you need to create several similar applets, it might make sense to create a reusable base class. Several of these already exist in `src/graphics/niche/InkHUD/Applets/Bases`, but use these with caution, as they may be modified in future. + +#### System Applets + +So far, we have been talking about "user applets". We also recognize a separate category of "system applets". These handle things like the menu, and the boot screen. These often need special handling, and need to be implemented manually. + +## Adding a Variant + +In `/variants//`: + +### platformio.ini + +Extend `inkhud`, then combine with any other platformio config your hardware variant requires. + +_(Example shows only config required by InkHUD. This is not a complete `env` definition.)_ + +```ini +[env:YOUR_VARIANT-inkhud] +extends = esp32s3_base, inkhud ; or nrf52840_base, etc + +build_src_filter = +${esp32_base.build_src_filter} +${inkhud.build_src_filter} + +build_flags = +${esp32s3_base.build_flags} +${inkhud.build_flags} + +lib_deps = +${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX +${esp32s3_base.lib_deps} +``` + +### nicheGraphics.h + +⚠ Wrap this file in `#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS` + +`nicheGraphics.h` should be placed in the same folder as your variant's `platformio.ini`. If this is not possible, modify `build_src_filter`. + +`nicheGraphics.h` should contain a `setupNicheGraphics` method, which creates and configures the various components for InkHUD. + +- Display + - Start SPI + - Create display driver +- InkHUD + - Create InkHUD instance + - Set E-Ink fast refresh limit (`setDisplayResilience`) + - Set fonts + - Set default user-settings + - Select applets to build (`addApplet`) + - Start InkHUD +- Buttons + - Setup `TwoButton` driver (user button, optional "auxiliary" button) + - Connect to InkHUD handlers (use lambdas) + +For well commented examples, see: + +- `variants/heltec_vision_master_e290/nicheGraphics.h` (ESP32) +- `variants/t-echo/nicheGraphics.h` (NRF52) + +## Class Notes + +### `InkHUD::InkHUD` + +_`src/graphics/niche/InkHUD/InkHUD.h`_ + +- singleton +- mediator between other InkHUD components + +#### `getInstance()` + +Gets access to the class. +First `getInstance` call instantiates the class, and the subclasses: + +- `InkHUD::Persistence` +- `InkHUD::WindowManager` +- `InkHUD::Renderer` +- `InkHUD::Events` + +For convenience, many InkHUD components call this on `begin`, and store it as `InkHUD* inkhud`. + +--- + +### `InkHUD::Persistence` + +_`src/graphics/niche/InkHUD/Persistence.h`_ + +Stores InkHUD data in flash + +- settings +- most recent text message received (both for broadcast and DM) + +In rare cases, applets may store their own specific data separately (e.g. `ThreadedMessageApplet`) + +Data saved only on shutdown / reboot. Not saved if power is removed unexpectedly. + +--- + +### `InkHUD::Persistence::Settings` + +_`src/graphics/niche/InkHUD/Persistence.h`_ + +Settings which relate to InkHUD. Mostly user's customization, but some values record the UI's state (e.g. `tips.safeShutdownSeen`) + +- stored using `FlashData.h` (a shared Niche Graphics tool) +- not encoded as protobufs +- serialized directly as bytes of struct + +#### Defaults + +Global default values are set when the struct is defined (Persistence.h). +Per-variant defaults are set by modifying the values of the settings instance during `setupNicheGraphics()`, before `inkhud->begin` is called. + +```cpp +inkhud->persistence->settings.userTiles.count = 2; +inkhud->persistence->settings.userTiles.maxCount = 4; +inkhud->persistence->settings.rotation = 3; +``` + +By modifying the values at this point, they will be used if we fail to load previous settings from flash (not yet saved, old version, etc) + +--- + +### `InkHUD::Persistence::LatestMessage` + +_`src/graphics/niche/InkHUD/Persistence.h`_ + +Most recently received text message + +- most recent DM +- most recent broadcast + +Collected here, so various user applets don't all have to store their own copy of this info. + +We are unable to use `devicestate.rx_text_message` for this purpose, because: + +- it is cleared by an outgoing text message +- we want to store both a recent broadcast and a recent DM + +#### Saving / Loading + +_A bit of a hack.._ +Stored to flash using `InkHUD::MessageStore`, which is really intended for storing a thread of messages (see `ThreadedMessageApplet`). Used because it stores strings more efficiently than `FlashData.h`. + +The hack is: + +- If most recent message was a DM, we only store the DM. +- If most recent message was a broadcast, we store both a DM and a broadcast. The DM may be 0-length string. + +--- + +### `InkHUD::WindowManager` + +_`src/graphics/niche/InkHUD/WindowManager.h`_ + +Manages which applets are shown, and their size / position (by manipulating the "tiles") + +- owns the `Tile` instances +- creates and destroys tiles; sets size and position: + - at startup + - at runtime, when config changes (layout, rotation, etc) +- activates (or deactivates) applets +- cycling through applets (e.g. on button press) + +The window manager doesn't process pixels; that is handled by the `InkHUD::Tile` objects. + +Note: Some of the methods (incl. `changeLayout`, `changeActivatedApplets`) don't trigger changes themselves. They should be called _after_ the relevant values in `inkhud->persistence->settings` have been modified. + +--- + +### `InkHUD::Renderer` + +_`src/graphics/niche/InkHUD/Renderer.h`_ + +Get pixel output from applets (via a tile), combine, and pass to the driver. + +- triggered by `requestUpdate` or `forceUpdate` +- not run immediately: allows multiple applets to share one render cycle +- calls `Applet::onRender` for relevant applets +- applies global rotation +- passes finalized image to driver + +`requestUpdate` is for applets (user or system). Renderer will honor the request if the applet is visible. `forceUpdate` can be used anywhere, but not from user applets, please. + +#### Asynchronous updates + +`requestUpdate` and `forceUpdate` do not block code execution. They schedule rendering for "ASAP", using `Renderer::runOnce`. Renderer then gets pixel output from relevant applets, and hands the assembled image to the driver. Driver's update process is also asynchronous. If the driver is busy when `requestUpdate` or `forceUpdate` is called, another rendering will run as soon as possible. This is handled by `Renderer::runOnce` + +#### Blocking updates + +If needed, call `forceUpdate` with the optional argument `async=false` to wait while an update runs (> 1 second). Additionally, the `awaitUpdate` method can be used to block until any previous update has completed. An example usage of this is waiting to draw the shutdown screen. + +#### Global rotation + +The exact size / position / rotation of InkHUD applets is configurable by the user. To achieve this, applets draw pixels between 0,0 and `Applet::width()`, `Applet::height()` + +- **Scaling**: Applet's `width()` and `height()` are set by `Tile` before rendering starts +- **Translation**: `Tile` shifts applet pixels up/down/left/right +- **Rotation**: `Renderer` rotates all pixels it receives, before placing them into the final image buffer + +--- + +### `InkHUD::Renderer::DisplayHealth` + +_`src/graphics/niche/InkHUD/DisplayHealth.h`_ + +Responsible for maintaining display health, by optimizing the ratio of FAST vs FULL refreshes + +- count number of FAST vs FULL refreshes (debt) +- suggest either FAST or FULL type +- periodically FULL refresh the display unprovoked, if needed + +#### Background Info + +When the image on an E-Ink display is updated, different procedures can be used to move the pixels to their new states. We have defined two procedures: `FAST` and `FULL`. + +A `FAST` update moves pixels directly from their old position, to their new position. This is aesthetically pleasing, and quick, _but_ it is challenging for the display hardware. If used excessively, pixels can build up residual charge, which negatively impacts the display's lifespan and image quality. + +A `FULL` update first moves all pixels between black and white, before letting them eventually settle at their final position. This causes an unpleasant flashing of the display image, but is best for the display health and image quality. + +Most displays readily tolerate `FAST` updates, so long as a `FULL` update is occasionally performed. How often this `FULL` update is required depends on the display model. + +#### Debt + +`InkHUD::DisplayHealth` records how many `FAST` refreshes have occurred since the previous `FULL` refresh. + +This is referred to as the "full refresh debt". + +If an update of a specific type (`FULL` / `FAST`) is requested / forced, this will be granted. + +If an update is requested / forced _without_ a specified type (`UpdateTypes::UNSPECIFIED`), `DisplayHealth` will select either `FAST` or `FULL`, in an attempt to maintain a target ratio of fast to full updates. + +This target is set by `InkHUD::setDisplayResilience`, when setting up in `nichegraphics.h` + +If an _excessive_ amount of `FAST` refreshes are performed back-to-back, `DisplayHealth` will begin artificially inflating the full refresh debt. This will cause the next few `UNSPECIFIED` updates to _all_ be performed as `FULL`, while the debt is paid down. + +This system of "full refresh debt" allows us to increase perceived responsiveness by tolerating additional strain on the display during periods of user interaction, and attempting to "repair the damage" later, once user interaction ceases. + +#### Maintenance + +The system of "full refresh debt" assumes that the display will perform many updates of `UNSPECIFIED` type between periods of user interaction. Depending on the amount of mesh traffic / applet selection, this may not be the case. + +If debt is particularly high, and no updates are taking place organically, `DisplayHealth` will begin infrequently performing `FULL` updates, purely to pay down the full refresh debt. + +--- + +### `InkHUD::Events` + +Handles events which impact the InkHUD system generally (e.g. shutdown, button press). + +Applets themselves do also listen separately for various events, but for the purpose of gathering information which they would like to display. + +#### Buttons + +Button input is sometimes handled by a system applet. `InkHUD::Events` determines whether the button should be handled by a specific system applet, or should instead trigger a default behavior + +--- + +### `InkHUD::Applet` + +A base class for applets. An applet is one "program", which may show info on the display. + +To oversimplify, all of the InkHUD code "under the hood" only exists to support applets. Applets are what actually shows useful information to the user. This base class exposes the functionality needed to write an applet. + +#### Drawing Methods + +`Applet` implements most AdafruitGFX drawing methods. Exception is the text handling. `printAt`, `printWrapped`, and `printThick` should be used instead. These are intended to be more convenient, but they also implement the character substitution system which powers the foreign alphabet support. + +`Applet` also adds methods for drawing several design elements which are re-used commonly though-out InkHUD. + +#### InkHUD Events + +Applets undergo a number of state changes: activated / deactivated by user, brought to foreground / hidden to background by user button press, etc. The `Applet` class provides a set of virtual methods, which an applet can override to appropriately handle these events. + +The `onRender` virtual method is one example. This is called when an applet is rendered, and should execute all drawing code. An applet _must_ implement this method. + +#### Responsive Design + +An applet's size will vary depending on the screen size, and the user's layout (multiplexing). Immediately before `onRender` is called, an applet's dimensions are updated, so that `width()` and `height()` will give the required size. The applet should draw its graphical elements relative to these values. The methods `X(float)` and `Y(float)` are also provided for convenience. + +| edge | coordinate | shorthand | +| ------ | ---------- | --------- | +| left | 0 | `X(0.0)` | +| top | 0 | `Y(0.0)` | +| right | `width()` | `X(1.0)` | +| bottom | `height()` | `Y(1.0)` | + +The same principles apply for drawing text. Methods like `AppletFont::lineHeight` and `getTextWidth` are useful here. + +Applets should always draw relative to their top left corner, at _x=0, y=0._ The applet's pixels are automatically moved to the correct position on-screen by an InkHUD::Tile. + +#### User Applets + +User applets are the "normal" applets, each one displaying a specific set of information to the user. They can be activated / deactivated at run-time using the on-screen menu. Examples include `DMApplet.h` and `PositionsApplet.h`. User applets are not expected to interact with lower layers of the InkHUD code. + +Users applets are instantiated in a variant's `setupNicheGraphics` method, and passed to `InkHUD::addApplet`. Their class should not be mentioned elsewhere, so that its code can be stripped away during compilation if a variant does not implement the specific applet. Internal processing of user applets treats them all as the generic `Applet` type only. + +#### Activated / Deactivated + +User applets can be activated or deactivated. This changes at run-time: the user selects which applets should be active using the on-screen menu. An applet should not process data while it is deactivated. It can unobserve any observables, ignore `handleReceived` calls, etc. + +An applet can implement the virtual `onActivate` and `onDeactivate` methods to handle this change in state. It can check this state internally by calling `isActive`. + +System applets cannot be deactivated. + +#### Foreground / Background + +An activated applet can either be _foreground_ or _background_. A foreground applet is one which will be rendered to a tile when the screen updates. A background applet will not be drawn. The applet cycling which takes place when the user button is pressed is implemented using foreground / background. + +Regardless of whether it is foreground or background, an activated applet should continue to collect / process data, and request update when it has new info to display. This is because of the _autoshow_ mechanic, which might bring a background applet to foreground in order to display its data. If an applet remains background, its update requests will be safely ignored. + +#### Autoshow + +Autoshow is a feature which allows the user to select which applets (if any) they would like to be shown automatically. If autoshow is enabled for an applet, it will be brought to foreground when it has new information to display. The user grants this privilege on a per-applet basis, using the on-screen menu. If an event causes an applet to be autoshown, NotificationApplet should not be shown for the same event. + +An applet needs to decide when it has information worthy of autoshowing. It signals this by calling `requestAutoshow`, in addition to the usual `requestUpdate` call. + +--- + +### `InkHUD::SystemApplet` + +_System applets_ are applets with special roles, which require special handling. Examples include `BatteryIconApplet.h` and `LogoApplet.h`. These are manually implemented, one-by-one, in `WindowManager.h`. + +This class is a slight extension of `Applet`. It adds extra flags for some special features which are restricted to system applets: exclusive use of the display, and the handling of user input. Having a separate system applet class also allows us to make it clear within the code when system applets are being handled, rather than user applets + +We store reference to these as a `vector`. This parallels how we treat user applets, and makes rendering convenient. +Because system applets do have unique roles, there are times when we will need to interact with a specific applet. Rather than keeping an extra set of references, we access them from the `vector`. Use `InkHUD::getSystemApplet` to access the applet by its `Applet::name` value, and then typecast. + +--- + +### `InkHUD::Tile` + +A tile represents a region of the display. A tile controls the size and position of an applet. + +For an applet to render, it must be assigned to a tile. When an applet is assigned to a tile, the two become linked. The applet is aware of the tile; the tile is aware of the applet. Applets cannot share a tile; assigning a different applet will remove any existing link. + +Before an applet renders, its width and height are set to the dimensions of the tile. During `onRender`, an applet's drawing methods generate pixels between _x=0, y=0_ and _x=Applet::width(), y=Applet::height()_. These pixels are passed to its tile's `Tile::handleAppletPixel` method. The tile then applies x and y offset, "translating" these pixels to the tile's region of the display. These translated pixels are then passed on to the `InkHUD::Renderer`. + +![depiction of a tile translating applet pixels](./tile_translation.png) + +#### User Tiles + +_User applets_ are the "normal" applets. They can be activated / deactivated at run-time using the on-screen menu. User applets are rendered to one of the **user tiles**. + +The user can customize the "layout", using the on-screen menu. Depending on their selected layout, a certain number of _user tiles_ are created. These tiles are automatically positioned and sized so that they fill the entire screen. + +Often, a user will have enabled more applets than they have tiles. Pressing the user-button will cycle through these applets. The old applet is sent to _background_, the new applet is brought to _foreground_. When a user applet is brought to foreground, it becomes assigned to a user tile (the focused tile). When it renders, its size will be set by this tile, and its pixels will be translated to this tile's region. The user applet which was sent to background loses its assignment; it no longer has an assigned tile. + +#### Focused Tile + +The focused tile is one of the user tiles. This is tile whose applet will change when the user button is pressed. This also the tile where the menu will appear on longpress. The focused tile is identified by its index in `vector userTiles`. + +#### Highlighting + +In addition to the user button, some devices have a second "auxiliary button". The function of this button can vary from device to device, but it is sometimes used to focus a different tile. When this happens, the newly focused tile is temporarily "highlighted", by drawing it with a border. This border is automatically removed after several seconds. As drawing code may only be executed by applets, this highlighting is a collaborative effort between a `Tile` and an `Applet`: performed in `Applet::render`, after the virtual `onRender` method has already run. + +Highlighting is only used when `nextTile` is fired by an aux button. It does not occur if performed via the on-screen menu. + +#### System Tiles + +_System applets_ are applets with special roles, which require special handling. Examples include `BatteryIconApplet.h` and `LogoApplet.h`. _Mostly_, these applets do not render to user tiles. Instead, they are given their own unique tile, which is positioned / dimensioned manually. The only reference we keep to these special tiles is stored within the linked system applet. They can be accessed with `Applet::getTile`. + +--- + +### `InkHUD::AppletFont` + +Wrapper which extends the functionality of an AdafruitGFX font. + +#### Dimension Info + +The AppletFont class pre-calculates some info about a font's dimensions, which is useful for design (`AppletFont::lineHeight`), and is used to power InkHUD's custom text handling. + +The default AdafruitGFX text handling places characters "upon a line", as if hand-written on a sheet of ruled paper. `InkHUD::AppletFont` measures the character set of the font, so that we instead draw fixed-height lines of text, positioned by the bounding box, with optional horizontal and vertical alignment. + +![text origins in InkHUD vs AdafruitGFX](./appletfont.png) + +The height of this box is `AppletFont::lineHeight`, which is the height of the tallest character in the font. This gives us a fixed-height for text, which is much tighter than with AdafruitGFX's default line spacing. + +#### UTF-8 Substitutions + +To enable non-English text, the `AppletFont` class includes a mechanism to detect specific UTF-8 characters, and replace them with alternative glyphs from the AdafruitGFX font. This can be used to remap characters for a custom font, or to offer a suitable ASCII replacement. + +```cpp +// With a custom font +// ї is ASCII 0xBF, in Windows-1251 encoding +addSubstitution("ї", "\xBF"); + +// Substitution (with a default font) +addSubstitution("ö", "oe"); +``` + +These substitutions should be performed in a variant's `setupNicheGraphics` method. For convenience, some common ASCII encodings have ready-to-go sets of substitutions you can apply, for example `AppletFont::addSubstitutionsWin1251` diff --git a/src/graphics/niche/InkHUD/docs/appletfont.png b/src/graphics/niche/InkHUD/docs/appletfont.png new file mode 100644 index 0000000000000000000000000000000000000000..f0b11d3236bde64a4ab3385c33bc0d2bac6f03ef GIT binary patch literal 7797 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 OG<9Vir5Xk6kpBTCAtn9* literal 0 HcmV?d00001 diff --git a/src/graphics/niche/InkHUD/docs/disclaimer.jpg b/src/graphics/niche/InkHUD/docs/disclaimer.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d4c2c890e56705770336672cfa426fe449950a1c GIT binary patch literal 17942 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 literal 0 HcmV?d00001 diff --git a/src/graphics/niche/InkHUD/docs/rendering.gif b/src/graphics/niche/InkHUD/docs/rendering.gif new file mode 100644 index 0000000000000000000000000000000000000000..cb712381b91c13f5ce3bf7ebe81f998057c57722 GIT binary patch literal 78402 zcmc$_WmsIxzV6#Va0wv^5F{ax;O-8=-QC^Y-QC??8+UiN#@*fBJ$=ZWYp%WSv(G*s z?sKI-!04jnUt`oLs_OT?g2DpKEZT99agaIh0Lj0T0RR9P3%c6(R#fiu6#Oh>jWv*|hjpt-;W?{?f#DTA^XQ`vl z`gZ*%nF=58uPk<^9QeQf`~mMzo4l4b`gn|#)D*hZ)UwIqi4V>!zb{sw%)#R;2YW5S+P=4IXXI0I?_>E+89#N zu&}UDQPWb<(o($Tps;neu+w&;u&^cgrv^TKTU{GtD?4LL3%oxyYU^0q+i~E(Mf!Ia z%&q=it%WV+U)`b9wKS)4(zc?ap``xPrGGMti~paqnw$SSx2>Iw{(r^$zpdC-&e=+z zN=Dz-(%wc_|1CSgpQfx>d2RHy?JRBNEG^Ccxr(RR|6|!dW5L|&tz|xa8)FB3Jpmg_bG*O$%xe5U z$HMYI*7vWndjE4Qzy8OvRByph{duzg@udGrdK*4}F8@7l-@g2N)7% z#K*@}C@U!{$jiyfNJ~jdh>MAe2nz`c@bmHV{Nm=~XJqj`sA_6=dEDZEJD9E?j;rrt| z=vK&g0P;W6$Dg?c00m}lUinQuEL_sYd_39$)*_D3GtMw7E-%<we*OW0LBS!RVc`*xQPDB6aq$U>Ny#axY3Ui6S=l+cdHDr}z@p-k(z5c3 z%Bt#`+PeCN#-`?$*0%PJ&aUpB-oE~U!J*+1(CFCs#N^cU%kCRu^I{WkIxCzx)FR|yfQ~qKjSsWp`jLzXCm8m zKf$5`rPFvEIS-v{58Ly~gXZi+7@+0y#gY_ORkldUiqv{SE(BfeflEuPh!7Pk-|Zd|6gKAL*1CKV!O&=!ml}O}C~O``R@QSlu^$y9ezIJv z4kkF$-=(3~0>|IH=+v`* z=C$2}@cZ^%W98sdd`MUdT)D#I_-Q`BWkF-r@Ih>G0733DoyYa#etxVX_@(!`g=|Yx z8ik9|aQmP@jRpNvl97N069 zd|{o*POJ4Jo+;Dn3aX28iJOl|8>5F051THVo2WW&zq(Piyx&eCuGbuOJqQw8JSZvG zL1?w|`b4DW+ech%N}RWaC05pw2(xUd@uR|}s`1^d({?HHv|9P#l80NDC-jKO#ZbwU zn%Q7I7R9e%B^l@Zc+`0(>yeAAm6WL)fvC$oR#&Xrc{xRnA9JJ`nAZ_hsvKVzRZ`O} zN9`g)YF5;lMiv+OzXmmMcB|Ao)>iP~8fB1*QW!4arMk*lcuJNsqJ%@OFm83`n=9>r z1*t|EWfD}wAIC{NBJieuhh*ID#NM_g9io{^G|3hVURgT3IgZgCBW09-Ii$9fU~`XL z_iEW|Mnq@(Q3Gzby`V>`Xgv<$>S#R0XQO(ZnbZVNU+ODYxCbtJdVaiDa;9pR+sp)i zx`j`r;(QGMQQ;8#O?Pg33K-R^#!x51CsE}i$*Bx z4!to5hLzeAHB1XY71Y*Z9_70+vVr)+i35SO+XpW%5l--->r+Um7iHc$0yH}9Rx-HlR6Hb4AL;?IO&zGPyDPX-4V{Ii(fVEs0dhXq@!K}zdj}nmd)

XvxR6aNm@T)%IDb8YXzrivZDo*@ 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 literal 0 HcmV?d00001 diff --git a/variants/heltec_vision_master_e213/nicheGraphics.h b/variants/heltec_vision_master_e213/nicheGraphics.h index b14c72896..75e4423be 100644 --- a/variants/heltec_vision_master_e213/nicheGraphics.h +++ b/variants/heltec_vision_master_e213/nicheGraphics.h @@ -67,25 +67,20 @@ void setupNicheGraphics() InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); */ - // Init settings, and customize defaults + // Customize default settings inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle? inkhud->persistence->settings.rotation = 3; // 270 degrees clockwise inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users inkhud->persistence->settings.optionalMenuItems.nextTile = false; // Behavior handled by aux button instead // Pick applets - // Note: order of applets determines priority of "auto-show" feature - // Optional arguments for defaults: - // - is activated? - // - is autoshown? - // - is foreground on a specific tile (index)? inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown - inkhud->addApplet("DMs", new InkHUD::DMApplet); - inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); - inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); - inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated - inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); - inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 + inkhud->addApplet("DMs", new InkHUD::DMApplet); // Inactive + inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); // Inactive + inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); // Inactive + inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated + inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); // Inactive + inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet); // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet); diff --git a/variants/heltec_vision_master_e290/nicheGraphics.h b/variants/heltec_vision_master_e290/nicheGraphics.h index c14ee76ec..2674436b8 100644 --- a/variants/heltec_vision_master_e290/nicheGraphics.h +++ b/variants/heltec_vision_master_e290/nicheGraphics.h @@ -80,25 +80,27 @@ void setupNicheGraphics() InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); */ - // Init settings, and customize defaults + // Customize default settings inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle? inkhud->persistence->settings.rotation = 1; // 90 degrees clockwise inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users inkhud->persistence->settings.optionalMenuItems.nextTile = false; // Behavior handled by aux button instead // Pick applets - // Note: order of applets determines priority of "auto-show" feature - // Optional arguments for defaults: - // - is activated? - // - is autoshown? - // - is foreground on a specific tile (index)? + + // Order of applets determines priority of "auto-show" feature. + // Optional arguments for default state: + // - is activated? + // - is autoshown? + // - is foreground on a specific tile (index)? + inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown - inkhud->addApplet("DMs", new InkHUD::DMApplet); - inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); - inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); - inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated - inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); - inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 + inkhud->addApplet("DMs", new InkHUD::DMApplet); // Inactive + inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); // Inactive + inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); // Inactive + inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated + inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); // Inactive + inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet); // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet); diff --git a/variants/heltec_wireless_paper/nicheGraphics.h b/variants/heltec_wireless_paper/nicheGraphics.h index 44405b8f6..ece4225d0 100644 --- a/variants/heltec_wireless_paper/nicheGraphics.h +++ b/variants/heltec_wireless_paper/nicheGraphics.h @@ -67,26 +67,21 @@ void setupNicheGraphics() InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); */ - // Init settings, and customize defaults + // Customize default settings inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle? inkhud->persistence->settings.rotation = 3; // 270 degrees clockwise inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users // Pick applets - // Note: order of applets determines priority of "auto-show" feature - // Optional arguments for defaults: - // - is activated? - // - is autoshown? - // - is foreground on a specific tile (index)? inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown - inkhud->addApplet("DMs", new InkHUD::DMApplet); - inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); - inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); - inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated - inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); - inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 + inkhud->addApplet("DMs", new InkHUD::DMApplet); // Inactive + inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); // Inactive + inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); // Inactive + inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated + inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); // Inactive + inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet); - // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet); + // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet); // Start running InkHUD inkhud->begin(); diff --git a/variants/t-echo/nicheGraphics.h b/variants/t-echo/nicheGraphics.h index f0ffe4108..e8a9232f1 100644 --- a/variants/t-echo/nicheGraphics.h +++ b/variants/t-echo/nicheGraphics.h @@ -68,8 +68,7 @@ void setupNicheGraphics() InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); */ - // Init settings, and customize defaults - // Values ignored individually if found saved to flash + // Customize default settings inkhud->persistence->settings.userTiles.maxCount = 2; // Two applets side-by-side inkhud->persistence->settings.rotation = 3; // 270 degrees clockwise inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery @@ -106,6 +105,7 @@ void setupNicheGraphics() // Setup the main user button buttons->setWiring(MAIN_BUTTON, BUTTON_PIN, LOW); + buttons->setTiming(MAIN_BUTTON, 75, 500); buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); }); From 72db671e007bcccc0cb67c6a44889aed0ad94e59 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 31 Mar 2025 02:54:27 -0500 Subject: [PATCH 011/100] Try-fix some import of configuration inconsistencies (#6364) --- src/modules/AdminModule.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index c04c26a5a..88109bc78 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -265,7 +265,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta disableBluetooth(); LOG_INFO("Commit transaction for edited settings"); hasOpenEditTransaction = false; - saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS); + saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS | SEGMENT_NODEDATABASE); break; } case meshtastic_AdminMessage_get_device_connection_status_request_tag: { @@ -334,7 +334,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta node->position = TypeConversions::ConvertToPositionLite(r->set_fixed_position); nodeDB->setLocalPosition(r->set_fixed_position); config.position.fixed_position = true; - saveChanges(SEGMENT_DEVICESTATE | SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false); + saveChanges(SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false); #if !MESHTASTIC_EXCLUDE_GPS if (gps != nullptr) gps->enable(); @@ -347,7 +347,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta LOG_INFO("Client received remove_fixed_position command"); nodeDB->clearLocalPosition(); config.position.fixed_position = false; - saveChanges(SEGMENT_DEVICESTATE | SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false); + saveChanges(SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false); break; } case meshtastic_AdminMessage_set_time_only_tag: { @@ -574,7 +574,6 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c) config.has_position = true; config.position = c.payload_variant.position; // Save nodedb as well in case we got a fixed position packet - saveChanges(SEGMENT_DEVICESTATE, false); break; case meshtastic_Config_power_tag: LOG_INFO("Set config: Power"); From 3314b00fcc9500a722ac3e0fc700871a88ce74dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 11:16:13 +0200 Subject: [PATCH 012/100] Upgrade trunk (#6471) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 8f938ce9e..4c570c856 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -9,12 +9,12 @@ plugins: lint: enabled: - prettier@3.5.3 - - trufflehog@3.88.18 + - trufflehog@3.88.20 - yamllint@1.37.0 - bandit@1.8.3 - checkov@3.2.394 - terrascan@1.19.9 - - trivy@0.60.0 + - trivy@0.61.0 - taplo@0.9.3 - ruff@0.11.2 - isort@6.0.1 From 39408fd3b1f39c6799caf9d214cc3dd613d4824c Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 31 Mar 2025 05:50:53 -0500 Subject: [PATCH 013/100] Disable network config for non-eth_gateway nrf52 and non-W RP2040 targets (#6462) * Disable network config for non-eth_gateway nrf52 and non-W RP2040 targets * Use HAS_ETHERNET logic --- src/main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 59cd6d8e9..f8443f9e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1274,6 +1274,12 @@ extern meshtastic_DeviceMetadata getDeviceMetadata() deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AMBIENTLIGHTING_CONFIG; #endif +#if defined(ARCH_NRF52) && !HAS_ETHERNET // nrf52 doesn't have network unless it's a RAK ethernet gateway currently + deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_NETWORK_CONFIG; // No network on nRF52 +#elif defined(ARCH_RP2040) && !HAS_WIFI && !HAS_ETHERNET + deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_NETWORK_CONFIG; // No network on RP2040 +#endif + #if !(MESHTASTIC_EXCLUDE_PKI) deviceMetadata.hasPKC = true; #endif From 886bffe8f3b1e27b087c7f866129d7d763bc22de Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Tue, 1 Apr 2025 00:03:44 +1300 Subject: [PATCH 014/100] fix: honor user button customization (#6400) Co-authored-by: Ben Meadors --- src/graphics/niche/Inputs/TwoButton.cpp | 38 ++++++++++++++++++- src/graphics/niche/Inputs/TwoButton.h | 4 +- .../heltec_vision_master_e213/nicheGraphics.h | 2 +- .../heltec_vision_master_e290/nicheGraphics.h | 4 +- .../heltec_wireless_paper/nicheGraphics.h | 2 +- variants/t-echo/nicheGraphics.h | 2 +- 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/graphics/niche/Inputs/TwoButton.cpp b/src/graphics/niche/Inputs/TwoButton.cpp index 10d89ef41..b270d56cf 100644 --- a/src/graphics/niche/Inputs/TwoButton.cpp +++ b/src/graphics/niche/Inputs/TwoButton.cpp @@ -2,6 +2,7 @@ #include "./TwoButton.h" +#include "NodeDB.h" // For the helper function TwoButton::getUserButtonPin #include "PowerFSM.h" #include "sleep.h" @@ -57,14 +58,47 @@ void TwoButton::stop() detachInterrupt(buttons[1].pin); } +// Attempt to resolve a GPIO pin for the user button, honoring userPrefs.jsonc and device settings +// This helper method isn't used by the TweButton class itself, it could be moved elsewhere. +// Intention is to pass this value to TwoButton::setWiring in the setupNicheGraphics method. +uint8_t TwoButton::getUserButtonPin() +{ + uint8_t pin = 0xFF; // Unset + + // Use default pin for variant, if no better source +#ifdef BUTTON_PIN + pin = BUTTON_PIN; +#endif + + // From userPrefs.jsonc, if set +#ifdef USERPREFS_BUTTON_PIN + pin = USERPREFS_BUTTON_PIN; +#endif + + // From user's override in device settings, if set + if (config.device.button_gpio) + pin = config.device.button_gpio; + + return pin; +} + // Configures the wiring and logic of either button // Called when outlining your NicheGraphics implementation, in variant/nicheGraphics.cpp void TwoButton::setWiring(uint8_t whichButton, uint8_t pin, bool internalPullup) { + // Prevent the same GPIO being assigned to multiple buttons + // Allows an edge case when the user remaps hardware buttons using device settings, due to a broken user button + for (uint8_t i = 0; i < whichButton; i++) { + if (buttons[i].pin == pin) { + LOG_WARN("Attempted reuse of GPIO %d. Ignoring assignment whichButton=%d", pin, whichButton); + return; + } + } + assert(whichButton < 2); buttons[whichButton].pin = pin; - buttons[whichButton].activeLogic = LOW; - buttons[whichButton].mode = internalPullup ? INPUT_PULLUP : INPUT; // fix me + buttons[whichButton].activeLogic = LOW; // Unimplemented + buttons[whichButton].mode = internalPullup ? INPUT_PULLUP : INPUT; pinMode(buttons[whichButton].pin, buttons[whichButton].mode); } diff --git a/src/graphics/niche/Inputs/TwoButton.h b/src/graphics/niche/Inputs/TwoButton.h index 1e1576256..f1e18dd89 100644 --- a/src/graphics/niche/Inputs/TwoButton.h +++ b/src/graphics/niche/Inputs/TwoButton.h @@ -30,6 +30,8 @@ class TwoButton : protected concurrency::OSThread public: typedef std::function Callback; + static uint8_t getUserButtonPin(); // Resolve the GPIO, considering the various possible source of definition + static TwoButton *getInstance(); // Create or get the singleton instance void start(); // Start handling button input void stop(); // Stop handling button input (disconnect ISRs for sleep) @@ -62,7 +64,7 @@ class TwoButton : protected concurrency::OSThread public: // Per-button config uint8_t pin = 0xFF; // 0xFF: unset - bool activeLogic = LOW; // Active LOW by default. Todo: remove, unused + bool activeLogic = LOW; // Active LOW by default. Currently unimplemented. uint8_t mode = INPUT; // Whether to use internal pull up / pull down resistors uint32_t debounceLength = 50; // Minimum length for shortpress, in ms uint32_t longpressLength = 500; // How long after button down to fire longpress, in ms diff --git a/variants/heltec_vision_master_e213/nicheGraphics.h b/variants/heltec_vision_master_e213/nicheGraphics.h index 75e4423be..d6983bafe 100644 --- a/variants/heltec_vision_master_e213/nicheGraphics.h +++ b/variants/heltec_vision_master_e213/nicheGraphics.h @@ -95,7 +95,7 @@ void setupNicheGraphics() constexpr uint8_t AUX_BUTTON = 1; // Setup the main user button - buttons->setWiring(MAIN_BUTTON, BUTTON_PIN); + buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin()); buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); }); diff --git a/variants/heltec_vision_master_e290/nicheGraphics.h b/variants/heltec_vision_master_e290/nicheGraphics.h index 2674436b8..c2f26c7ff 100644 --- a/variants/heltec_vision_master_e290/nicheGraphics.h +++ b/variants/heltec_vision_master_e290/nicheGraphics.h @@ -19,7 +19,7 @@ Different NicheGraphics UIs and different hardware variants will each have their // InkHUD-specific components // --------------------------- -#include "graphics/niche/InkHUD/WindowManager.h" +#include "graphics/niche/InkHUD/InkHUD.h" // Applets #include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h" @@ -113,7 +113,7 @@ void setupNicheGraphics() Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // A shared NicheGraphics component // Setup the main user button (0) - buttons->setWiring(0, BUTTON_PIN); + buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin()); buttons->setHandlerShortPress(0, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); buttons->setHandlerLongPress(0, []() { InkHUD::InkHUD::getInstance()->longpress(); }); diff --git a/variants/heltec_wireless_paper/nicheGraphics.h b/variants/heltec_wireless_paper/nicheGraphics.h index ece4225d0..5e938fa64 100644 --- a/variants/heltec_wireless_paper/nicheGraphics.h +++ b/variants/heltec_wireless_paper/nicheGraphics.h @@ -93,7 +93,7 @@ void setupNicheGraphics() constexpr uint8_t MAIN_BUTTON = 0; // Setup the main user button - buttons->setWiring(MAIN_BUTTON, BUTTON_PIN); + buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin()); buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); }); diff --git a/variants/t-echo/nicheGraphics.h b/variants/t-echo/nicheGraphics.h index e8a9232f1..f5dde6b19 100644 --- a/variants/t-echo/nicheGraphics.h +++ b/variants/t-echo/nicheGraphics.h @@ -104,7 +104,7 @@ void setupNicheGraphics() constexpr uint8_t TOUCH_BUTTON = 1; // Setup the main user button - buttons->setWiring(MAIN_BUTTON, BUTTON_PIN, LOW); + buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin()); buttons->setTiming(MAIN_BUTTON, 75, 500); buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); }); From a5efbfccd784f77784ec429794378b599476935e Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 31 Mar 2025 06:32:54 -0500 Subject: [PATCH 015/100] Disable bluetooth config on rp2040, portduino (for now), and stm32 (#6465) * Disable bluetooth config on rp2040, portduino (for now), and stm32 * Add comments and exclude C6 --- src/main.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index f8443f9e9..05eeef2ae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1274,6 +1274,13 @@ extern meshtastic_DeviceMetadata getDeviceMetadata() deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AMBIENTLIGHTING_CONFIG; #endif +// No bluetooth on these targets (yet): +// Pico W / 2W may get it at some point +// Portduino and ESP32-C6 are excluded because we don't have a working bluetooth stacks integrated yet. +#if defined(ARCH_RP2040) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL) || defined(CONFIG_IDF_TARGET_ESP32C6) + deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_BLUETOOTH_CONFIG; +#endif + #if defined(ARCH_NRF52) && !HAS_ETHERNET // nrf52 doesn't have network unless it's a RAK ethernet gateway currently deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_NETWORK_CONFIG; // No network on nRF52 #elif defined(ARCH_RP2040) && !HAS_WIFI && !HAS_ETHERNET From 2c01fad798e17bcc5e6feb4644ba15c12e32fffa Mon Sep 17 00:00:00 2001 From: Austin Date: Mon, 31 Mar 2025 08:31:54 -0400 Subject: [PATCH 016/100] meshtasticd: Add FrequencyLabs MeshAdv-Mini Hat (#6458) --- bin/config.d/lora-MeshAdv-900M30S.yaml | 4 +++- bin/config.d/lora-MeshAdv-Mini-900M22S.yaml | 11 +++++++++++ src/platform/portduino/PortduinoGlue.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 bin/config.d/lora-MeshAdv-Mini-900M22S.yaml diff --git a/bin/config.d/lora-MeshAdv-900M30S.yaml b/bin/config.d/lora-MeshAdv-900M30S.yaml index 113901d5e..5c148bf68 100644 --- a/bin/config.d/lora-MeshAdv-900M30S.yaml +++ b/bin/config.d/lora-MeshAdv-900M30S.yaml @@ -1,3 +1,5 @@ +# MeshAdv-Pi E22-900M30S +# https://github.com/chrismyers2000/MeshAdv-Pi-Hat Lora: Module: sx1262 CS: 21 @@ -9,4 +11,4 @@ Lora: DIO3_TCXO_VOLTAGE: true # Only for E22-900M33S: # Limit the output power to 8 dBm - # SX126X_MAX_POWER: 8 \ No newline at end of file + # SX126X_MAX_POWER: 8 diff --git a/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml b/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml new file mode 100644 index 000000000..554116b57 --- /dev/null +++ b/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml @@ -0,0 +1,11 @@ +# MeshAdv Mini E22-900M22S +# https://github.com/chrismyers2000/MeshAdv-Mini +Lora: + Module: sx1262 # Ebyte E22-900M22S + CS: 8 + IRQ: 16 + Busy: 20 + Reset: 24 + TXen: 13 + DIO2_AS_RF_SWITCH: true + DIO3_TCXO_VOLTAGE: true diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h index a7aea1c3e..4e074be71 100644 --- a/src/platform/portduino/PortduinoGlue.h +++ b/src/platform/portduino/PortduinoGlue.h @@ -11,6 +11,7 @@ inline const std::unordered_map configProducts = {{"MESHTOAD", "lora-usb-meshtoad-e22.yaml"}, {"MESHSTICK", "lora-meshstick-1262.yaml"}, {"MESHADV-PI", "lora-MeshAdv-900M30S.yaml"}, + {"MESHADV-MINI", "lora-MeshAdv-Mini-900M22S.yaml"}, {"POWERPI", "lora-MeshAdv-900M30S.yaml"}}; enum configNames { From ae887590594de8e573ca2ce16334f5534ce34155 Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Tue, 1 Apr 2025 13:08:23 +1300 Subject: [PATCH 017/100] draft an InkHUD variant for Elecrow Thinknode M1 (#6473) Only an initial guess. No hardware here yet for testing. Button assignments are largely placeholder. Co-authored-by: Ben Meadors --- variants/ELECROW-ThinkNode-M1/nicheGraphics.h | 119 ++++++++++++++++++ variants/ELECROW-ThinkNode-M1/platformio.ini | 22 +++- variants/ELECROW-ThinkNode-M1/variant.h | 2 - 3 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 variants/ELECROW-ThinkNode-M1/nicheGraphics.h diff --git a/variants/ELECROW-ThinkNode-M1/nicheGraphics.h b/variants/ELECROW-ThinkNode-M1/nicheGraphics.h new file mode 100644 index 000000000..f68ac9edd --- /dev/null +++ b/variants/ELECROW-ThinkNode-M1/nicheGraphics.h @@ -0,0 +1,119 @@ +#pragma once + +#include "configuration.h" + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +// InkHUD-specific components +// --------------------------- +#include "graphics/niche/InkHUD/InkHUD.h" + +// Applets +#include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h" +#include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h" +#include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h" +#include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h" +#include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h" +#include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h" + +// Shared NicheGraphics components +// -------------------------------- +#include "graphics/niche/Drivers/Backlight/LatchingBacklight.h" +#include "graphics/niche/Drivers/EInk/GDEY0154D67.h" +#include "graphics/niche/Inputs/TwoButton.h" + +#include "graphics/niche/Fonts/FreeSans6pt7b.h" +#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h" +#include + +void setupNicheGraphics() +{ + using namespace NicheGraphics; + + // SPI + // ----------------------------- + + // For NRF52 platforms, SPI pins are defined in variant.h, not passed to begin() + SPI1.begin(); + + // Driver + // ----------------------------- + + // Use E-Ink driver + Drivers::EInk *driver = new Drivers::GDEY0154D67; // Todo: confirm display model + driver->begin(&SPI1, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES); + + // InkHUD + // ---------------------------- + + InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance(); + + // Set the driver + inkhud->setDriver(driver); + + // Set how many FAST updates per FULL update + // Set how unhealthy additional FAST updates beyond this number are + // Todo: observe the display's performance in-person and adjust accordingly. + // Currently set to the values given by Elecrow for EInkDynamicDisplay. + inkhud->setDisplayResilience(10, 1.5); + + // Prepare fonts + InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b); + InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b); + /* + // Font localization demo: Cyrillic + InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic); + InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); + */ + + // Customize default settings + inkhud->persistence->settings.userTiles.maxCount = 2; // Two applets side-by-side + inkhud->persistence->settings.rotation = 0; // To be confirmed? + inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery + + // Setup backlight + // Note: button mapping for this configured further down + Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance(); + backlight->setPin(PIN_EINK_EN); + + // Pick applets + // Note: order of applets determines priority of "auto-show" feature + inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown + inkhud->addApplet("DMs", new InkHUD::DMApplet); // Inactive + inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); // Inactive + inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); // Inactive + inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated + inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); // Inactive + inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, no autoshow, default on tile 0 + + // Start running InkHUD + inkhud->begin(); + + // Buttons + // -------------------------- + + Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component + + // As labeled on Elecrow diagram: https://www.elecrow.com/download/product/CIL12901M/ThinkNode-M1_User_Manual.pdf + constexpr uint8_t PAGE_TURN_BUTTON = 0; + constexpr uint8_t FUNCTION_BUTTON = 1; + + // Setup the main user button + buttons->setWiring(PAGE_TURN_BUTTON, PIN_BUTTON2); + buttons->setTiming(PAGE_TURN_BUTTON, 50, 500); // Todo: confirm 50ms is adequate debounce + buttons->setHandlerShortPress(PAGE_TURN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); + buttons->setHandlerLongPress(PAGE_TURN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); }); + + // Setup the aux button + // Initial testing only: mapped to the backlight + // Todo: additional features + buttons->setWiring(FUNCTION_BUTTON, PIN_BUTTON1); + buttons->setTiming(FUNCTION_BUTTON, 50, 500); // 500ms before latch + buttons->setHandlerDown(FUNCTION_BUTTON, [backlight]() { backlight->peek(); }); + buttons->setHandlerLongPress(FUNCTION_BUTTON, [backlight]() { backlight->latch(); }); + buttons->setHandlerShortPress(FUNCTION_BUTTON, [backlight]() { backlight->off(); }); + + buttons->start(); +} + +#endif \ No newline at end of file diff --git a/variants/ELECROW-ThinkNode-M1/platformio.ini b/variants/ELECROW-ThinkNode-M1/platformio.ini index f37f6d310..86fbde398 100644 --- a/variants/ELECROW-ThinkNode-M1/platformio.ini +++ b/variants/ELECROW-ThinkNode-M1/platformio.ini @@ -10,6 +10,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/ELECROW-ThinkNode-M1 -DELECROW_ThinkNode_M1 -DGPS_POWER_TOGGLE -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" + -DUSE_EINK -DEINK_DISPLAY_MODEL=GxEPD2_154_D67 -DEINK_WIDTH=200 -DEINK_HEIGHT=200 @@ -26,4 +27,23 @@ lib_deps = https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip lewisxhe/PCF8563_Library@^1.0.1 khoih-prog/nRF52_PWM@^1.0.1 -;upload_protocol = fs \ No newline at end of file +;upload_protocol = fs + +[env:thinknode_m1-inkhud] +extends = nrf52840_base, inkhud +board = ThinkNode-M1 +board_check = true +debug_tool = jlink +build_flags = + ${nrf52840_base.build_flags} + ${inkhud.build_flags} + -I variants/ELECROW-ThinkNode-M1 + -D ELECROW_ThinkNode_M1 + -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" +build_src_filter = + ${nrf52_base.build_src_filter} + ${inkhud.build_src_filter} +lib_deps = + ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX + ${nrf52840_base.lib_deps} + lewisxhe/PCF8563_Library@^1.0.1 \ No newline at end of file diff --git a/variants/ELECROW-ThinkNode-M1/variant.h b/variants/ELECROW-ThinkNode-M1/variant.h index 3bfa360f6..fc2fddbdf 100644 --- a/variants/ELECROW-ThinkNode-M1/variant.h +++ b/variants/ELECROW-ThinkNode-M1/variant.h @@ -140,8 +140,6 @@ External serial flash WP25R1635FZUIL0 // Controls power for all peripherals (eink + GPS + LoRa + Sensor) #define PIN_POWER_EN (0 + 12) -#define USE_EINK - #define PIN_SPI1_MISO (32 + 7) #define PIN_SPI1_MOSI PIN_EINK_MOSI #define PIN_SPI1_SCK PIN_EINK_SCLK From 128c347c645d64497b5f024364e44c5884079b12 Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Tue, 1 Apr 2025 23:26:46 +1300 Subject: [PATCH 018/100] fix: T-Echo frontlight on at boot when using OLED UI (#6474) --- src/graphics/EInkDisplay2.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp index 96c6b44c1..27117641e 100644 --- a/src/graphics/EInkDisplay2.cpp +++ b/src/graphics/EInkDisplay2.cpp @@ -128,11 +128,7 @@ bool EInkDisplay::connect() #ifdef PIN_EINK_EN // backlight power, HIGH is backlight on, LOW is off pinMode(PIN_EINK_EN, OUTPUT); -#ifdef ELECROW_ThinkNode_M1 digitalWrite(PIN_EINK_EN, LOW); -#else - digitalWrite(PIN_EINK_EN, HIGH); -#endif #endif #if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1) From ea4ce8d827d45e82e7ce5b377d956e324f80733c Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Tue, 1 Apr 2025 15:53:15 +0200 Subject: [PATCH 019/100] MUI unPhone-tft: fix defaults (#6477) --- src/mesh/NodeDB.cpp | 2 +- variants/unphone/platformio.ini | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 3f79d18e6..9bb63652a 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -689,7 +689,7 @@ void NodeDB::initConfigIntervals() config.display.screen_on_secs = default_screen_on_secs; -#if defined(T_WATCH_S3) || defined(T_DECK) || defined(MESH_TAB) || defined(RAK14014) +#if defined(T_WATCH_S3) || defined(T_DECK) || defined(UNPHONE) || defined(MESH_TAB) || defined(RAK14014) config.power.is_power_saving = true; config.display.screen_on_secs = 30; config.power.wait_bluetooth_secs = 30; diff --git a/variants/unphone/platformio.ini b/variants/unphone/platformio.ini index 18efbb157..399d65b03 100644 --- a/variants/unphone/platformio.ini +++ b/variants/unphone/platformio.ini @@ -35,19 +35,19 @@ lib_deps = ${esp32s3_base.lib_deps} extends = env:unphone build_flags = ${env:unphone.build_flags} + -D CONFIG_DISABLE_HAL_LOCKS=1 -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 -D MESHTASTIC_EXCLUDE_INPUTBROKER=1 - -D MESHTASTIC_EXCLUDE_BLUETOOTH=1 -D MESHTASTIC_EXCLUDE_WEBSERVER=1 -D MESHTASTIC_EXCLUDE_SERIAL=1 -D MESHTASTIC_EXCLUDE_SOCKETAPI=1 -D INPUTDRIVER_BUTTON_TYPE=21 - -D MAX_THREADS=40 -D HAS_SCREEN=0 -D HAS_TFT=1 -D HAS_SDCARD -D DISPLAY_SET_RESOLUTION - -D RAM_SIZE=3072 + -D RAM_SIZE=6144 + -D LV_CACHE_DEF_SIZE=2097152 -D LV_LVGL_H_INCLUDE_SIMPLE -D LV_CONF_INCLUDE_SIMPLE -D LV_COMP_CONF_INCLUDE_SIMPLE @@ -63,6 +63,7 @@ build_flags = -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_UNPHONE.h\" -D VIEW_320x240 -D USE_PACKET_API + -D MAP_FULL_REDRAW lib_deps = ${env:unphone.lib_deps} From 644849126ca179ee52f31133cc62e72142dde8f7 Mon Sep 17 00:00:00 2001 From: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:50:10 -0700 Subject: [PATCH 020/100] Fixes #6315 (#6475) * Fixed Canned Messages send to non broadcast * Small fix * Fix formatting for singular canned message * Trunk fmt --------- Co-authored-by: Ben Meadors --- src/modules/CannedMessageModule.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp index 2a5ec00ab..c16c0e4b3 100644 --- a/src/modules/CannedMessageModule.cpp +++ b/src/modules/CannedMessageModule.cpp @@ -483,7 +483,7 @@ int32_t CannedMessageModule::runOnce() #if defined(USE_VIRTUAL_KEYBOARD) sendText(this->dest, indexChannels[this->channel], this->messages[this->currentMessageIndex], true); #else - sendText(NODENUM_BROADCAST, channels.getPrimaryIndex(), this->messages[this->currentMessageIndex], true); + sendText(this->dest, indexChannels[this->channel], this->messages[this->currentMessageIndex], true); #endif } this->runState = CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE; @@ -1114,20 +1114,19 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st display->drawStringf(0 + x, 0 + y, buffer, "To: %s", cannedMessageModule->getNodeName(this->dest)); int lines = (display->getHeight() / FONT_HEIGHT_SMALL) - 1; if (lines == 3) { - // static (old) behavior for small displays - display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL, cannedMessageModule->getPrevMessage()); display->fillRect(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, x + display->getWidth(), y + FONT_HEIGHT_SMALL); display->setColor(BLACK); display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, cannedMessageModule->getCurrentMessage()); display->setColor(WHITE); - display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 3, cannedMessageModule->getNextMessage()); + if (this->messagesCount > 1) { + display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL, cannedMessageModule->getPrevMessage()); + display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 3, cannedMessageModule->getNextMessage()); + } } else { - // use entire display height for larger displays int topMsg = (messagesCount > lines && currentMessageIndex >= lines - 1) ? currentMessageIndex - lines + 2 : 0; for (int i = 0; i < std::min(messagesCount, lines); i++) { if (i == currentMessageIndex - topMsg) { #ifdef USE_EINK - // Avoid drawing solid black with fillRect: harder to clear for E-Ink display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * (i + 1), ">"); display->drawString(12 + x, 0 + y + FONT_HEIGHT_SMALL * (i + 1), cannedMessageModule->getCurrentMessage()); @@ -1138,7 +1137,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * (i + 1), cannedMessageModule->getCurrentMessage()); display->setColor(WHITE); #endif - } else { + } else if (messagesCount > 1) { // Only draw others if there are multiple messages display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * (i + 1), cannedMessageModule->getMessageByIndex(topMsg + i)); } From f6ed10f3298abf6896892ca7906d3231c8b3f567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hampa=C3=AF?= Date: Tue, 1 Apr 2025 22:39:40 +0200 Subject: [PATCH 021/100] Added initial support for Texas Instruments LP5562 (#6381) * Added initial support for Texas Instrument LP5562 * Added proper support for Ambient Lighting * Code merge for all RBG_LED enabled devices * Fixed forgotten log_info & added firstRGBLED() --- src/AmbientLightingThread.h | 43 +++++++++++++++++----- src/configuration.h | 6 +++ src/detect/ScanI2C.cpp | 6 +++ src/detect/ScanI2C.h | 3 ++ src/detect/ScanI2CTwoWire.cpp | 3 ++ src/graphics/NomadStarLED.h | 5 +++ src/main.cpp | 8 ++-- src/modules/ExternalNotificationModule.cpp | 29 +++++++++++++-- 8 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 src/graphics/NomadStarLED.h diff --git a/src/AmbientLightingThread.h b/src/AmbientLightingThread.h index c487f9d53..bff8846d6 100644 --- a/src/AmbientLightingThread.h +++ b/src/AmbientLightingThread.h @@ -6,6 +6,11 @@ NCP5623 rgb; #endif +#ifdef HAS_LP5562 +#include +LP5562 rgbw; +#endif + #ifdef HAS_NEOPIXEL #include Adafruit_NeoPixel pixels(NEOPIXEL_COUNT, NEOPIXEL_DATA, NEOPIXEL_TYPE); @@ -26,7 +31,7 @@ class AmbientLightingThread : public concurrency::OSThread notifyDeepSleepObserver.observe(¬ifyDeepSleep); // Let us know when shutdown() is issued. // Enables Ambient Lighting by default if conditions are meet. -#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE) +#ifdef HAS_RGB_LED #ifdef ENABLE_AMBIENTLIGHTING moduleConfig.ambient_lighting.led_state = true; #endif @@ -39,7 +44,7 @@ class AmbientLightingThread : public concurrency::OSThread // moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8; // moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF; -#ifdef HAS_NCP5623 +#if defined(HAS_NCP5623) || defined(HAS_LP5562) _type = type; if (_type == ScanI2C::DeviceType::NONE) { LOG_DEBUG("AmbientLighting Disable due to no RGB leds found on I2C bus"); @@ -47,17 +52,21 @@ class AmbientLightingThread : public concurrency::OSThread return; } #endif -#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE) +#ifdef HAS_RGB_LED if (!moduleConfig.ambient_lighting.led_state) { LOG_DEBUG("AmbientLighting Disable due to moduleConfig.ambient_lighting.led_state OFF"); disable(); return; } LOG_DEBUG("AmbientLighting init"); -#ifdef HAS_NCP5623 +#if defined(HAS_NCP5623) || defined(HAS_LP5562) if (_type == ScanI2C::NCP5623) { rgb.begin(); #endif +#ifdef HAS_LP5562 + } else if (_type == ScanI2C::LP5562) { + rgbw.begin(); +#endif #ifdef RGBLED_RED pinMode(RGBLED_RED, OUTPUT); pinMode(RGBLED_GREEN, OUTPUT); @@ -70,7 +79,7 @@ class AmbientLightingThread : public concurrency::OSThread #endif setLighting(); #endif -#ifdef HAS_NCP5623 +#if defined(HAS_NCP5623) || defined(HAS_LP5562) } #endif } @@ -78,13 +87,13 @@ class AmbientLightingThread : public concurrency::OSThread protected: int32_t runOnce() override { -#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE) -#ifdef HAS_NCP5623 - if (_type == ScanI2C::NCP5623 && moduleConfig.ambient_lighting.led_state) { +#ifdef HAS_RGB_LED +#if defined(HAS_NCP5623) || defined(HAS_LP5562) + if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) { #endif setLighting(); return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification -#ifdef HAS_NCP5623 +#if defined(HAS_NCP5623) || defined(HAS_LP5562) } #endif #endif @@ -108,6 +117,14 @@ class AmbientLightingThread : public concurrency::OSThread rgb.setBlue(0); LOG_INFO("OFF: NCP5623 Ambient lighting"); #endif +#ifdef HAS_LP5562 + rgbw.setCurrent(0); + rgbw.setRed(0); + rgbw.setGreen(0); + rgbw.setBlue(0); + rgbw.setWhite(0); + LOG_INFO("OFF: LP5562 Ambient lighting"); +#endif #ifdef HAS_NEOPIXEL pixels.clear(); pixels.show(); @@ -141,6 +158,14 @@ class AmbientLightingThread : public concurrency::OSThread LOG_DEBUG("Init NCP5623 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue); #endif +#ifdef HAS_LP5562 + rgbw.setCurrent(moduleConfig.ambient_lighting.current); + rgbw.setRed(moduleConfig.ambient_lighting.red); + rgbw.setGreen(moduleConfig.ambient_lighting.green); + rgbw.setBlue(moduleConfig.ambient_lighting.blue); + LOG_DEBUG("Init LP5562 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current, + moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue); +#endif #ifdef HAS_NEOPIXEL pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue), diff --git a/src/configuration.h b/src/configuration.h index fd4a5b196..ba6066896 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -170,6 +170,7 @@ along with this program. If not, see . // LED // ----------------------------------------------------------------------------- #define NCP5623_ADDR 0x38 +#define LP5562_ADDR 0x30 // ----------------------------------------------------------------------------- // Security @@ -295,6 +296,11 @@ along with this program. If not, see . #error HW_VENDOR must be defined #endif +// Support multiple RGB LED configuration +#if defined(HAS_NCP5623) || defined(HAS_LP5562) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE) +#define HAS_RGB_LED +#endif + // ----------------------------------------------------------------------------- // Global switches to turn off features for a minimized build // ----------------------------------------------------------------------------- diff --git a/src/detect/ScanI2C.cpp b/src/detect/ScanI2C.cpp index 4caa0f730..b88843a78 100644 --- a/src/detect/ScanI2C.cpp +++ b/src/detect/ScanI2C.cpp @@ -41,6 +41,12 @@ ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const return firstOfOrNONE(8, types); } +ScanI2C::FoundDevice ScanI2C::firstRGBLED() const +{ + ScanI2C::DeviceType types[] = {NCP5623, LP5562}; + return firstOfOrNONE(2, types); +} + ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const { return DEVICE_NONE; diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h index 5b6bbe629..cfa3ea9cd 100644 --- a/src/detect/ScanI2C.h +++ b/src/detect/ScanI2C.h @@ -49,6 +49,7 @@ class ScanI2C VEML7700, RCWL9620, NCP5623, + LP5562, TSL2591, OPT3001, MLX90632, @@ -121,6 +122,8 @@ class ScanI2C FoundDevice firstAccelerometer() const; + FoundDevice firstRGBLED() const; + virtual FoundDevice find(DeviceType) const; virtual bool exists(DeviceType) const; diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp index 8b779277d..82fcda480 100644 --- a/src/detect/ScanI2CTwoWire.cpp +++ b/src/detect/ScanI2CTwoWire.cpp @@ -218,6 +218,9 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize) #ifdef HAS_NCP5623 SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address); #endif +#ifdef HAS_LP5562 + SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address); +#endif #ifdef HAS_PMU SCAN_SIMPLE_CASE(XPOWERS_AXP192_AXP2101_ADDRESS, PMU_AXP192_AXP2101, "AXP192/AXP2101", (uint8_t)addr.address) #endif diff --git a/src/graphics/NomadStarLED.h b/src/graphics/NomadStarLED.h new file mode 100644 index 000000000..0633a577e --- /dev/null +++ b/src/graphics/NomadStarLED.h @@ -0,0 +1,5 @@ +#ifdef HAS_LP5562 +#include +extern LP5562 rgbw; + +#endif \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 05eeef2ae..4b098b3f3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -602,9 +602,9 @@ void setup() * "found". */ -// Only one supported RGB LED currently -#ifdef HAS_NCP5623 - rgb_found = i2cScanner->find(ScanI2C::DeviceType::NCP5623); +// Two supported RGB LED currently +#ifdef HAS_RGB_LED + rgb_found = i2cScanner->firstRGBLED(); #endif #ifdef HAS_TPS65233 @@ -1270,7 +1270,7 @@ extern meshtastic_DeviceMetadata getDeviceMetadata() #ifndef ARCH_ESP32 deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_PAXCOUNTER_CONFIG; #endif -#if !defined(HAS_NCP5623) && !defined(RGBLED_RED) && !defined(HAS_NEOPIXEL) && !defined(UNPHONE) && !RAK_4631 +#if !defined(HAS_RGB_LED) && !RAK_4631 deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AMBIENTLIGHTING_CONFIG; #endif diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp index bbb3f90e0..dc17460f6 100644 --- a/src/modules/ExternalNotificationModule.cpp +++ b/src/modules/ExternalNotificationModule.cpp @@ -28,6 +28,10 @@ #include #endif +#ifdef HAS_LP5562 +#include +#endif + #ifdef HAS_NEOPIXEL #include #endif @@ -37,10 +41,11 @@ extern unPhone unphone; #endif -#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE) +#if defined(HAS_RGB_LED) uint8_t red = 0; uint8_t green = 0; uint8_t blue = 0; +uint8_t white = 0; uint8_t colorState = 1; uint8_t brightnessIndex = 0; uint8_t brightnessValues[] = {0, 10, 20, 30, 50, 90, 160, 170}; // blue gets multiplied by 1.5 @@ -128,15 +133,21 @@ int32_t ExternalNotificationModule::runOnce() millis()); setExternalState(2, !getExternal(2)); } -#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE) +#if defined(HAS_RGB_LED) red = (colorState & 4) ? brightnessValues[brightnessIndex] : 0; // Red enabled on colorState = 4,5,6,7 green = (colorState & 2) ? brightnessValues[brightnessIndex] : 0; // Green enabled on colorState = 2,3,6,7 blue = (colorState & 1) ? (brightnessValues[brightnessIndex] * 1.5) : 0; // Blue enabled on colorState = 1,3,5,7 + white = (colorState & 12) ? brightnessValues[brightnessIndex] : 0; #ifdef HAS_NCP5623 if (rgb_found.type == ScanI2C::NCP5623) { rgb.setColor(red, green, blue); } #endif +#ifdef HAS_LP5562 + if (rgb_found.type == ScanI2C::LP5562) { + rgbw.setColor(red, green, blue, white); + } +#endif #ifdef RGBLED_CA analogWrite(RGBLED_RED, 255 - red); // CA type needs reverse logic analogWrite(RGBLED_GREEN, 255 - green); @@ -233,11 +244,12 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on) break; } -#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE) +#if defined(HAS_RGB_LED) if (!on) { red = 0; green = 0; blue = 0; + white = 0; } #endif @@ -246,6 +258,11 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on) rgb.setColor(red, green, blue); } #endif +#ifdef HAS_LP5562 + if (rgb_found.type == ScanI2C::LP5562) { + rgbw.setColor(red, green, blue, white); + } +#endif #ifdef RGBLED_CA analogWrite(RGBLED_RED, 255 - red); // CA type needs reverse logic analogWrite(RGBLED_GREEN, 255 - green); @@ -365,6 +382,12 @@ ExternalNotificationModule::ExternalNotificationModule() rgb.setCurrent(10); } #endif +#ifdef HAS_LP5562 + if (rgb_found.type == ScanI2C::LP5562) { + rgbw.begin(); + rgbw.setCurrent(20); + } +#endif #ifdef RGBLED_RED pinMode(RGBLED_RED, OUTPUT); // set up the RGB led pins pinMode(RGBLED_GREEN, OUTPUT); From 67fddcc2142bed7e6748d0a5485d4848f32856fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 05:41:36 -0500 Subject: [PATCH 022/100] Upgrade trunk (#6480) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 4c570c856..b89f1f835 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -12,7 +12,7 @@ lint: - trufflehog@3.88.20 - yamllint@1.37.0 - bandit@1.8.3 - - checkov@3.2.394 + - checkov@3.2.395 - terrascan@1.19.9 - trivy@0.61.0 - taplo@0.9.3 @@ -22,7 +22,7 @@ lint: - oxipng@9.1.4 - svgo@3.3.2 - actionlint@1.7.7 - - flake8@7.1.2 + - flake8@7.2.0 - hadolint@2.12.1-beta - shfmt@3.6.0 - shellcheck@0.10.0 From ef18a9b5b5a2a756ad15009ce9cd7e0b7717d077 Mon Sep 17 00:00:00 2001 From: Austin Date: Wed, 2 Apr 2025 07:55:14 -0400 Subject: [PATCH 023/100] meshtasticd: Set available.d dir in yaml (#6481) --- bin/config-dist.yaml | 3 ++- src/platform/portduino/PortduinoGlue.cpp | 4 +++- src/platform/portduino/PortduinoGlue.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/config-dist.yaml b/bin/config-dist.yaml index 722f80fae..9238d0e56 100644 --- a/bin/config-dist.yaml +++ b/bin/config-dist.yaml @@ -197,5 +197,6 @@ General: MaxNodes: 200 MaxMessageQueue: 100 ConfigDirectory: /etc/meshtasticd/config.d/ + AvailableDirectory: /etc/meshtasticd/available.d/ # MACAddress: AA:BB:CC:DD:EE:FF -# MACAddressSource: eth0 \ No newline at end of file +# MACAddressSource: eth0 diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index a4050e702..6d0972dc3 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -247,7 +247,7 @@ void portduinoSetup() std::cerr << "autoconf: Unable to find config for " << autoconf_product << std::endl; exit(EXIT_FAILURE); } - if (loadConfig(("/etc/meshtasticd/available.d/" + product_config).c_str())) { + if (loadConfig((settingsStrings[available_directory] + product_config).c_str())) { std::cout << "autoconf: Using " << product_config << " as config file for " << autoconf_product << std::endl; } else { std::cerr << "autoconf: Unable to use " << product_config << " as config file for " << autoconf_product @@ -602,6 +602,8 @@ bool loadConfig(const char *configPath) settingsMap[maxnodes] = (yamlConfig["General"]["MaxNodes"]).as(200); settingsMap[maxtophone] = (yamlConfig["General"]["MaxMessageQueue"]).as(100); settingsStrings[config_directory] = (yamlConfig["General"]["ConfigDirectory"]).as(""); + settingsStrings[available_directory] = + (yamlConfig["General"]["AvailableDirectory"]).as("/etc/meshtasticd/available.d/"); if ((yamlConfig["General"]["MACAddress"]).as("") != "" && (yamlConfig["General"]["MACAddressSource"]).as("") != "") { std::cout << "Cannot set both MACAddress and MACAddressSource!" << std::endl; diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h index 4e074be71..f7239cb73 100644 --- a/src/platform/portduino/PortduinoGlue.h +++ b/src/platform/portduino/PortduinoGlue.h @@ -99,6 +99,7 @@ enum configNames { maxnodes, ascii_logs, config_directory, + available_directory, mac_address }; enum { no_screen, x11, st7789, st7735, st7735s, st7796, ili9341, ili9342, ili9486, ili9488, hx8357d }; From 594cb0cc1e94b478aac755025f0912b452aa2845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 3 Apr 2025 02:15:12 +0200 Subject: [PATCH 024/100] reinstate M1 Backlight (#6484) --- src/graphics/EInkDisplay2.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp index 27117641e..d2d373d24 100644 --- a/src/graphics/EInkDisplay2.cpp +++ b/src/graphics/EInkDisplay2.cpp @@ -128,8 +128,13 @@ bool EInkDisplay::connect() #ifdef PIN_EINK_EN // backlight power, HIGH is backlight on, LOW is off pinMode(PIN_EINK_EN, OUTPUT); +#ifdef ELECROW_ThinkNode_M1 + // ThinkNode M1 has a hardware dimmable backlight. Start enabled + digitalWrite(PIN_EINK_EN, HIGH); +#else digitalWrite(PIN_EINK_EN, LOW); #endif +#endif #if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1) { From 31130fd49e732bdd813492e8155e71605275595c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Apr 2025 06:52:39 -0500 Subject: [PATCH 025/100] Upgrade trunk to 1.22.12 (#6487) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index b89f1f835..aeb0a1b43 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,6 +1,6 @@ version: 0.1 cli: - version: 1.22.11 + version: 1.22.12 plugins: sources: - id: trunk @@ -12,7 +12,7 @@ lint: - trufflehog@3.88.20 - yamllint@1.37.0 - bandit@1.8.3 - - checkov@3.2.395 + - checkov@3.2.396 - terrascan@1.19.9 - trivy@0.61.0 - taplo@0.9.3 From 11bafae2872c244dd821ce0b6273e699f55cfae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 3 Apr 2025 16:02:46 +0200 Subject: [PATCH 026/100] update OLED library (#6489) --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 010aea90f..377635873 100644 --- a/platformio.ini +++ b/platformio.ini @@ -56,7 +56,7 @@ build_flags = -Wno-missing-field-initializers monitor_speed = 115200 monitor_filters = direct lib_deps = - https://github.com/meshtastic/esp8266-oled-ssd1306/archive/e16cee124fe26490cb14880c679321ad8ac89c95.zip + https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip mathertel/OneButton@2.6.1 https://github.com/meshtastic/arduino-fsm/archive/7db3702bf0cfe97b783d6c72595e3f38e0b19159.zip https://github.com/meshtastic/TinyGPSPlus/archive/71a82db35f3b973440044c476d4bcdc673b104f4.zip From 1017f6af355f6e531d76578118b59bb4c9bee41b Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Thu, 3 Apr 2025 07:07:43 -0700 Subject: [PATCH 027/100] remove very long slow (#6486) --- src/DisplayFormatters.cpp | 3 --- src/mesh/RadioInterface.cpp | 5 ----- 2 files changed, 8 deletions(-) diff --git a/src/DisplayFormatters.cpp b/src/DisplayFormatters.cpp index 0718ffcbd..44bc0897b 100644 --- a/src/DisplayFormatters.cpp +++ b/src/DisplayFormatters.cpp @@ -27,9 +27,6 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE: return useShortName ? "LongM" : "LongMod"; break; - case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW: - return useShortName ? "VeryL" : "VLongSlow"; - break; default: return useShortName ? "Custom" : "Invalid"; break; diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp index 2e50c0168..86903153b 100644 --- a/src/mesh/RadioInterface.cpp +++ b/src/mesh/RadioInterface.cpp @@ -488,11 +488,6 @@ void RadioInterface::applyModemConfig() cr = 8; sf = 12; break; - case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW: - bw = (myRegion->wideLora) ? 203.125 : 62.5; - cr = 8; - sf = 12; - break; } } else { sf = loraConfig.spread_factor; From 06658028234b86dc9cb7055f6f57ce6fd5a417fd Mon Sep 17 00:00:00 2001 From: "Jason B. Cox" Date: Thu, 3 Apr 2025 12:17:36 -0700 Subject: [PATCH 028/100] Improve PKC unit test coverage (#6485) * Cleanup PKC unit test a bit * Add unit test coverage for encryptCurve25519 --------- Co-authored-by: Ben Meadors --- test/test_crypto/test_main.cpp | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/test/test_crypto/test_main.cpp b/test/test_crypto/test_main.cpp index ac507116c..36dc37b9d 100644 --- a/test/test_crypto/test_main.cpp +++ b/test/test_crypto/test_main.cpp @@ -110,7 +110,7 @@ void test_DH25519(void) TEST_ASSERT_EQUAL_MEMORY(expected_shared, crypto->shared_key, 32); } -void test_PKC_Decrypt(void) +void test_PKC(void) { uint8_t private_key[32]; meshtastic_UserLite_public_key_t public_key; @@ -120,7 +120,8 @@ void test_PKC_Decrypt(void) uint8_t decrypted[128] __attribute__((__aligned__)); uint8_t expected_nonce[16]; - uint32_t fromNode; + uint32_t fromNode = 0x0929; + uint64_t packetNum = 0x13b2d662; HexToBytes(public_key.bytes, "db18fc50eea47f00251cb784819a3cf5fc361882597f589f0d7ff820e8064457"); public_key.size = 32; HexToBytes(private_key, "a00330633e63522f8a4d81ec6d9d1e6617f6c8ffd3a4c698229537d44e522277"); @@ -128,14 +129,26 @@ void test_PKC_Decrypt(void) HexToBytes(expected_decrypted, "08011204746573744800"); HexToBytes(radioBytes, "8c646d7a2909000062d6b2136b00000040df24abfcc30a17a3d9046726099e796a1c036a792b"); HexToBytes(expected_nonce, "62d6b213036a792b2909000000"); - fromNode = 0x0929; crypto->setDHPrivateKey(private_key); - // TEST_ASSERT(crypto->setDHPublicKey(public_key)); - // crypto->hash(crypto->shared_key, 32); - crypto->decryptCurve25519(fromNode, public_key, 0x13b2d662, 22, radioBytes + 16, decrypted); + + TEST_ASSERT(crypto->decryptCurve25519(fromNode, public_key, packetNum, 22, radioBytes + 16, decrypted)); TEST_ASSERT_EQUAL_MEMORY(expected_shared, crypto->shared_key, 8); TEST_ASSERT_EQUAL_MEMORY(expected_nonce, crypto->nonce, 13); + TEST_ASSERT_EQUAL_MEMORY(expected_decrypted, decrypted, 10); + uint32_t toNode = 0; // Only impacts logging + uint8_t encrypted[128] __attribute__((__aligned__)); + TEST_ASSERT(crypto->encryptCurve25519(toNode, fromNode, public_key, packetNum, 10, decrypted, encrypted)); + TEST_ASSERT_EQUAL_MEMORY(expected_shared, crypto->shared_key, 8); + // The extraNonce is random, so skip checking the nonce and encrypted output here + + // Copy the nonce to check it after encryption + memcpy(expected_nonce, crypto->nonce, 16); + + // Decrypt the re-encrypted bytes and check they are the same as what we expect + TEST_ASSERT(crypto->decryptCurve25519(fromNode, public_key, packetNum, 22, encrypted, decrypted)); + TEST_ASSERT_EQUAL_MEMORY(expected_shared, crypto->shared_key, 8); + TEST_ASSERT_EQUAL_MEMORY(expected_nonce, crypto->nonce, 13); TEST_ASSERT_EQUAL_MEMORY(expected_decrypted, decrypted, 10); } @@ -178,7 +191,7 @@ void setup() RUN_TEST(test_ECB_AES256); RUN_TEST(test_DH25519); RUN_TEST(test_AES_CTR); - RUN_TEST(test_PKC_Decrypt); + RUN_TEST(test_PKC); exit(UNITY_END()); // stop unit testing } From 749410617007319e995f5014329bc5f2c31e8a9e Mon Sep 17 00:00:00 2001 From: Nasimovy Date: Thu, 3 Apr 2025 19:18:18 +0000 Subject: [PATCH 029/100] TCA8418 initial config + basic 3x4 keypad config (#6422) * TCA8418 with base config for 3x4 keypad * replaced k with uppercase K * change detection method * reflect changes #6381 --------- Co-authored-by: Ben Meadors --- src/configuration.h | 1 + src/detect/ScanI2C.cpp | 4 +- src/detect/ScanI2C.h | 3 +- src/detect/ScanI2CTwoWire.cpp | 20 +- src/input/TCA8418Keyboard.cpp | 561 ++++++++++++++++++++++++++++++++++ src/input/TCA8418Keyboard.h | 83 +++++ src/input/cardKbI2cImpl.cpp | 8 +- src/input/kbI2cBase.cpp | 68 +++++ src/input/kbI2cBase.h | 2 + src/main.cpp | 4 + 10 files changed, 742 insertions(+), 12 deletions(-) create mode 100644 src/input/TCA8418Keyboard.cpp create mode 100644 src/input/TCA8418Keyboard.h diff --git a/src/configuration.h b/src/configuration.h index ba6066896..d319ddb0a 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -152,6 +152,7 @@ along with this program. If not, see . #define MLX90614_ADDR_DEF 0x5A #define CGRADSENS_ADDR 0x66 #define LTR390UV_ADDR 0x53 +#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418 // ----------------------------------------------------------------------------- // ACCELEROMETER diff --git a/src/detect/ScanI2C.cpp b/src/detect/ScanI2C.cpp index b88843a78..5bd5c0d12 100644 --- a/src/detect/ScanI2C.cpp +++ b/src/detect/ScanI2C.cpp @@ -31,8 +31,8 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const ScanI2C::FoundDevice ScanI2C::firstKeyboard() const { - ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB}; - return firstOfOrNONE(5, types); + ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB}; + return firstOfOrNONE(6, types); } ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h index cfa3ea9cd..c363db1b5 100644 --- a/src/detect/ScanI2C.h +++ b/src/detect/ScanI2C.h @@ -18,7 +18,7 @@ class ScanI2C TDECKKB, BBQ10KB, RAK14004, - PMU_AXP192_AXP2101, + PMU_AXP192_AXP2101, // has the same adress as the TCA8418KB BME_680, BME_280, BMP_280, @@ -70,6 +70,7 @@ class ScanI2C DFROBOT_RAIN, DPS310, LTR390UV, + TCA8418KB, } DeviceType; // typedef uint8_t DeviceAddress; diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp index 82fcda480..230271b94 100644 --- a/src/detect/ScanI2CTwoWire.cpp +++ b/src/detect/ScanI2CTwoWire.cpp @@ -10,11 +10,6 @@ #include "meshUtils.h" // vformat #endif -// AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp -#ifndef XPOWERS_AXP192_AXP2101_ADDRESS -#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 -#endif - bool in_array(uint8_t *array, int size, uint8_t lookfor) { int i; @@ -221,8 +216,19 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize) #ifdef HAS_LP5562 SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address); #endif -#ifdef HAS_PMU - SCAN_SIMPLE_CASE(XPOWERS_AXP192_AXP2101_ADDRESS, PMU_AXP192_AXP2101, "AXP192/AXP2101", (uint8_t)addr.address) + case XPOWERS_AXP192_AXP2101_ADDRESS: + // Do we have the axp2101/192 or the TCA8418 + registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x90), 1); + if (registerValue == 0x0) { + logFoundDevice("TCA8418", (uint8_t)addr.address); + type = TCA8418KB; + } else { + logFoundDevice("AXP192/AXP2101", (uint8_t)addr.address); + type = PMU_AXP192_AXP2101; + } + break; +#ifdef HAS_LP5562 + SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address); #endif case BME_ADDR: case BME_ADDR_ALTERNATE: diff --git a/src/input/TCA8418Keyboard.cpp b/src/input/TCA8418Keyboard.cpp new file mode 100644 index 000000000..21cd7b2d5 --- /dev/null +++ b/src/input/TCA8418Keyboard.cpp @@ -0,0 +1,561 @@ +// Based on the MPR121 Keyboard and Adafruit TCA8418 library + +#include "TCA8418Keyboard.h" +#include "configuration.h" + +#include + +// REGISTERS +// #define _TCA8418_REG_RESERVED 0x00 +#define _TCA8418_REG_CFG 0x01 // Configuration register +#define _TCA8418_REG_INT_STAT 0x02 // Interrupt status +#define _TCA8418_REG_KEY_LCK_EC 0x03 // Key lock and event counter +#define _TCA8418_REG_KEY_EVENT_A 0x04 // Key event register A +#define _TCA8418_REG_KEY_EVENT_B 0x05 // Key event register B +#define _TCA8418_REG_KEY_EVENT_C 0x06 // Key event register C +#define _TCA8418_REG_KEY_EVENT_D 0x07 // Key event register D +#define _TCA8418_REG_KEY_EVENT_E 0x08 // Key event register E +#define _TCA8418_REG_KEY_EVENT_F 0x09 // Key event register F +#define _TCA8418_REG_KEY_EVENT_G 0x0A // Key event register G +#define _TCA8418_REG_KEY_EVENT_H 0x0B // Key event register H +#define _TCA8418_REG_KEY_EVENT_I 0x0C // Key event register I +#define _TCA8418_REG_KEY_EVENT_J 0x0D // Key event register J +#define _TCA8418_REG_KP_LCK_TIMER 0x0E // Keypad lock1 to lock2 timer +#define _TCA8418_REG_UNLOCK_1 0x0F // Unlock register 1 +#define _TCA8418_REG_UNLOCK_2 0x10 // Unlock register 2 +#define _TCA8418_REG_GPIO_INT_STAT_1 0x11 // GPIO interrupt status 1 +#define _TCA8418_REG_GPIO_INT_STAT_2 0x12 // GPIO interrupt status 2 +#define _TCA8418_REG_GPIO_INT_STAT_3 0x13 // GPIO interrupt status 3 +#define _TCA8418_REG_GPIO_DAT_STAT_1 0x14 // GPIO data status 1 +#define _TCA8418_REG_GPIO_DAT_STAT_2 0x15 // GPIO data status 2 +#define _TCA8418_REG_GPIO_DAT_STAT_3 0x16 // GPIO data status 3 +#define _TCA8418_REG_GPIO_DAT_OUT_1 0x17 // GPIO data out 1 +#define _TCA8418_REG_GPIO_DAT_OUT_2 0x18 // GPIO data out 2 +#define _TCA8418_REG_GPIO_DAT_OUT_3 0x19 // GPIO data out 3 +#define _TCA8418_REG_GPIO_INT_EN_1 0x1A // GPIO interrupt enable 1 +#define _TCA8418_REG_GPIO_INT_EN_2 0x1B // GPIO interrupt enable 2 +#define _TCA8418_REG_GPIO_INT_EN_3 0x1C // GPIO interrupt enable 3 +#define _TCA8418_REG_KP_GPIO_1 0x1D // Keypad/GPIO select 1 +#define _TCA8418_REG_KP_GPIO_2 0x1E // Keypad/GPIO select 2 +#define _TCA8418_REG_KP_GPIO_3 0x1F // Keypad/GPIO select 3 +#define _TCA8418_REG_GPI_EM_1 0x20 // GPI event mode 1 +#define _TCA8418_REG_GPI_EM_2 0x21 // GPI event mode 2 +#define _TCA8418_REG_GPI_EM_3 0x22 // GPI event mode 3 +#define _TCA8418_REG_GPIO_DIR_1 0x23 // GPIO data direction 1 +#define _TCA8418_REG_GPIO_DIR_2 0x24 // GPIO data direction 2 +#define _TCA8418_REG_GPIO_DIR_3 0x25 // GPIO data direction 3 +#define _TCA8418_REG_GPIO_INT_LVL_1 0x26 // GPIO edge/level detect 1 +#define _TCA8418_REG_GPIO_INT_LVL_2 0x27 // GPIO edge/level detect 2 +#define _TCA8418_REG_GPIO_INT_LVL_3 0x28 // GPIO edge/level detect 3 +#define _TCA8418_REG_DEBOUNCE_DIS_1 0x29 // Debounce disable 1 +#define _TCA8418_REG_DEBOUNCE_DIS_2 0x2A // Debounce disable 2 +#define _TCA8418_REG_DEBOUNCE_DIS_3 0x2B // Debounce disable 3 +#define _TCA8418_REG_GPIO_PULL_1 0x2C // GPIO pull-up disable 1 +#define _TCA8418_REG_GPIO_PULL_2 0x2D // GPIO pull-up disable 2 +#define _TCA8418_REG_GPIO_PULL_3 0x2E // GPIO pull-up disable 3 +// #define _TCA8418_REG_RESERVED 0x2F + +// FIELDS CONFIG REGISTER 1 +#define _TCA8418_REG_CFG_AI 0x80 // Auto-increment for read/write +#define _TCA8418_REG_CFG_GPI_E_CGF 0x40 // Event mode config +#define _TCA8418_REG_CFG_OVR_FLOW_M 0x20 // Overflow mode enable +#define _TCA8418_REG_CFG_INT_CFG 0x10 // Interrupt config +#define _TCA8418_REG_CFG_OVR_FLOW_IEN 0x08 // Overflow interrupt enable +#define _TCA8418_REG_CFG_K_LCK_IEN 0x04 // Keypad lock interrupt enable +#define _TCA8418_REG_CFG_GPI_IEN 0x02 // GPI interrupt enable +#define _TCA8418_REG_CFG_KE_IEN 0x01 // Key events interrupt enable + +// FIELDS INT_STAT REGISTER 2 +#define _TCA8418_REG_STAT_CAD_INT 0x10 // Ctrl-alt-del seq status +#define _TCA8418_REG_STAT_OVR_FLOW_INT 0x08 // Overflow interrupt status +#define _TCA8418_REG_STAT_K_LCK_INT 0x04 // Key lock interrupt status +#define _TCA8418_REG_STAT_GPI_INT 0x02 // GPI interrupt status +#define _TCA8418_REG_STAT_K_INT 0x01 // Key events interrupt status + +// FIELDS KEY_LCK_EC REGISTER 3 +#define _TCA8418_REG_LCK_EC_K_LCK_EN 0x40 // Key lock enable +#define _TCA8418_REG_LCK_EC_LCK_2 0x20 // Keypad lock status 2 +#define _TCA8418_REG_LCK_EC_LCK_1 0x10 // Keypad lock status 1 +#define _TCA8418_REG_LCK_EC_KLEC_3 0x08 // Key event count bit 3 +#define _TCA8418_REG_LCK_EC_KLEC_2 0x04 // Key event count bit 2 +#define _TCA8418_REG_LCK_EC_KLEC_1 0x02 // Key event count bit 1 +#define _TCA8418_REG_LCK_EC_KLEC_0 0x01 // Key event count bit 0 + +// Pin IDs for matrix rows/columns +enum { + _TCA8418_ROW0, // Pin ID for row 0 + _TCA8418_ROW1, // Pin ID for row 1 + _TCA8418_ROW2, // Pin ID for row 2 + _TCA8418_ROW3, // Pin ID for row 3 + _TCA8418_ROW4, // Pin ID for row 4 + _TCA8418_ROW5, // Pin ID for row 5 + _TCA8418_ROW6, // Pin ID for row 6 + _TCA8418_ROW7, // Pin ID for row 7 + _TCA8418_COL0, // Pin ID for column 0 + _TCA8418_COL1, // Pin ID for column 1 + _TCA8418_COL2, // Pin ID for column 2 + _TCA8418_COL3, // Pin ID for column 3 + _TCA8418_COL4, // Pin ID for column 4 + _TCA8418_COL5, // Pin ID for column 5 + _TCA8418_COL6, // Pin ID for column 6 + _TCA8418_COL7, // Pin ID for column 7 + _TCA8418_COL8, // Pin ID for column 8 + _TCA8418_COL9 // Pin ID for column 9 +}; + +#define _TCA8418_COLS 3 +#define _TCA8418_ROWS 4 +#define _TCA8418_NUM_KEYS 12 + +uint8_t TCA8418TapMod[_TCA8418_NUM_KEYS] = {13, 7, 7, 7, 7, 7, + 9, 7, 9, 2, 2, 2}; // Num chars per key, Modulus for rotating through characters + +unsigned char TCA8418TapMap[_TCA8418_NUM_KEYS][13] = { + {'1', '.', ',', '?', '!', ':', ';', '-', '_', '\\', '/', '(', ')'}, // 1 + {'2', 'a', 'b', 'c', 'A', 'B', 'C'}, // 2 + {'3', 'd', 'e', 'f', 'D', 'E', 'F'}, // 3 + {'4', 'g', 'h', 'i', 'G', 'H', 'I'}, // 4 + {'5', 'j', 'k', 'l', 'J', 'K', 'L'}, // 5 + {'6', 'm', 'n', 'o', 'M', 'N', 'O'}, // 6 + {'7', 'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S'}, // 7 + {'8', 't', 'u', 'v', 'T', 'U', 'V'}, // 8 + {'9', 'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z'}, // 9 + {'*', '+'}, // * + {'0', ' '}, // 0 + {'#', '@'}, // # +}; + +unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = { + _TCA8418_ESC, // 1 + _TCA8418_UP, // 2 + _TCA8418_NONE, // 3 + _TCA8418_LEFT, // 4 + _TCA8418_NONE, // 5 + _TCA8418_RIGHT, // 6 + _TCA8418_NONE, // 7 + _TCA8418_DOWN, // 8 + _TCA8418_NONE, // 9 + _TCA8418_BSP, // * + _TCA8418_NONE, // 0 + _TCA8418_NONE, // # +}; + +#define _TCA8418_LONG_PRESS_THRESHOLD 2000 +#define _TCA8418_MULTI_TAP_THRESHOLD 750 + +TCA8418Keyboard::TCA8418Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr) +{ + state = Init; + last_key = -1; + next_key = -1; + should_backspace = false; + last_tap = 0L; + char_idx = 0; + tap_interval = 0; + backlight_on = true; + queue = ""; +} + +void TCA8418Keyboard::begin(uint8_t addr, TwoWire *wire) +{ + m_addr = addr; + m_wire = wire; + + m_wire->begin(); + + reset(); +} + +void TCA8418Keyboard::begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr) +{ + m_addr = addr; + m_wire = nullptr; + writeCallback = w; + readCallback = r; + reset(); +} + +void TCA8418Keyboard::reset() +{ + LOG_DEBUG("TCA8418 Reset"); + // GPIO + // set default all GIO pins to INPUT + writeRegister(_TCA8418_REG_GPIO_DIR_1, 0x00); + writeRegister(_TCA8418_REG_GPIO_DIR_2, 0x00); + // Set COL9 as GPIO output + writeRegister(_TCA8418_REG_GPIO_DIR_3, 0x02); + // Switch off keyboard backlight (COL9 = LOW) + writeRegister(_TCA8418_REG_GPIO_DAT_OUT_3, 0x00); + + // add all pins to key events + writeRegister(_TCA8418_REG_GPI_EM_1, 0xFF); + writeRegister(_TCA8418_REG_GPI_EM_2, 0xFF); + writeRegister(_TCA8418_REG_GPI_EM_3, 0xFF); + + // set all pins to FALLING interrupts + writeRegister(_TCA8418_REG_GPIO_INT_LVL_1, 0x00); + writeRegister(_TCA8418_REG_GPIO_INT_LVL_2, 0x00); + writeRegister(_TCA8418_REG_GPIO_INT_LVL_3, 0x00); + + // add all pins to interrupts + writeRegister(_TCA8418_REG_GPIO_INT_EN_1, 0xFF); + writeRegister(_TCA8418_REG_GPIO_INT_EN_2, 0xFF); + writeRegister(_TCA8418_REG_GPIO_INT_EN_3, 0xFF); + + // Set keyboard matrix size + matrix(_TCA8418_ROWS, _TCA8418_COLS); + enableDebounce(); + flush(); + state = Idle; +} + +bool TCA8418Keyboard::matrix(uint8_t rows, uint8_t columns) +{ + if ((rows > 8) || (columns > 10)) + return false; + + // Skip zero size matrix + if ((rows != 0) && (columns != 0)) { + // Setup the keypad matrix. + uint8_t mask = 0x00; + for (int r = 0; r < rows; r++) { + mask <<= 1; + mask |= 1; + } + writeRegister(_TCA8418_REG_KP_GPIO_1, mask); + + mask = 0x00; + for (int c = 0; c < columns && c < 8; c++) { + mask <<= 1; + mask |= 1; + } + writeRegister(_TCA8418_REG_KP_GPIO_2, mask); + + if (columns > 8) { + if (columns == 9) + mask = 0x01; + else + mask = 0x03; + writeRegister(_TCA8418_REG_KP_GPIO_3, mask); + } + } + + return true; +} + +uint8_t TCA8418Keyboard::keyCount() const +{ + uint8_t eventCount = readRegister(_TCA8418_REG_KEY_LCK_EC); + eventCount &= 0x0F; // lower 4 bits only + return eventCount; +} + +bool TCA8418Keyboard::hasEvent() +{ + return queue.length() > 0; +} + +void TCA8418Keyboard::queueEvent(char next) +{ + if (next == _TCA8418_NONE) { + return; + } + queue.concat(next); +} + +char TCA8418Keyboard::dequeueEvent() +{ + if (queue.length() < 1) { + return _TCA8418_NONE; + } + char next = queue.charAt(0); + queue.remove(0, 1); + return next; +} + +void TCA8418Keyboard::trigger() +{ + if (keyCount() == 0) { + return; + } + if (state != Init) { + // Read the key register + uint8_t k = readRegister(_TCA8418_REG_KEY_EVENT_A); + uint8_t key = k & 0x7F; + if (k & 0x80) { + if (state == Idle) + pressed(key); + return; + } else { + if (state == Held) { + released(); + } + state = Idle; + return; + } + } else { + reset(); + } +} + +void TCA8418Keyboard::pressed(uint8_t key) +{ + if (state == Init || state == Busy) { + return; + } + uint8_t next_key = 0; + int row = (key - 1) / 10; + int col = (key - 1) % 10; + + if (row >= _TCA8418_ROWS || col >= _TCA8418_COLS) { + return; // Invalid key + } + + // Compute key index based on dynamic row/column + next_key = row * _TCA8418_COLS + col; + + // LOG_DEBUG("TCA8418: Key %u -> Next Key %u", key, next_key); + + state = Held; + uint32_t now = millis(); + tap_interval = now - last_tap; + if (tap_interval < 0) { + // Long running, millis has overflowed. + last_tap = 0; + state = Busy; + return; + } + + // Check if the key is the same as the last one or if the time interval has passed + if (next_key != last_key || tap_interval > _TCA8418_MULTI_TAP_THRESHOLD) { + char_idx = 0; // Reset char index if new key or long press + should_backspace = false; // dont backspace on new key + } else { + char_idx += 1; // Cycle through characters if same key pressed + should_backspace = true; // allow backspace on same key + } + + // Store the current key as the last key + last_key = next_key; + last_tap = now; +} + +void TCA8418Keyboard::released() +{ + if (state != Held) { + return; + } + + if (last_key < 0 || last_key > _TCA8418_NUM_KEYS) { // reset to idle if last_key out of bounds + last_key = -1; + state = Idle; + return; + } + uint32_t now = millis(); + int32_t held_interval = now - last_tap; + last_tap = now; + if (tap_interval < _TCA8418_MULTI_TAP_THRESHOLD && should_backspace) { + queueEvent(_TCA8418_BSP); + } + if (held_interval > _TCA8418_LONG_PRESS_THRESHOLD) { + queueEvent(TCA8418LongPressMap[last_key]); + // LOG_DEBUG("Long Press Key: %i Map: %i", last_key, TCA8418LongPressMap[last_key]); + } else { + queueEvent(TCA8418TapMap[last_key][(char_idx % TCA8418TapMod[last_key])]); + // LOG_DEBUG("Key Press: %i Index:%i if %i Map: %c", last_key, char_idx, TCA8418TapMod[last_key], + // TCA8418TapMap[last_key][(char_idx % TCA8418TapMod[last_key])]); + } +} + +uint8_t TCA8418Keyboard::flush() +{ + // Flush key events + uint8_t count = 0; + while (readRegister(_TCA8418_REG_KEY_EVENT_A) != 0) + count++; + // Flush gpio events + readRegister(_TCA8418_REG_GPIO_INT_STAT_1); + readRegister(_TCA8418_REG_GPIO_INT_STAT_2); + readRegister(_TCA8418_REG_GPIO_INT_STAT_3); + // Clear INT_STAT register + writeRegister(_TCA8418_REG_INT_STAT, 3); + return count; +} + +uint8_t TCA8418Keyboard::digitalRead(uint8_t pinnum) const +{ + if (pinnum > _TCA8418_COL9) + return 0xFF; + + uint8_t reg = _TCA8418_REG_GPIO_DAT_STAT_1 + pinnum / 8; + uint8_t mask = (1 << (pinnum % 8)); + + // Level 0 = low other = high + uint8_t value = readRegister(reg); + if (value & mask) + return HIGH; + return LOW; +} + +bool TCA8418Keyboard::digitalWrite(uint8_t pinnum, uint8_t level) +{ + if (pinnum > _TCA8418_COL9) + return false; + + uint8_t reg = _TCA8418_REG_GPIO_DAT_OUT_1 + pinnum / 8; + uint8_t mask = (1 << (pinnum % 8)); + + // Level 0 = low other = high + uint8_t value = readRegister(reg); + if (level == LOW) + value &= ~mask; + else + value |= mask; + writeRegister(reg, value); + return true; +} + +bool TCA8418Keyboard::pinMode(uint8_t pinnum, uint8_t mode) +{ + if (pinnum > _TCA8418_COL9) + return false; + + uint8_t idx = pinnum / 8; + uint8_t reg = _TCA8418_REG_GPIO_DIR_1 + idx; + uint8_t mask = (1 << (pinnum % 8)); + + // Mode 0 = input 1 = output + uint8_t value = readRegister(reg); + if (mode == OUTPUT) + value |= mask; + else + value &= ~mask; + writeRegister(reg, value); + + // Pullup 0 = enabled 1 = disabled + reg = _TCA8418_REG_GPIO_PULL_1 + idx; + value = readRegister(reg); + if (mode == INPUT_PULLUP) + value &= ~mask; + else + value |= mask; + writeRegister(reg, value); + + return true; +} + +bool TCA8418Keyboard::pinIRQMode(uint8_t pinnum, uint8_t mode) +{ + if (pinnum > _TCA8418_COL9) + return false; + if ((mode != RISING) && (mode != FALLING)) + return false; + + // Mode 0 = falling 1 = rising + uint8_t idx = pinnum / 8; + uint8_t reg = _TCA8418_REG_GPIO_INT_LVL_1 + idx; + uint8_t mask = (1 << (pinnum % 8)); + + uint8_t value = readRegister(reg); + if (mode == RISING) + value |= mask; + else + value &= ~mask; + writeRegister(reg, value); + + // Enable interrupt + reg = _TCA8418_REG_GPIO_INT_EN_1 + idx; + value = readRegister(reg); + value |= mask; + writeRegister(reg, value); + + return true; +} + +void TCA8418Keyboard::enableInterrupts() +{ + uint8_t value = readRegister(_TCA8418_REG_CFG); + value |= (_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN); + writeRegister(_TCA8418_REG_CFG, value); +}; + +void TCA8418Keyboard::disableInterrupts() +{ + uint8_t value = readRegister(_TCA8418_REG_CFG); + value &= ~(_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN); + writeRegister(_TCA8418_REG_CFG, value); +}; + +void TCA8418Keyboard::enableMatrixOverflow() +{ + uint8_t value = readRegister(_TCA8418_REG_CFG); + value |= _TCA8418_REG_CFG_OVR_FLOW_M; + writeRegister(_TCA8418_REG_CFG, value); +}; + +void TCA8418Keyboard::disableMatrixOverflow() +{ + uint8_t value = readRegister(_TCA8418_REG_CFG); + value &= ~_TCA8418_REG_CFG_OVR_FLOW_M; + writeRegister(_TCA8418_REG_CFG, value); +}; + +void TCA8418Keyboard::enableDebounce() +{ + writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0x00); + writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0x00); + writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0x00); +} + +void TCA8418Keyboard::disableDebounce() +{ + writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0xFF); + writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0xFF); + writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0xFF); +} + +void TCA8418Keyboard::setBacklight(bool on) +{ + if (on) { + digitalWrite(_TCA8418_COL9, HIGH); + } else { + digitalWrite(_TCA8418_COL9, LOW); + } +} + +uint8_t TCA8418Keyboard::readRegister(uint8_t reg) const +{ + if (m_wire) { + m_wire->beginTransmission(m_addr); + m_wire->write(reg); + m_wire->endTransmission(); + + m_wire->requestFrom(m_addr, (uint8_t)1); + if (m_wire->available() < 1) + return 0; + + return m_wire->read(); + } + if (readCallback) { + uint8_t data; + readCallback(m_addr, reg, &data, 1); + return data; + } + return 0; +} + +void TCA8418Keyboard::writeRegister(uint8_t reg, uint8_t value) +{ + uint8_t data[2]; + data[0] = reg; + data[1] = value; + + if (m_wire) { + m_wire->beginTransmission(m_addr); + m_wire->write(data, sizeof(uint8_t) * 2); + m_wire->endTransmission(); + } + if (writeCallback) { + writeCallback(m_addr, data[0], &(data[1]), 1); + } +} \ No newline at end of file diff --git a/src/input/TCA8418Keyboard.h b/src/input/TCA8418Keyboard.h new file mode 100644 index 000000000..c7f3c1f28 --- /dev/null +++ b/src/input/TCA8418Keyboard.h @@ -0,0 +1,83 @@ +// Based on the MPR121 Keyboard and Adafruit TCA8418 library +#include "configuration.h" +#include + +#define _TCA8418_NONE 0x00 +#define _TCA8418_REBOOT 0x90 +#define _TCA8418_LEFT 0xb4 +#define _TCA8418_UP 0xb5 +#define _TCA8418_DOWN 0xb6 +#define _TCA8418_RIGHT 0xb7 +#define _TCA8418_ESC 0x1b +#define _TCA8418_BSP 0x08 +#define _TCA8418_SELECT 0x0d + +class TCA8418Keyboard +{ + public: + typedef uint8_t (*i2c_com_fptr_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len); + + enum KeyState { Init = 0, Idle, Held, Busy }; + + KeyState state; + int8_t last_key; + int8_t next_key; + bool should_backspace; + uint32_t last_tap; + uint8_t char_idx; + int32_t tap_interval; + bool backlight_on; + + String queue; + + TCA8418Keyboard(); + + void begin(uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS, TwoWire *wire = &Wire); + void begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS); + + void reset(void); + // Configure the size of the keypad. + // All other rows and columns are set as inputs. + bool matrix(uint8_t rows, uint8_t columns); + + // Flush all events in the FIFO buffer + GPIO events. + uint8_t flush(void); + + // Key events available in the internal FIFO buffer. + uint8_t keyCount(void) const; + + void trigger(void); + void pressed(uint8_t key); + void released(void); + bool hasEvent(void); + char dequeueEvent(void); + void queueEvent(char); + + uint8_t digitalRead(uint8_t pinnum) const; + bool digitalWrite(uint8_t pinnum, uint8_t level); + bool pinMode(uint8_t pinnum, uint8_t mode); + bool pinIRQMode(uint8_t pinnum, uint8_t mode); // MODE FALLING or RISING + + // enable / disable interrupts for matrix and GPI pins + void enableInterrupts(); + void disableInterrupts(); + + // ignore key events when FIFO buffer is full or not. + void enableMatrixOverflow(); + void disableMatrixOverflow(); + + // debounce keys. + void enableDebounce(); + void disableDebounce(); + + void setBacklight(bool on); + + uint8_t readRegister(uint8_t reg) const; + void writeRegister(uint8_t reg, uint8_t value); + + private: + TwoWire *m_wire; + uint8_t m_addr; + i2c_com_fptr_t readCallback; + i2c_com_fptr_t writeCallback; +}; diff --git a/src/input/cardKbI2cImpl.cpp b/src/input/cardKbI2cImpl.cpp index eb9b07d6e..21ecf381a 100644 --- a/src/input/cardKbI2cImpl.cpp +++ b/src/input/cardKbI2cImpl.cpp @@ -12,8 +12,8 @@ void CardKbI2cImpl::init() #if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(I2C_NO_RESCAN) if (cardkb_found.address == 0x00) { LOG_DEBUG("Rescan for I2C keyboard"); - uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR, MPR121_KB_ADDR}; - uint8_t i2caddr_asize = 4; + uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR, MPR121_KB_ADDR, XPOWERS_AXP192_AXP2101_ADDRESS}; + uint8_t i2caddr_asize = 5; auto i2cScanner = std::unique_ptr(new ScanI2CTwoWire()); #if WIRE_INTERFACES_COUNT == 2 @@ -43,6 +43,10 @@ void CardKbI2cImpl::init() // assign an arbitrary value to distinguish from other models kb_model = 0x37; break; + case ScanI2C::DeviceType::TCA8418KB: + // assign an arbitrary value to distinguish from other models + kb_model = 0x84; + break; default: // use this as default since it's also just zero LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00", kb_info.type); diff --git a/src/input/kbI2cBase.cpp b/src/input/kbI2cBase.cpp index 9b1a27745..70e9e4365 100644 --- a/src/input/kbI2cBase.cpp +++ b/src/input/kbI2cBase.cpp @@ -43,6 +43,9 @@ int32_t KbI2cBase::runOnce() if (cardkb_found.address == MPR121_KB_ADDR) { MPRkeyboard.begin(MPR121_KB_ADDR, &Wire1); } + if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) { + TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire1); + } break; #endif case ScanI2C::WIRE: @@ -55,6 +58,9 @@ int32_t KbI2cBase::runOnce() if (cardkb_found.address == MPR121_KB_ADDR) { MPRkeyboard.begin(MPR121_KB_ADDR, &Wire); } + if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) { + TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire); + } break; case ScanI2C::NO_I2C: default: @@ -226,6 +232,68 @@ int32_t KbI2cBase::runOnce() } break; } + case 0x84: { // Adafruit TCA8418 + TCAKeyboard.trigger(); + InputEvent e; + while (TCAKeyboard.hasEvent()) { + char nextEvent = TCAKeyboard.dequeueEvent(); + e.inputEvent = ANYKEY; + e.kbchar = 0x00; + e.source = this->_originName; + switch (nextEvent) { + case _TCA8418_NONE: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE; + e.kbchar = 0x00; + break; + case _TCA8418_REBOOT: + e.inputEvent = ANYKEY; + e.kbchar = INPUT_BROKER_MSG_REBOOT; + break; + case _TCA8418_LEFT: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT; + e.kbchar = 0x00; + break; + case _TCA8418_UP: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP; + e.kbchar = 0x00; + break; + case _TCA8418_DOWN: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN; + e.kbchar = 0x00; + break; + case _TCA8418_RIGHT: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT; + e.kbchar = 0x00; + break; + case _TCA8418_BSP: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK; + e.kbchar = 0x08; + break; + case _TCA8418_SELECT: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT; + e.kbchar = 0x0d; + break; + case _TCA8418_ESC: + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL; + e.kbchar = 0x1b; + break; + default: + if (nextEvent > 127) { + e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE; + e.kbchar = 0x00; + break; + } + e.inputEvent = ANYKEY; + e.kbchar = nextEvent; + break; + } + if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) { + LOG_DEBUG("TCA8418 Notifying: %i Char: %c", e.inputEvent, e.kbchar); + this->notifyObservers(&e); + } + } + break; + } case 0x02: { // RAK14004 uint8_t rDataBuf[8] = {0}; diff --git a/src/input/kbI2cBase.h b/src/input/kbI2cBase.h index dc2414fc0..8193433fe 100644 --- a/src/input/kbI2cBase.h +++ b/src/input/kbI2cBase.h @@ -3,6 +3,7 @@ #include "BBQ10Keyboard.h" #include "InputBroker.h" #include "MPR121Keyboard.h" +#include "TCA8418Keyboard.h" #include "Wire.h" #include "concurrency/OSThread.h" @@ -21,5 +22,6 @@ class KbI2cBase : public Observable, public concurrency::OST BBQ10Keyboard Q10keyboard; MPR121Keyboard MPRkeyboard; + TCA8418Keyboard TCAKeyboard; bool is_sym = false; }; \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 4b098b3f3..fd65830ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -587,6 +587,10 @@ void setup() // assign an arbitrary value to distinguish from other models kb_model = 0x37; break; + case ScanI2C::DeviceType::TCA8418KB: + // assign an arbitrary value to distinguish from other models + kb_model = 0x84; + break; default: // use this as default since it's also just zero LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00", kb_info.type); From 4dfba503044d7d77bdd40f151aa95e6df80cb8bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Apr 2025 20:23:44 -0500 Subject: [PATCH 030/100] [create-pull-request] automated change (#6490) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> --- protobufs | 2 +- src/mesh/generated/meshtastic/mesh.pb.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/protobufs b/protobufs index 484d002a5..13a3e5dce 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 484d002a52bc20fa9f91ebf1b216d585c5f93a1b +Subproject commit 13a3e5dcee25a2d2d4f1fbaba4c091c66d698ca5 diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index defaaad28..191f9e121 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -237,6 +237,8 @@ typedef enum _meshtastic_HardwareModel { meshtastic_HardwareModel_T_ETH_ELITE = 91, /* Heltec HRI-3621 industrial probe */ meshtastic_HardwareModel_HELTEC_SENSOR_HUB = 92, + /* Reserved Fried Chicken ID for future use */ + meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN = 93, /* ------------------------------------------------------------------------------------------------------------------------------------------ Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. ------------------------------------------------------------------------------------------------------------------------------------------ */ From 01102754945ac2bc8d52062fcb2b4a446ea35b35 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 4 Apr 2025 04:59:31 -0500 Subject: [PATCH 031/100] Revert "Try-fix ESP32 wifi disconnects (#6363)" (#6493) This reverts commit a902776e578bc2574c95eff8c13402e8cb5f5fbd. --- src/mesh/wifi/WiFiAPClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp index e050c2057..4d0b74f7c 100644 --- a/src/mesh/wifi/WiFiAPClient.cpp +++ b/src/mesh/wifi/WiFiAPClient.cpp @@ -163,7 +163,7 @@ static int32_t reconnectWiFi() delay(5000); if (!WiFi.isConnected()) { -#ifdef ARCH_ESP32 +#ifdef CONFIG_IDF_TARGET_ESP32C3 WiFi.mode(WIFI_MODE_NULL); WiFi.useStaticBuffers(true); WiFi.mode(WIFI_STA); From 25237a15ff68d482c16369b4b802a2931b733ab2 Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Fri, 4 Apr 2025 23:53:54 +1300 Subject: [PATCH 032/100] feat: menu entry to send adhoc-ping (#6492) --- .../InkHUD/Applets/System/Menu/MenuAction.h | 3 +-- .../InkHUD/Applets/System/Menu/MenuApplet.cpp | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h index 4f8205647..f162aa385 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h @@ -18,8 +18,7 @@ namespace NicheGraphics::InkHUD enum MenuAction { NO_ACTION, - SEND_NODEINFO, - SEND_POSITION, + SEND_PING, SHUTDOWN, NEXT_TILE, TOGGLE_BACKLIGHT, diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp index f59579230..5ca9692c8 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp @@ -4,6 +4,7 @@ #include "RTC.h" +#include "MeshService.h" #include "airtime.h" #include "main.h" #include "power.h" @@ -144,6 +145,14 @@ void InkHUD::MenuApplet::execute(MenuItem item) inkhud->nextTile(); break; + case SEND_PING: + service->refreshLocalMeshNode(); + service->trySendPosition(NODENUM_BROADCAST, true); + + // Force the next refresh to use FULL, to protect the display, as some users will probably spam this button + inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FULL); + break; + case ROTATE: inkhud->rotate(); break; @@ -242,7 +251,7 @@ void InkHUD::MenuApplet::showPage(MenuPage page) if (settings->optionalMenuItems.nextTile && settings->userTiles.count > 1) items.push_back(MenuItem("Next Tile", MenuAction::NEXT_TILE, MenuPage::ROOT)); // Only if multiple applets shown - // items.push_back(MenuItem("Send", MenuPage::SEND)); // TODO + items.push_back(MenuItem("Send", MenuPage::SEND)); items.push_back(MenuItem("Options", MenuPage::OPTIONS)); // items.push_back(MenuItem("Display Off", MenuPage::EXIT)); // TODO items.push_back(MenuItem("Save & Shut Down", MenuAction::SHUTDOWN)); @@ -250,9 +259,8 @@ void InkHUD::MenuApplet::showPage(MenuPage page) break; case SEND: - items.push_back(MenuItem("Send Message", MenuPage::EXIT)); - items.push_back(MenuItem("Send NodeInfo", MenuAction::SEND_NODEINFO)); - items.push_back(MenuItem("Send Position", MenuAction::SEND_POSITION)); + items.push_back(MenuItem("Ping", MenuAction::SEND_PING, MenuPage::EXIT)); + // Todo: canned messages items.push_back(MenuItem("Exit", MenuPage::EXIT)); break; @@ -389,11 +397,14 @@ void InkHUD::MenuApplet::onRender() // Center-line for the text int16_t center = itemT + (itemH / 2); + // Box, if currently selected if (cursorShown && i == cursor) drawRect(itemL, itemT, itemW, itemH, BLACK); + + // Item's text printAt(itemL + X(padding), center, item.label, LEFT, MIDDLE); - // Testing only: circle instead of check box + // Checkbox, if relevant if (item.checkState) { const uint16_t cbWH = fontSmall.lineHeight(); // Checkbox: width / height const int16_t cbL = itemR - X(padding) - cbWH; // Checkbox: left From 1b33189fe62d57b067b98facd84656531903457b Mon Sep 17 00:00:00 2001 From: Nasimovy Date: Fri, 4 Apr 2025 13:35:15 +0000 Subject: [PATCH 033/100] remove duplicate HAS_LP5562 introduced by #6422 (#6494) --- src/detect/ScanI2CTwoWire.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp index 230271b94..9781cbf56 100644 --- a/src/detect/ScanI2CTwoWire.cpp +++ b/src/detect/ScanI2CTwoWire.cpp @@ -227,9 +227,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize) type = PMU_AXP192_AXP2101; } break; -#ifdef HAS_LP5562 - SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address); -#endif case BME_ADDR: case BME_ADDR_ALTERNATE: registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xD0), 1); // GET_ID From 56eb0c08b288b5b549399a5f441f07c51bc8d459 Mon Sep 17 00:00:00 2001 From: Chris LaFlash Date: Sat, 5 Apr 2025 20:49:01 -0700 Subject: [PATCH 034/100] Add support for Quectel-L96, a MT3333 module (#6498) --- src/gps/GPS.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 41a2ff980..a2e7ebbc7 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -1206,7 +1206,8 @@ GnssModel_t GPS::probe(int serialSpeed) delay(20); std::vector mtk = {{"L76B", "Quectel-L76B", GNSS_MODEL_MTK_L76B}, {"PA1616S", "1616S", GNSS_MODEL_MTK_PA1616S}, - {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B}}; + {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B}, + {"L96", "Quectel-L96", GNSS_MODEL_MTK_L76B}}; PROBE_FAMILY("MTK Family", "$PMTK605*31", mtk, 500); uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00}; From 2125c039745aa06248b2e76819303a9c99c4de63 Mon Sep 17 00:00:00 2001 From: Nasimovy Date: Mon, 7 Apr 2025 01:27:46 +0000 Subject: [PATCH 035/100] Fix for PSRAM detection on ESP32-S3R8 and t-beam (#6504) * remove duplicate HAS_LP5562 introduced by #6422 * T190 PSRAM fix * all the boards with a ESP32-S3R8 * T-beam V1.1 PSRAM --- boards/heltec_vision_master_e213.json | 4 +++- boards/heltec_vision_master_e290.json | 4 +++- boards/heltec_vision_master_t190.json | 4 +++- boards/seeed-sensecap-indicator.json | 1 + boards/seeed-xiao-s3.json | 1 + boards/t-watch-s3.json | 1 + variants/tbeam/platformio.ini | 2 ++ 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/boards/heltec_vision_master_e213.json b/boards/heltec_vision_master_e213.json index bf5fe15ad..152515cf3 100644 --- a/boards/heltec_vision_master_e213.json +++ b/boards/heltec_vision_master_e213.json @@ -2,7 +2,8 @@ "build": { "arduino": { "ldscript": "esp32s3_out.ld", - "partitions": "default_8MB.csv" + "partitions": "default_8MB.csv", + "memory_type": "qio_opi" }, "core": "esp32", "extra_flags": [ @@ -15,6 +16,7 @@ "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", + "psram_type": "opi", "hwids": [ ["0x303A", "0x1001"], ["0x303A", "0x0002"] diff --git a/boards/heltec_vision_master_e290.json b/boards/heltec_vision_master_e290.json index 70f7d5f02..b7cbac878 100644 --- a/boards/heltec_vision_master_e290.json +++ b/boards/heltec_vision_master_e290.json @@ -2,7 +2,8 @@ "build": { "arduino": { "ldscript": "esp32s3_out.ld", - "partitions": "default_8MB.csv" + "partitions": "default_8MB.csv", + "memory_type": "qio_opi" }, "core": "esp32", "extra_flags": [ @@ -15,6 +16,7 @@ "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", + "psram_type": "opi", "hwids": [ ["0x303A", "0x1001"], ["0x303A", "0x0002"] diff --git a/boards/heltec_vision_master_t190.json b/boards/heltec_vision_master_t190.json index 341e70218..440f76ad0 100644 --- a/boards/heltec_vision_master_t190.json +++ b/boards/heltec_vision_master_t190.json @@ -2,7 +2,8 @@ "build": { "arduino": { "ldscript": "esp32s3_out.ld", - "partitions": "default_8MB.csv" + "partitions": "default_8MB.csv", + "memory_type": "qio_opi" }, "core": "esp32", "extra_flags": [ @@ -15,6 +16,7 @@ "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", + "psram_type": "opi", "hwids": [ ["0x303A", "0x1001"], ["0x303A", "0x0002"] diff --git a/boards/seeed-sensecap-indicator.json b/boards/seeed-sensecap-indicator.json index 0a02fc882..03bff35b5 100644 --- a/boards/seeed-sensecap-indicator.json +++ b/boards/seeed-sensecap-indicator.json @@ -18,6 +18,7 @@ "f_boot": "120000000L", "boot": "qio", "flash_mode": "qio", + "psram_type": "opi", "hwids": [["0x1A86", "0x7523"]], "mcu": "esp32s3", "variant": "esp32s3" diff --git a/boards/seeed-xiao-s3.json b/boards/seeed-xiao-s3.json index 0b7b432a0..6981085dd 100644 --- a/boards/seeed-xiao-s3.json +++ b/boards/seeed-xiao-s3.json @@ -15,6 +15,7 @@ "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", + "psram_type": "opi", "hwids": [["0x2886", "0x0059"]], "mcu": "esp32s3", "variant": "seeed-xiao-s3" diff --git a/boards/t-watch-s3.json b/boards/t-watch-s3.json index 5d4afd322..51bb7cf4b 100644 --- a/boards/t-watch-s3.json +++ b/boards/t-watch-s3.json @@ -16,6 +16,7 @@ "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", + "psram_type": "opi", "hwids": [ ["0x303A", "0x1001"], ["0x303A", "0x0002"] diff --git a/variants/tbeam/platformio.ini b/variants/tbeam/platformio.ini index 85e66c2dd..9049836a3 100644 --- a/variants/tbeam/platformio.ini +++ b/variants/tbeam/platformio.ini @@ -8,4 +8,6 @@ lib_deps = build_flags = ${esp32_base.build_flags} -D TBEAM_V10 -I variants/tbeam -DGPS_POWER_TOGGLE ; comment this line to disable double press function on the user button to turn off gps entirely. + -DBOARD_HAS_PSRAM + -mfix-esp32-psram-cache-issue upload_speed = 921600 \ No newline at end of file From 5a9d70b445930dec9e7175831e79c66d2f203f84 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 10:39:45 +0200 Subject: [PATCH 036/100] Upgrade trunk (#6509) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index aeb0a1b43..608045e45 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -9,14 +9,14 @@ plugins: lint: enabled: - prettier@3.5.3 - - trufflehog@3.88.20 + - trufflehog@3.88.22 - yamllint@1.37.0 - bandit@1.8.3 - checkov@3.2.396 - terrascan@1.19.9 - trivy@0.61.0 - taplo@0.9.3 - - ruff@0.11.2 + - ruff@0.11.3 - isort@6.0.1 - markdownlint@0.44.0 - oxipng@9.1.4 From 860e8eca5aab7a4586891b3218420624f7b30c31 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 11:51:05 +0200 Subject: [PATCH 037/100] [create-pull-request] automated change (#6511) Co-authored-by: caveman99 <25002+caveman99@users.noreply.github.com> --- protobufs | 2 +- src/mesh/generated/meshtastic/config.pb.h | 14 ++++++++------ src/mesh/generated/meshtastic/telemetry.pb.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/protobufs b/protobufs index 13a3e5dce..5a5ab103d 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 13a3e5dcee25a2d2d4f1fbaba4c091c66d698ca5 +Subproject commit 5a5ab103d2f6aa071fca29417475681a2cec5dcf diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h index 848f8df86..edcd7b41c 100644 --- a/src/mesh/generated/meshtastic/config.pb.h +++ b/src/mesh/generated/meshtastic/config.pb.h @@ -180,14 +180,16 @@ typedef enum _meshtastic_Config_DisplayConfig_DisplayUnits { /* Override OLED outo detect with this if it fails. */ typedef enum _meshtastic_Config_DisplayConfig_OledType { - /* Default / Auto */ + /* Default / Autodetect */ meshtastic_Config_DisplayConfig_OledType_OLED_AUTO = 0, - /* Default / Auto */ + /* Default / Autodetect */ meshtastic_Config_DisplayConfig_OledType_OLED_SSD1306 = 1, - /* Default / Auto */ + /* Default / Autodetect */ meshtastic_Config_DisplayConfig_OledType_OLED_SH1106 = 2, /* Can not be auto detected but set by proto. Used for 128x128 screens */ - meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 = 3 + meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 = 3, + /* Can not be auto detected but set by proto. Used for 128x64 screens */ + meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64 = 4 } meshtastic_Config_DisplayConfig_OledType; typedef enum _meshtastic_Config_DisplayConfig_DisplayMode { @@ -639,8 +641,8 @@ extern "C" { #define _meshtastic_Config_DisplayConfig_DisplayUnits_ARRAYSIZE ((meshtastic_Config_DisplayConfig_DisplayUnits)(meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL+1)) #define _meshtastic_Config_DisplayConfig_OledType_MIN meshtastic_Config_DisplayConfig_OledType_OLED_AUTO -#define _meshtastic_Config_DisplayConfig_OledType_MAX meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 -#define _meshtastic_Config_DisplayConfig_OledType_ARRAYSIZE ((meshtastic_Config_DisplayConfig_OledType)(meshtastic_Config_DisplayConfig_OledType_OLED_SH1107+1)) +#define _meshtastic_Config_DisplayConfig_OledType_MAX meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64 +#define _meshtastic_Config_DisplayConfig_OledType_ARRAYSIZE ((meshtastic_Config_DisplayConfig_OledType)(meshtastic_Config_DisplayConfig_OledType_OLED_SH1107_128_64+1)) #define _meshtastic_Config_DisplayConfig_DisplayMode_MIN meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT #define _meshtastic_Config_DisplayConfig_DisplayMode_MAX meshtastic_Config_DisplayConfig_DisplayMode_COLOR diff --git a/src/mesh/generated/meshtastic/telemetry.pb.h b/src/mesh/generated/meshtastic/telemetry.pb.h index 69cdd33fe..dcc511ea6 100644 --- a/src/mesh/generated/meshtastic/telemetry.pb.h +++ b/src/mesh/generated/meshtastic/telemetry.pb.h @@ -242,7 +242,7 @@ typedef struct _meshtastic_AirQualityMetrics { /* 10.0um Particle Count */ bool has_particles_100um; uint32_t particles_100um; - /* 10.0um Particle Count */ + /* CO2 concentration in ppm */ bool has_co2; uint32_t co2; } meshtastic_AirQualityMetrics; From 606abfc1165711f57b12ee0a022660082ec18f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 7 Apr 2025 12:46:22 +0200 Subject: [PATCH 038/100] Fix several features of M1 and M2 (i know what the 7 is now ...) (#6507) * Fix several features of M1 and M2 (i know what the 7 is now ...) * 'THe' should be 'The'. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * remove floating definition --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ben Meadors --- src/ButtonThread.cpp | 138 ++++++++++++------------ src/ButtonThread.h | 13 +-- src/Power.cpp | 29 +++-- src/gps/GPS.cpp | 46 ++++++++ src/graphics/Screen.cpp | 3 + src/main.cpp | 70 ++++++++++-- src/mesh/NodeDB.cpp | 9 ++ src/platform/esp32/main-esp32.cpp | 5 +- src/platform/nrf52/main-nrf52.cpp | 6 +- src/power.h | 5 - variants/ELECROW-ThinkNode-M1/variant.h | 10 +- variants/ELECROW-ThinkNode-M2/variant.h | 11 +- 12 files changed, 221 insertions(+), 124 deletions(-) diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp index 2363f804c..375029c99 100644 --- a/src/ButtonThread.cpp +++ b/src/ButtonThread.cpp @@ -116,46 +116,55 @@ ButtonThread::ButtonThread() : OSThread("Button") #endif } +void ButtonThread::switchPage() +{ +#ifdef BUTTON_PIN +#if !defined(USERPREFS_BUTTON_PIN) + if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) != + moduleConfig.canned_message.inputbroker_pin_press) || + !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) || + !moduleConfig.canned_message.enabled) { + powerFSM.trigger(EVENT_PRESS); + } +#endif +#if defined(USERPREFS_BUTTON_PIN) + if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) != + moduleConfig.canned_message.inputbroker_pin_press) || + !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) || + !moduleConfig.canned_message.enabled) { + powerFSM.trigger(EVENT_PRESS); + } +#endif + +#endif +#if defined(ARCH_PORTDUINO) + if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) && + (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) || + !moduleConfig.canned_message.enabled) { + powerFSM.trigger(EVENT_PRESS); + } +#endif +} + +void ButtonThread::sendAdHocPosition() +{ + service->refreshLocalMeshNode(); + auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true); + if (screen) { + if (sentPosition) + screen->print("Sent ad-hoc position\n"); + else + screen->print("Sent ad-hoc nodeinfo\n"); + screen->forceDisplay(true); // Force a new UI frame, then force an EInk update + } +} + int32_t ButtonThread::runOnce() { // If the button is pressed we suppress CPU sleep until release canSleep = true; // Assume we should not keep the board awake #if defined(BUTTON_PIN) || defined(USERPREFS_BUTTON_PIN) - // #if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2) - // buzzer_updata(); - // if (buttonPressed) { - // buttonPressed = false; // 清除标志 - // LOG_INFO("PIN_BUTTON2 pressed!"); // 串口打印信息 - // // off_currentTime = millis(); - // while (digitalRead(PIN_BUTTON2) == HIGH) { - // if (cont < 40) { - // // unsigned long currentTime = millis(); // 获取当前时间 - // // if (currentTime - off_currentTime >= 1000) { - // cont++; - // // off_currentTime = currentTime; - // // } - // delay(100); - // } else { - - // currentState = OFF; - // isBuzzing = false; - // cont = 0; - // BEEP_STATE = false; - // analogWrite(M2_buzzer, 0); - // pinMode(M2_buzzer, INPUT); - // screen->setOn(false); - // cont = 0; - // LOG_INFO("GGGGGGGGGGGGGGGGGGGGGGGGG"); - // pinMode(1, OUTPUT); - // digitalWrite(1, LOW); - // pinMode(6, OUTPUT); - // digitalWrite(6, LOW); - // } - // } - // } - - // #endif userButton.tick(); canSleep &= userButton.isIdle(); #elif defined(ARCH_PORTDUINO) @@ -180,32 +189,27 @@ int32_t ButtonThread::runOnce() // If a nag notification is running, stop it and prevent other actions if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) { externalNotificationModule->stopNow(); - return 50; - } -#ifdef BUTTON_PIN -#if !defined(USERPREFS_BUTTON_PIN) - if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) != -#endif -#if defined(USERPREFS_BUTTON_PIN) - if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) != -#endif - moduleConfig.canned_message.inputbroker_pin_press) || - !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) || - !moduleConfig.canned_message.enabled) { - powerFSM.trigger(EVENT_PRESS); - } -#endif -#if defined(ARCH_PORTDUINO) - if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) && - (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) || - !moduleConfig.canned_message.enabled) { - powerFSM.trigger(EVENT_PRESS); + break; } +#ifdef ELECROW_ThinkNode_M1 + sendAdHocPosition(); + break; #endif + switchPage(); break; } case BUTTON_EVENT_PRESSED_SCREEN: { + LOG_BUTTON("AltPress!"); +#ifdef ELECROW_ThinkNode_M1 + // If a nag notification is running, stop it and prevent other actions + if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) { + externalNotificationModule->stopNow(); + break; + } + switchPage(); + break; +#endif // turn screen on or off screen_flag = !screen_flag; if (screen) @@ -215,22 +219,18 @@ int32_t ButtonThread::runOnce() case BUTTON_EVENT_DOUBLE_PRESSED: { LOG_BUTTON("Double press!"); - service->refreshLocalMeshNode(); - auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true); - if (screen) { - if (sentPosition) - screen->print("Sent ad-hoc position\n"); - else - screen->print("Sent ad-hoc nodeinfo\n"); - screen->forceDisplay(true); // Force a new UI frame, then force an EInk update - } +#ifdef ELECROW_ThinkNode_M1 + digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW); + break; +#endif + sendAdHocPosition(); break; } case BUTTON_EVENT_MULTI_PRESSED: { LOG_BUTTON("Mulitipress! %hux", multipressClickCount); switch (multipressClickCount) { -#if HAS_GPS +#if HAS_GPS && !defined(ELECROW_ThinkNode_M1) // 3 clicks: toggle GPS case 3: if (!config.device.disable_triple_click && (gps != nullptr)) { @@ -239,17 +239,17 @@ int32_t ButtonThread::runOnce() screen->forceDisplay(true); // Force a new UI frame, then force an EInk update } break; -#elif defined(ELECROW_ThinkNode_M2) +#elif defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2) case 3: LOG_INFO("3 clicks: toggle buzzer"); buzzer_flag = !buzzer_flag; - if (buzzer_flag) { - playBeep(); - } + if (!buzzer_flag) + noTone(PIN_BUZZER); break; + #endif -#if defined(USE_EINK) && defined(PIN_EINK_EN) // i.e. T-Echo +#if defined(USE_EINK) && defined(PIN_EINK_EN) && !defined(ELECROW_ThinkNode_M1) // i.e. T-Echo // 4 clicks: toggle backlight case 4: digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW); diff --git a/src/ButtonThread.h b/src/ButtonThread.h index a8f1f77c3..3af700dd0 100644 --- a/src/ButtonThread.h +++ b/src/ButtonThread.h @@ -37,6 +37,9 @@ class ButtonThread : public concurrency::OSThread void attachButtonInterrupts(); void detachButtonInterrupts(); void storeClickCount(); + bool isBuzzing() { return buzzer_flag; } + void setScreenFlag(bool flag) { screen_flag = flag; } + bool getScreenFlag() { return screen_flag; } // Disconnect and reconnect interrupts for light sleep #ifdef ARCH_ESP32 @@ -72,14 +75,12 @@ class ButtonThread : public concurrency::OSThread static void wakeOnIrq(int irq, int mode); + static void sendAdHocPosition(); + static void switchPage(); + // IRQ callbacks static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; } - static void userButtonPressedScreen() - { - if (millis() > c_holdOffTime) { - btnEvent = BUTTON_EVENT_PRESSED_SCREEN; - } - } + static void userButtonPressedScreen() { btnEvent = BUTTON_EVENT_PRESSED_SCREEN; } static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; } static void userButtonMultiPressed(void *callerThread); // Retrieve click count from non-static Onebutton while still valid static void userButtonPressedLongStart(); diff --git a/src/Power.cpp b/src/Power.cpp index 0dec0fc21..f11f8eac3 100644 --- a/src/Power.cpp +++ b/src/Power.cpp @@ -380,6 +380,20 @@ class AnalogBatteryLevel : public HasBatteryLevel // if we have a integrated device with a battery, we can assume that the battery is always connected #ifdef BATTERY_IMMUTABLE virtual bool isBatteryConnect() override { return true; } +#elif defined(ADC_V) + virtual bool isBatteryConnect() override + { + int lastReading = digitalRead(ADC_V); + // 判断值是否变化 + for (int i = 2; i < 500; i++) { + int reading = digitalRead(ADC_V); + if (reading != lastReading) { + return false; // 有变化，USB供电, 没接电池 + } + } + + return true; + } #else virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; } #endif @@ -533,9 +547,6 @@ Power::Power() : OSThread("Power") { statusHandler = {}; low_voltage_counter = 0; -#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG) - low_voltage_counter_led3 = 0; -#endif #ifdef DEBUG_HEAP lastheap = memGet.getFreeHeap(); #endif @@ -716,9 +727,6 @@ void Power::readPowerStatus() const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isChargingNow, batteryVoltageMv, batteryChargePercent); LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d", powerStatus2.getHasUSB(), powerStatus2.getIsCharging(), powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent()); -#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG) - power_num = powerStatus2.getBatteryVoltageMv(); -#endif newStatus.notifyObservers(&powerStatus2); #ifdef DEBUG_HEAP if (lastheap != memGet.getFreeHeap()) { @@ -766,9 +774,6 @@ void Power::readPowerStatus() if (batteryLevel && powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) { if (batteryLevel->getBattVoltage() < OCV[NUM_OCV_POINTS - 1]) { low_voltage_counter++; -#if defined(ELECROW_ThinkNode_M1) - low_voltage_counter_led3 = low_voltage_counter; -#endif LOG_DEBUG("Low voltage counter: %d/10", low_voltage_counter); if (low_voltage_counter > 10) { #ifdef ARCH_NRF52 @@ -781,13 +786,7 @@ void Power::readPowerStatus() } } else { low_voltage_counter = 0; -#if defined(ELECROW_ThinkNode_M1) - low_voltage_counter_led3 = low_voltage_counter; -#endif } -#ifdef POWER_CFG - low_voltage_counter_led3 = low_voltage_counter; -#endif } } diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index a2e7ebbc7..689f5e204 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -12,6 +12,7 @@ #include "RTC.h" #include "Throttle.h" #include "buzz.h" +#include "concurrency/Periodic.h" #include "meshUtils.h" #include "main.h" // pmu_found @@ -89,6 +90,45 @@ static const char *getGPSPowerStateString(GPSPowerState state) } } +#ifdef PIN_GPS_SWITCH +// If we have a hardware switch, define a periodic watcher outside of the GPS runOnce thread, since this can be sleeping +// idefinitely + +int lastState = LOW; +bool firstrun = true; + +static int32_t gpsSwitch() +{ + if (gps) { + int currentState = digitalRead(PIN_GPS_SWITCH); + + // if the switch is set to zero, disable the GPS Thread + if (firstrun) + if (currentState == LOW) + lastState = HIGH; + + if (currentState != lastState) { + if (currentState == LOW) { + config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED; + if (!firstrun) + playGPSDisableBeep(); + gps->disable(); + } else { + config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED; + if (!firstrun) + playGPSEnableBeep(); + gps->enable(); + } + lastState = currentState; + } + firstrun = false; + } + return 1000; +} + +static concurrency::Periodic *gpsPeriodic; +#endif + static void UBXChecksum(uint8_t *message, size_t length) { uint8_t CK_A = 0, CK_B = 0; @@ -1390,6 +1430,12 @@ GPS *GPS::createGps() pinMode(PIN_GPS_PPS, INPUT); #endif +#ifdef PIN_GPS_SWITCH + // toggle GPS via external GPIO switch + pinMode(PIN_GPS_SWITCH, INPUT); + gpsPeriodic = new concurrency::Periodic("GPSSwitch", gpsSwitch); +#endif + // Currently disabled per issue #525 (TinyGPS++ crash bug) // when fixed upstream, can be un-disabled to enable 3D FixType and PDOP #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index e27495f54..8075dd468 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -30,6 +30,7 @@ along with this program. If not, see . #if !MESHTASTIC_EXCLUDE_GPS #include "GPS.h" #endif +#include "ButtonThread.h" #include "MeshService.h" #include "NodeDB.h" #include "error.h" @@ -1606,6 +1607,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver) if (on != screenOn) { if (on) { LOG_INFO("Turn on screen"); + buttonThread->setScreenFlag(true); powerMon->setState(meshtastic_PowerMon_State_Screen_On); #ifdef T_WATCH_S3 PMU->enablePowerOutput(XPOWERS_ALDO2); @@ -1641,6 +1643,7 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver) setScreensaverFrames(einkScreensaver); #endif LOG_INFO("Turn off screen"); + buttonThread->setScreenFlag(false); #ifdef ELECROW_ThinkNode_M1 if (digitalRead(PIN_EINK_EN) == HIGH) { digitalWrite(PIN_EINK_EN, LOW); diff --git a/src/main.cpp b/src/main.cpp index fd65830ef..a528da8af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -212,6 +212,60 @@ const char *getDeviceName() return name; } +#if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2) +static int32_t ledBlinkCount = 0; + +static int32_t elecrowLedBlinker() +{ + // are we in alert buzzer mode? + if (buttonThread->isBuzzing()) { + + // blink LED three times for 3 seconds, then 3 times for a second, with one second pause + if (ledBlinkCount % 2) { // odd means LED OFF + ledBlink.set(false); + ledBlinkCount++; + if (ledBlinkCount >= 12) + ledBlinkCount = 0; + noTone(PIN_BUZZER); + return 1000; + } else { + if (ledBlinkCount < 6) { + ledBlink.set(true); + tone(PIN_BUZZER, 4000, 3000); + ledBlinkCount++; + return 3000; + } else { + ledBlink.set(true); + tone(PIN_BUZZER, 4000, 1000); + ledBlinkCount++; + return 1000; + } + } + } else { + ledBlinkCount = 0; + if (config.device.led_heartbeat_disabled) + return 1000; + + static bool ledOn; + // when fully charged, remain on! + if (powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() >= 100) { + ledOn = true; + } else { + ledOn ^= 1; + } + ledBlink.set(ledOn); + // when charging, blink 0.5Hz square wave rate to indicate that + if (powerStatus->getIsCharging()) { + return 500; + } + // When almost empty, blink rapidly + if (!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() < 10) { + return 250; + } + } + return 1000; +} +#else static int32_t ledBlinker() { // Still set up the blinking (heartbeat) interval but skip code path below, so LED will blink if @@ -227,6 +281,7 @@ static int32_t ledBlinker() // have a very sparse duty cycle of LED being on, unless charging, then blink 0.5Hz square wave rate to indicate that return powerStatus->getIsCharging() ? 1000 : (ledOn ? 1 : 1000); } +#endif uint32_t timeLastPowered = 0; @@ -263,11 +318,6 @@ void printInfo() void setup() { -#ifdef POWER_CHRG - pinMode(POWER_CHRG, OUTPUT); - digitalWrite(POWER_CHRG, HIGH); -#endif - #if defined(PIN_POWER_EN) pinMode(PIN_POWER_EN, OUTPUT); digitalWrite(PIN_POWER_EN, HIGH); @@ -278,11 +328,6 @@ void setup() digitalWrite(LED_POWER, HIGH); #endif -#ifdef POWER_LED - pinMode(POWER_LED, OUTPUT); - digitalWrite(POWER_LED, HIGH); -#endif - #ifdef USER_LED pinMode(USER_LED, OUTPUT); digitalWrite(USER_LED, LOW); @@ -414,7 +459,12 @@ void setup() OSThread::setup(); +#if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2) + // The ThinkNodes have their own blink logic + ledPeriodic = new Periodic("Blink", elecrowLedBlinker); +#else ledPeriodic = new Periodic("Blink", ledBlinker); +#endif fsInit(); diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 9bb63652a..c89abbe74 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -743,6 +743,15 @@ void NodeDB::installDefaultModuleConfig() moduleConfig.external_notification.output_ms = 100; moduleConfig.external_notification.active = true; #endif +#ifdef ELECROW_ThinkNode_M1 + // Default to Elecrow USER_LED (blue) + moduleConfig.external_notification.enabled = true; + moduleConfig.external_notification.output = USER_LED; + moduleConfig.external_notification.active = true; + moduleConfig.external_notification.alert_message = true; + moduleConfig.external_notification.output_ms = 1000; + moduleConfig.external_notification.nag_timeout = 60; +#endif #ifdef BUTTON_SECONDARY_CANNEDMESSAGES // Use a board's second built-in button as input source for canned messages moduleConfig.canned_message.enabled = true; diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp index ab1e5c922..3c4faac3e 100644 --- a/src/platform/esp32/main-esp32.cpp +++ b/src/platform/esp32/main-esp32.cpp @@ -109,9 +109,8 @@ void esp32Setup() randomSeed(seed); */ -#ifdef POWER_FULL - pinMode(POWER_FULL, INPUT); - pinMode(7, INPUT); +#ifdef ADC_V + pinMode(ADC_V, INPUT); #endif LOG_DEBUG("Total heap: %d", ESP.getHeapSize()); diff --git a/src/platform/nrf52/main-nrf52.cpp b/src/platform/nrf52/main-nrf52.cpp index 53971e95a..9accd2a02 100644 --- a/src/platform/nrf52/main-nrf52.cpp +++ b/src/platform/nrf52/main-nrf52.cpp @@ -235,10 +235,6 @@ void nrf52InitSemiHosting() void nrf52Setup() { -#ifdef USB_CHECK - pinMode(USB_CHECK, INPUT); -#endif - #ifdef ADC_V pinMode(ADC_V, INPUT); #endif @@ -288,7 +284,7 @@ void cpuDeepSleep(uint32_t msecToWake) #endif // This may cause crashes as debug messages continue to flow. Serial.end(); -#ifdef PIN_SERIAL_RX1 +#ifdef PIN_SERIAL1_RX Serial1.end(); #endif setBluetoothEnable(false); diff --git a/src/power.h b/src/power.h index 97944fef7..e9c0deb7c 100644 --- a/src/power.h +++ b/src/power.h @@ -84,11 +84,6 @@ class Power : private concurrency::OSThread void setStatusHandler(meshtastic::PowerStatus *handler) { statusHandler = handler; } const uint16_t OCV[11] = {OCV_ARRAY}; -#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG) - uint8_t low_voltage_counter_led3; - int power_num = 0; -#endif - protected: meshtastic::PowerStatus *statusHandler; diff --git a/variants/ELECROW-ThinkNode-M1/variant.h b/variants/ELECROW-ThinkNode-M1/variant.h index fc2fddbdf..2e91e378d 100644 --- a/variants/ELECROW-ThinkNode-M1/variant.h +++ b/variants/ELECROW-ThinkNode-M1/variant.h @@ -41,16 +41,15 @@ extern "C" { #define NUM_ANALOG_INPUTS (1) #define NUM_ANALOG_OUTPUTS (0) -#define PIN_LED1 -1 #define PIN_LED2 -1 #define PIN_LED3 -1 // LED -#define POWER_LED (32 + 6) // red +#define PIN_LED1 (32 + 6) // red #define LED_POWER (32 + 4) #define USER_LED (0 + 13) // green // USB_CHECK -#define USB_CHECK (32 + 3) +#define EXT_PWR_DETECT (32 + 3) #define ADC_V (0 + 8) #define LED_RED PIN_LED3 @@ -59,7 +58,7 @@ extern "C" { #define LED_BUILTIN LED_BLUE #define LED_CONN PIN_GREEN #define LED_STATE_ON 0 // State when LED is lit // LED灯亮时的状态 -#define M1_buzzer (0 + 6) +#define PIN_BUZZER (0 + 6) /* * Buttons */ @@ -82,6 +81,7 @@ extern "C" { static const uint8_t A0 = PIN_A0; #define ADC_RESOLUTION 14 +#define BATTERY_SENSE_SAMPLES 30 #define PIN_NFC1 (9) #define PIN_NFC2 (10) @@ -159,7 +159,7 @@ External serial flash WP25R1635FZUIL0 #define GPS_THREAD_INTERVAL 50 -#define PIN_GPS_PPS (32 + 1) // GPS开关判断 +#define PIN_GPS_SWITCH (32 + 1) // GPS开关判断 #define PIN_SERIAL1_RX GPS_TX_PIN #define PIN_SERIAL1_TX GPS_RX_PIN diff --git a/variants/ELECROW-ThinkNode-M2/variant.h b/variants/ELECROW-ThinkNode-M2/variant.h index 801d5606f..55f35e498 100644 --- a/variants/ELECROW-ThinkNode-M2/variant.h +++ b/variants/ELECROW-ThinkNode-M2/variant.h @@ -1,14 +1,13 @@ // Status -#define LED_PIN_POWER 1 -#define BIAS_T_ENABLE LED_PIN_POWER -#define BIAS_T_VALUE HIGH +#define LED_PIN 1 #define PIN_BUTTON1 47 // 功能键 #define PIN_BUTTON2 4 // 电源键 -#define POWER_CFG -#define POWER_CHRG 6 -#define POWER_FULL 42 +#define LED_PIN_POWER 6 +#define ADC_V 42 +// USB_CHECK +#define EXT_PWR_DETECT 7 #define PIN_BUZZER 5 From e2933bcb5b92f92569f9b78e75d5e4a001e33088 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Mon, 7 Apr 2025 14:04:31 +0200 Subject: [PATCH 039/100] Update platformio.ini (#6512) --- variants/crowpanel-esp32s3-5-epaper/platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/variants/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/crowpanel-esp32s3-5-epaper/platformio.ini index f1257a979..ebf013f64 100644 --- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini +++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini @@ -11,7 +11,7 @@ board = esp32-s3-devkitc-1 board_level = extra upload_protocol = esptool build_flags = - ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper + ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper -D PRIVATE_HW -DBOARD_HAS_PSRAM -DGPS_POWER_TOGGLE @@ -39,7 +39,7 @@ board = esp32-s3-devkitc-1 board_level = extra upload_protocol = esptool build_flags = - ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper + ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper -D PRIVATE_HW -DBOARD_HAS_PSRAM -DGPS_POWER_TOGGLE @@ -67,7 +67,7 @@ board = esp32-s3-devkitc-1 board_level = extra upload_protocol = esptool build_flags = - ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper + ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper -D PRIVATE_HW -DBOARD_HAS_PSRAM -DGPS_POWER_TOGGLE From a084073cc15b4cb0a05c5f9ca52d6fffd94d4530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 7 Apr 2025 15:35:51 +0200 Subject: [PATCH 040/100] inkhud doesn't have a button thread (#6513) --- src/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index a528da8af..bf4b0c2f2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -218,8 +218,8 @@ static int32_t ledBlinkCount = 0; static int32_t elecrowLedBlinker() { // are we in alert buzzer mode? +#if HAS_BUTTON if (buttonThread->isBuzzing()) { - // blink LED three times for 3 seconds, then 3 times for a second, with one second pause if (ledBlinkCount % 2) { // odd means LED OFF ledBlink.set(false); @@ -242,6 +242,7 @@ static int32_t elecrowLedBlinker() } } } else { +#endif ledBlinkCount = 0; if (config.device.led_heartbeat_disabled) return 1000; @@ -262,7 +263,9 @@ static int32_t elecrowLedBlinker() if (!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() < 10) { return 250; } +#if HAS_BUTTON } +#endif return 1000; } #else From 12d13056188956a1002db2187605c178693c1f03 Mon Sep 17 00:00:00 2001 From: Eric Wolak Date: Mon, 7 Apr 2025 17:34:16 -0700 Subject: [PATCH 041/100] Fix device-specific logic in install script (#6508) * Fix device-specific logic in install script These new for loops to check for variants in a list should be checking for the string to _be empty_, not _non-empty_, if a match is found causing the replacement to fire. * simplify logic per review feedback --------- Co-authored-by: Ben Meadors --- bin/device-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/device-install.sh b/bin/device-install.sh index bacf48f69..796626a9d 100755 --- a/bin/device-install.sh +++ b/bin/device-install.sh @@ -138,7 +138,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then # littlefs* offset for BigDB 8mb and OTA OFFSET. for variant in "${BIGDB_8MB[@]}"; do - if [ -n "${FILENAME##*"$variant"*}" ]; then + if [ -z "${FILENAME##*"$variant"*}" ]; then OFFSET=0x670000 OTA_OFFSET=0x340000 fi @@ -146,7 +146,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then # littlefs* offset for BigDB 16mb and OTA OFFSET. for variant in "${BIGDB_16MB[@]}"; do - if [ -n "${FILENAME##*"$variant"*}" ]; then + if [ -z "${FILENAME##*"$variant"*}" ]; then OFFSET=0xc90000 OTA_OFFSET=0x650000 fi @@ -155,7 +155,7 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then # Account for S3 board's different OTA partition # FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable for variant in "${S3_VARIANTS[@]}"; do - if [ -n "${FILENAME##*"$variant"*}" ]; then + if [ -z "${FILENAME##*"$variant"*}" ]; then MCU="esp32s3" fi done From c0dab4a672c3ea92f3879df2107a4a9f95a34fba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 08:27:58 -0500 Subject: [PATCH 042/100] Upgrade trunk (#6519) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 608045e45..3aa9628fc 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -9,14 +9,14 @@ plugins: lint: enabled: - prettier@3.5.3 - - trufflehog@3.88.22 + - trufflehog@3.88.23 - yamllint@1.37.0 - bandit@1.8.3 - - checkov@3.2.396 + - checkov@3.2.398 - terrascan@1.19.9 - trivy@0.61.0 - taplo@0.9.3 - - ruff@0.11.3 + - ruff@0.11.4 - isort@6.0.1 - markdownlint@0.44.0 - oxipng@9.1.4 From cfc2a96a459318e7fe8a41f9ed9c997ef08b19a7 Mon Sep 17 00:00:00 2001 From: Austin Date: Tue, 8 Apr 2025 10:09:23 -0400 Subject: [PATCH 043/100] Update web, use centrally defined version (#6500) --- .github/actions/build-variant/action.yml | 9 ++++++++- bin/rpkg.macros | 4 ++++ bin/web.version | 1 + debian/ci_pack_sdeb.sh | 5 +++-- meshtasticd.spec.rpkg | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 bin/web.version diff --git a/.github/actions/build-variant/action.yml b/.github/actions/build-variant/action.yml index 2f0883fad..67d002eea 100644 --- a/.github/actions/build-variant/action.yml +++ b/.github/actions/build-variant/action.yml @@ -43,6 +43,13 @@ runs: id: base uses: ./.github/actions/setup-base + - name: Get web ui version + if: inputs.include-web-ui == 'true' + id: webver + shell: bash + run: | + echo "ver=$(cat bin/web.version)" >> $GITHUB_OUTPUT + - name: Pull web ui if: inputs.include-web-ui == 'true' uses: dsaltares/fetch-gh-release-asset@master @@ -51,7 +58,7 @@ runs: file: build.tar target: build.tar token: ${{ inputs.github_token }} - version: tags/v2.5.3 + version: tags/v${{ steps.webver.outputs.ver }} - name: Unpack web ui if: inputs.include-web-ui == 'true' diff --git a/bin/rpkg.macros b/bin/rpkg.macros index 2bbb203de..aa036fc33 100644 --- a/bin/rpkg.macros +++ b/bin/rpkg.macros @@ -2,6 +2,10 @@ function meshtastic_version { meshtastic_version=$(python3 bin/buildinfo.py short) echo -n "$meshtastic_version" } +function web_version { + web_version=$(cat bin/web.version) + echo -n "$web_version" +} function git_commits_num { total_commits=$(git rev-list --all --count) echo -n "$total_commits" diff --git a/bin/web.version b/bin/web.version new file mode 100644 index 000000000..914ec9671 --- /dev/null +++ b/bin/web.version @@ -0,0 +1 @@ +2.6.0 \ No newline at end of file diff --git a/debian/ci_pack_sdeb.sh b/debian/ci_pack_sdeb.sh index a8b2252ae..c0cea0010 100755 --- a/debian/ci_pack_sdeb.sh +++ b/debian/ci_pack_sdeb.sh @@ -10,8 +10,9 @@ platformio pkg install -e native -t platformio/tool-scons@4.40502.0 # Compress `pio` directory to prevent dh_clean from sanitizing it tar -cf pio.tar pio/ rm -rf pio -# Download the latest meshtastic/web release build.tar to `web.tar` -curl -L https://github.com/meshtastic/web/releases/latest/download/build.tar -o web.tar +# Download the meshtastic/web release build.tar to `web.tar` +web_ver=$(cat bin/web.version) +curl -L "https://github.com/meshtastic/web/releases/download/v$web_ver/build.tar" -o web.tar package=$(dpkg-parsechangelog --show-field Source) diff --git a/meshtasticd.spec.rpkg b/meshtasticd.spec.rpkg index a09261056..4d6c9d6f5 100644 --- a/meshtasticd.spec.rpkg +++ b/meshtasticd.spec.rpkg @@ -21,7 +21,7 @@ Summary: Meshtastic daemon for communicating with Meshtastic devices License: GPL-3.0 URL: https://github.com/meshtastic/firmware Source0: {{{ git_dir_pack }}} -Source1: https://github.com/meshtastic/web/releases/latest/download/build.tar +Source1: https://github.com/meshtastic/web/releases/download/v{{{ web_version }}}/build.tar BuildRequires: systemd-rpm-macros BuildRequires: python3-devel From c94dd1e33110e10c5afbd642212c545664ed5927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Tue, 8 Apr 2025 17:46:39 +0200 Subject: [PATCH 044/100] Minor adjustment of blink codes and 'unstick' the M2 button. (#6521) --- src/ButtonThread.cpp | 4 ++++ src/main.cpp | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp index 375029c99..04200a7df 100644 --- a/src/ButtonThread.cpp +++ b/src/ButtonThread.cpp @@ -349,8 +349,12 @@ void ButtonThread::attachButtonInterrupts() #endif #ifdef BUTTON_PIN_ALT +#ifdef ELECROW_ThinkNode_M2 + wakeOnIrq(BUTTON_PIN_ALT, RISING); +#else wakeOnIrq(BUTTON_PIN_ALT, FALLING); #endif +#endif #ifdef BUTTON_PIN_TOUCH wakeOnIrq(BUTTON_PIN_TOUCH, FALLING); diff --git a/src/main.cpp b/src/main.cpp index bf4b0c2f2..bfbd73a43 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -248,8 +248,9 @@ static int32_t elecrowLedBlinker() return 1000; static bool ledOn; - // when fully charged, remain on! - if (powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() >= 100) { + // remain on when fully charged or discharging above 10% + if ((powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() >= 100) || + (!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() >= 10)) { ledOn = true; } else { ledOn ^= 1; @@ -259,8 +260,8 @@ static int32_t elecrowLedBlinker() if (powerStatus->getIsCharging()) { return 500; } - // When almost empty, blink rapidly - if (!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() < 10) { + // Blink rapidly when almost empty or if battery is not connected + if ((!powerStatus->getIsCharging() && powerStatus->getBatteryChargePercent() < 10) || !powerStatus->getHasBattery()) { return 250; } #if HAS_BUTTON From fb2010552faea355f8fbf1491d1c1cc9eaa316d2 Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Tue, 8 Apr 2025 20:50:58 +0200 Subject: [PATCH 045/100] MUI: update commit reference (#6526) new feature: map locations filtering bugfix: boot logo / bt logo --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 377635873..749aa94c7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -94,7 +94,7 @@ lib_deps = [device-ui_base] lib_deps = - https://github.com/meshtastic/device-ui/archive/99171e87a70452395b56cce713a951c1c2964370.zip + https://github.com/meshtastic/device-ui/archive/56ef8db7eb4dda44dc0c1ec5828044debbbc6d33.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) From 1b1d4625aa83c8a76855422db1dfc19846fdb125 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Wed, 9 Apr 2025 04:04:33 +0900 Subject: [PATCH 046/100] chore: update ubx.h (#6522) usefull -> useful --- src/gps/ubx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gps/ubx.h b/src/gps/ubx.h index d674bed51..0fe2f01fb 100644 --- a/src/gps/ubx.h +++ b/src/gps/ubx.h @@ -224,7 +224,7 @@ static const uint8_t _message_GSA[] = { 0x00, // Rate for DDC 0x00, // Rate for UART1 0x00, // Rate for UART2 - 0x00, // Rate for USB usefull for native linux + 0x00, // Rate for USB useful for native linux 0x00, // Rate for SPI 0x00 // Reserved }; @@ -258,7 +258,7 @@ static const uint8_t _message_RMC[] = { 0x00, // Rate for DDC 0x01, // Rate for UART1 0x00, // Rate for UART2 - 0x01, // Rate for USB usefull for native linux + 0x01, // Rate for USB useful for native linux 0x00, // Rate for SPI 0x00 // Reserved }; @@ -269,7 +269,7 @@ static const uint8_t _message_GGA[] = { 0x00, // Rate for DDC 0x01, // Rate for UART1 0x00, // Rate for UART2 - 0x01, // Rate for USB, usefull for native linux + 0x01, // Rate for USB, useful for native linux 0x00, // Rate for SPI 0x00 // Reserved }; From 0d800b7a22be675717f3d5cbff29e66234d88ffb Mon Sep 17 00:00:00 2001 From: Austin Date: Tue, 8 Apr 2025 17:14:39 -0400 Subject: [PATCH 047/100] meshtasticd docker: Support webui (#6482) --- Dockerfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 733a46325..55580c579 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV TZ=Etc/UTC # Install Dependencies ENV PIP_ROOT_USER_ACTION=ignore RUN apt-get update && apt-get install --no-install-recommends -y \ - wget g++ zip git ca-certificates \ + curl wget g++ zip git ca-certificates \ libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \ libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ @@ -27,6 +27,12 @@ COPY . /tmp/firmware RUN bash ./bin/build-native.sh && \ cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd" +# Fetch web assets +RUN curl -L "https://github.com/meshtastic/web/releases/download/v$(cat /tmp/firmware/bin/web.version)/build.tar" -o /tmp/web.tar \ + && mkdir -p /tmp/web \ + && tar -xf /tmp/web.tar -C /tmp/web/ \ + && gzip -dr /tmp/web \ + && rm /tmp/web.tar ##### PRODUCTION BUILD ############# @@ -46,6 +52,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install \ # Fetch compiled binary from the builder COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/ +COPY --from=builder /tmp/web /usr/share/meshtasticd/ # Copy config templates COPY ./bin/config.d /etc/meshtasticd/available.d @@ -54,7 +61,9 @@ VOLUME /var/lib/meshtasticd # Expose Meshtastic TCP API port from the host EXPOSE 4403 +# Expose Meshtastic Web UI port from the host +EXPOSE 443 CMD [ "sh", "-cx", "meshtasticd -d /var/lib/meshtasticd" ] -HEALTHCHECK NONE \ No newline at end of file +HEALTHCHECK NONE From ec298199ee1cdceaad25b743dcbf31e3ddb021ff Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Wed, 9 Apr 2025 18:40:12 +0800 Subject: [PATCH 048/100] remove checkov from trunk config (#6532) We don't have terraform, cloudformation, helm templates ... and this check pushes out new versions very frequently which is annoying with out automation :) --- .trunk/trunk.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 3aa9628fc..903b4c298 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -12,7 +12,6 @@ lint: - trufflehog@3.88.23 - yamllint@1.37.0 - bandit@1.8.3 - - checkov@3.2.398 - terrascan@1.19.9 - trivy@0.61.0 - taplo@0.9.3 From 69f938ea98dca5c103f0898489877afd2c7b2e25 Mon Sep 17 00:00:00 2001 From: GUVWAF <78759985+GUVWAF@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:13:49 +0200 Subject: [PATCH 049/100] Send UDP packet even if it's encrypted (#6524) Co-authored-by: Ben Meadors --- src/mesh/Router.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index b8b7ee610..2cc3007a2 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -283,11 +283,6 @@ ErrorCode Router::send(meshtastic_MeshPacket *p) abortSendAndNak(encodeResult, p); return encodeResult; // FIXME - this isn't a valid ErrorCode } -#if HAS_UDP_MULTICAST - if (udpThread && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) { - udpThread->onSend(const_cast(p)); - } -#endif #if !MESHTASTIC_EXCLUDE_MQTT // Only publish to MQTT if we're the original transmitter of the packet if (moduleConfig.mqtt.enabled && isFromUs(p) && mqtt) { @@ -297,6 +292,12 @@ ErrorCode Router::send(meshtastic_MeshPacket *p) packetPool.release(p_decoded); } +#if HAS_UDP_MULTICAST + if (udpThread && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) { + udpThread->onSend(const_cast(p)); + } +#endif + assert(iface); // This should have been detected already in sendLocal (or we just received a packet from outside) return iface->send(p); } From fc3d9f2a15e201bbedc3a98049abdc8b3bd648da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 9 Apr 2025 14:55:23 +0200 Subject: [PATCH 050/100] fix power pin definition --- variants/ELECROW-ThinkNode-M2/variant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/ELECROW-ThinkNode-M2/variant.h b/variants/ELECROW-ThinkNode-M2/variant.h index 55f35e498..a6bb40f1a 100644 --- a/variants/ELECROW-ThinkNode-M2/variant.h +++ b/variants/ELECROW-ThinkNode-M2/variant.h @@ -4,7 +4,7 @@ #define PIN_BUTTON1 47 // 功能键 #define PIN_BUTTON2 4 // 电源键 -#define LED_PIN_POWER 6 +#define LED_POWER 6 #define ADC_V 42 // USB_CHECK #define EXT_PWR_DETECT 7 From 5256ae90dc4e96a4978cd3fde4a89c56699fb351 Mon Sep 17 00:00:00 2001 From: Andrik45719 Date: Wed, 9 Apr 2025 18:40:38 +0300 Subject: [PATCH 051/100] DIY v1/v1_1 add TCXO_OPTIONAL make it so that the firmware can try both TCXO and XTAL (#6534) * EBYTE_E22 TCXO_OPTIONAL * EBYTE_E22 --------- Co-authored-by: Ben Meadors --- variants/diy/v1/variant.h | 1 + variants/diy/v1_1/variant.h | 1 + 2 files changed, 2 insertions(+) diff --git a/variants/diy/v1/variant.h b/variants/diy/v1/variant.h index 4802dbe89..8a2df3f2b 100644 --- a/variants/diy/v1/variant.h +++ b/variants/diy/v1/variant.h @@ -53,4 +53,5 @@ // Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch // (which is the default for the sx1262interface code) #define SX126X_DIO3_TCXO_VOLTAGE 1.8 +#define TCXO_OPTIONAL // make it so that the firmware can try both TCXO and XTAL #endif diff --git a/variants/diy/v1_1/variant.h b/variants/diy/v1_1/variant.h index 8a006d0d2..1c8110301 100644 --- a/variants/diy/v1_1/variant.h +++ b/variants/diy/v1_1/variant.h @@ -54,4 +54,5 @@ // Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch // (which is the default for the sx1262interface code) #define SX126X_DIO3_TCXO_VOLTAGE 1.8 +#define TCXO_OPTIONAL // make it so that the firmware can try both TCXO and XTAL #endif From 536b6d87c63888e8ee480a3f06d004e4360b4459 Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Thu, 10 Apr 2025 03:41:51 +1200 Subject: [PATCH 052/100] InkHUD support for LilyGo T3S3 E-Paper (#6503) * Purge an incomplete E-Ink driver * Use the deep-sleep mode of SSD16XX E-Ink displays * TwoButton doesn't need to store pin mode * Fix false positive button presses after light sleep * E-Ink driver for DEPG0213BNS800 * InkHUD support for LilyGo T3S3 E-paper --------- Co-authored-by: Ben Meadors --- .../niche/Drivers/EInk/DEPG0154BNS800.cpp | 1 - .../niche/Drivers/EInk/DEPG0154BNS800.h | 34 ----- .../niche/Drivers/EInk/DEPG0213BNS800.cpp | 132 ++++++++++++++++++ .../niche/Drivers/EInk/DEPG0213BNS800.h | 44 ++++++ .../niche/Drivers/EInk/DEPG0290BNS800.cpp | 5 + src/graphics/niche/Drivers/EInk/SSD16XX.cpp | 13 ++ src/graphics/niche/Drivers/EInk/SSD16XX.h | 1 + src/graphics/niche/Inputs/TwoButton.cpp | 7 +- src/graphics/niche/Inputs/TwoButton.h | 3 +- variants/t-echo/nicheGraphics.h | 2 +- variants/tlora_t3s3_epaper/nicheGraphics.h | 102 ++++++++++++++ variants/tlora_t3s3_epaper/platformio.ini | 19 +++ variants/tlora_t3s3_epaper/variant.h | 1 - 13 files changed, 322 insertions(+), 42 deletions(-) delete mode 100644 src/graphics/niche/Drivers/EInk/DEPG0154BNS800.cpp delete mode 100644 src/graphics/niche/Drivers/EInk/DEPG0154BNS800.h create mode 100644 src/graphics/niche/Drivers/EInk/DEPG0213BNS800.cpp create mode 100644 src/graphics/niche/Drivers/EInk/DEPG0213BNS800.h create mode 100644 variants/tlora_t3s3_epaper/nicheGraphics.h diff --git a/src/graphics/niche/Drivers/EInk/DEPG0154BNS800.cpp b/src/graphics/niche/Drivers/EInk/DEPG0154BNS800.cpp deleted file mode 100644 index b8715ed1d..000000000 --- a/src/graphics/niche/Drivers/EInk/DEPG0154BNS800.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "./DEPG0154BNS800.h" \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/DEPG0154BNS800.h b/src/graphics/niche/Drivers/EInk/DEPG0154BNS800.h deleted file mode 100644 index 62d42ef57..000000000 --- a/src/graphics/niche/Drivers/EInk/DEPG0154BNS800.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - -E-Ink display driver - - DEPG0154BNS800 - - Manufacturer: DKE - - Size: 1.54 inch - - Resolution: 152px x 152px - - Flex connector marking: FPC7525 - -*/ - -#pragma once - -#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS -#include "configuration.h" - -#include "./SSD16XX.h" - -namespace NicheGraphics::Drivers -{ -class DEPG0154BNS800 : public SSD16XX -{ - // Display properties - private: - static constexpr uint32_t width = 152; - static constexpr uint32_t height = 152; - static constexpr UpdateTypes supported = (UpdateTypes)(FULL); - - public: - DEPG0154BNS800() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte -}; - -} // namespace NicheGraphics::Drivers -#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/DEPG0213BNS800.cpp b/src/graphics/niche/Drivers/EInk/DEPG0213BNS800.cpp new file mode 100644 index 000000000..2c8df96ed --- /dev/null +++ b/src/graphics/niche/Drivers/EInk/DEPG0213BNS800.cpp @@ -0,0 +1,132 @@ +#include "./DEPG0213BNS800.h" + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +using namespace NicheGraphics::Drivers; + +// Describes the operation performed when a "fast refresh" is performed +// Source: Modified from GxEPD2 (GxEPD2_213_BN) +static const uint8_t LUT_FAST[] = { + // 1 2 3 + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // B2B (Existing black pixels) + 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // B2W (New white pixels) + 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // W2B (New black pixels) + 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // W2W (Existing white pixels) + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // VCOM + + 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, // 1. Any pixels changing W2B or B2W. Two medium taps. + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2. All pixels. One short tap. + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 3. Cooldown + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x00, 0x00, 0x00, // +}; + +// How strongly the pixels are pulled and pushed +void DEPG0213BNS800::configVoltages() +{ + switch (updateType) { + case FAST: + // Reference: display datasheet, GxEPD1 + sendCommand(0x03); // Gate voltage + sendData(0x17); // VGH: 20V + + // Reference: display datasheet, GxEPD1 + sendCommand(0x04); // Source voltage + sendData(0x41); // VSH1: 15V + sendData(0x00); // VSH2: NA + sendData(0x32); // VSL: -15V + + // GxEPD1 sets this at -1.2V, but that seems to be drive the pixels very hard + sendCommand(0x2C); // VCOM voltage + sendData(0x08); // VCOM: -0.2V + break; + + case FULL: + default: + // From OTP memory + break; + } +} + +// Load settings about how the pixels are moved from old state to new state during a refresh +// - manually specified, +// - or with stored values from displays OTP memory +void DEPG0213BNS800::configWaveform() +{ + switch (updateType) { + case FAST: + sendCommand(0x3C); // Border waveform: + sendData(0x80); // VSS + + sendCommand(0x32); // Write LUT register from MCU: + sendData(LUT_FAST, sizeof(LUT_FAST)); // (describes operation for a FAST refresh) + break; + + case FULL: + default: + // From OTP memory + break; + } +} + +// Describes the sequence of events performed by the displays controller IC during a refresh +// Includes "power up", "load settings from memory", "update the pixels", etc +void DEPG0213BNS800::configUpdateSequence() +{ + switch (updateType) { + case FAST: + sendCommand(0x22); // Set "update sequence" + sendData(0xCF); // Differential, use manually loaded waveform + break; + + case FULL: + default: + sendCommand(0x22); // Set "update sequence" + sendData(0xF7); // Non-differential, load waveform from OTP + break; + } +} + +// Once the refresh operation has been started, +// begin periodically polling the display to check for completion, using the normal Meshtastic threading code +// Only used when refresh is "async" +void DEPG0213BNS800::detachFromUpdate() +{ + switch (updateType) { + case FAST: + return beginPolling(50, 500); // At least 500ms, then poll every 50ms + case FULL: + default: + return beginPolling(100, 3500); // At least 3500ms, then poll every 100ms + } +} + +// For this display, we do not need to re-write the new image. +// We're overriding SSD16XX::finalizeUpdate to make this small optimization. +// The display does also work just fine with the generic SSD16XX method, though. +void DEPG0213BNS800::finalizeUpdate() +{ + // Put a copy of the image into the "old memory". + // Used with differential refreshes (e.g. FAST update), to determine which px need to move, and which can remain in place + // We need to keep the "old memory" up to date, because don't know whether next refresh will be FULL or FAST etc. + if (updateType != FULL) { + // writeNewImage(); // Not required for this display + writeOldImage(); + sendCommand(0x7F); // Terminate image write without update + wait(); + } + + // Enter deep-sleep to save a few µA + // Waking from this requires that display's reset pin is broken out + if (pin_rst != 0xFF) + deepSleep(); +} +#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/DEPG0213BNS800.h b/src/graphics/niche/Drivers/EInk/DEPG0213BNS800.h new file mode 100644 index 000000000..e1bb96450 --- /dev/null +++ b/src/graphics/niche/Drivers/EInk/DEPG0213BNS800.h @@ -0,0 +1,44 @@ +/* + +E-Ink display driver + - DEPG0213BNS800 + - Manufacturer: DKE + - Size: 2.13 inch + - Resolution: 122px x 250px + - Flex connector marking: FPC-7528B + + Note: this is from an older generation of DKE panels, which still used Solomon Systech controller ICs. + DKE's website suggests that the latest DEPG0213BN displays may use Fitipower controllers instead. +*/ + +#pragma once + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +#include "configuration.h" + +#include "./SSD16XX.h" + +namespace NicheGraphics::Drivers +{ +class DEPG0213BNS800 : public SSD16XX +{ + // Display properties + private: + static constexpr uint32_t width = 122; + static constexpr uint32_t height = 250; + static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST); + + public: + DEPG0213BNS800() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte + + protected: + void configVoltages() override; + void configWaveform() override; + void configUpdateSequence() override; + void detachFromUpdate() override; + void finalizeUpdate() override; // Only overriden for a slight optimization +}; + +} // namespace NicheGraphics::Drivers +#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/DEPG0290BNS800.cpp b/src/graphics/niche/Drivers/EInk/DEPG0290BNS800.cpp index 5f3a05670..15134d5ad 100644 --- a/src/graphics/niche/Drivers/EInk/DEPG0290BNS800.cpp +++ b/src/graphics/niche/Drivers/EInk/DEPG0290BNS800.cpp @@ -116,5 +116,10 @@ void DEPG0290BNS800::finalizeUpdate() sendCommand(0x7F); // Terminate image write without update wait(); } + + // Enter deep-sleep to save a few µA + // Waking from this requires that display's reset pin is broken out + if (pin_rst != 0xFF) + deepSleep(); } #endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp index 5a5397dbd..a2357a80b 100644 --- a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp +++ b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp @@ -242,5 +242,18 @@ void SSD16XX::finalizeUpdate() sendCommand(0x7F); // Terminate image write without update wait(); } + + // Enter deep-sleep to save a few µA + // Waking from this requires that display's reset pin is broken out + if (pin_rst != 0xFF) + deepSleep(); +} + +// Enter a lower-power state +// May only save a few µA.. +void SSD16XX::deepSleep() +{ + sendCommand(0x10); // Enter deep sleep + sendData(0x01); // Mode 1: preserve image RAM } #endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/SSD16XX.h b/src/graphics/niche/Drivers/EInk/SSD16XX.h index 799a378c0..3f92818ce 100644 --- a/src/graphics/niche/Drivers/EInk/SSD16XX.h +++ b/src/graphics/niche/Drivers/EInk/SSD16XX.h @@ -44,6 +44,7 @@ class SSD16XX : public EInk virtual void detachFromUpdate(); virtual bool isUpdateDone() override; virtual void finalizeUpdate() override; + virtual void deepSleep(); protected: uint8_t bufferOffsetX = 0; // In bytes. Panel x=0 does not always align with controller x=0. Quirky internal wiring? diff --git a/src/graphics/niche/Inputs/TwoButton.cpp b/src/graphics/niche/Inputs/TwoButton.cpp index b270d56cf..1e91d9080 100644 --- a/src/graphics/niche/Inputs/TwoButton.cpp +++ b/src/graphics/niche/Inputs/TwoButton.cpp @@ -98,9 +98,8 @@ void TwoButton::setWiring(uint8_t whichButton, uint8_t pin, bool internalPullup) assert(whichButton < 2); buttons[whichButton].pin = pin; buttons[whichButton].activeLogic = LOW; // Unimplemented - buttons[whichButton].mode = internalPullup ? INPUT_PULLUP : INPUT; - pinMode(buttons[whichButton].pin, buttons[whichButton].mode); + pinMode(buttons[whichButton].pin, internalPullup ? INPUT_PULLUP : INPUT); } void TwoButton::setTiming(uint8_t whichButton, uint32_t debounceMs, uint32_t longpressMs) @@ -299,7 +298,9 @@ int TwoButton::afterLightSleep(esp_sleep_wakeup_cause_t cause) // Manually trigger the button-down ISR // - during light sleep, our ISR is disabled // - if light sleep ends by button press, pretend our own ISR caught it - if (cause == ESP_SLEEP_WAKEUP_GPIO) + // - need to manually confirm by reading pin ourselves, to avoid occasional false positives + // (false positive only when using internal pullup resistors?) + if (cause == ESP_SLEEP_WAKEUP_GPIO && digitalRead(buttons[0].pin) == buttons[0].activeLogic) isrPrimary(); return 0; // Indicates success diff --git a/src/graphics/niche/Inputs/TwoButton.h b/src/graphics/niche/Inputs/TwoButton.h index f1e18dd89..ae66adf96 100644 --- a/src/graphics/niche/Inputs/TwoButton.h +++ b/src/graphics/niche/Inputs/TwoButton.h @@ -35,7 +35,7 @@ class TwoButton : protected concurrency::OSThread static TwoButton *getInstance(); // Create or get the singleton instance void start(); // Start handling button input void stop(); // Stop handling button input (disconnect ISRs for sleep) - void setWiring(uint8_t whichButton, uint8_t pin, bool internalPulldown = false); + void setWiring(uint8_t whichButton, uint8_t pin, bool internalPullup = false); void setTiming(uint8_t whichButton, uint32_t debounceMs, uint32_t longpressMs); void setHandlerDown(uint8_t whichButton, Callback onDown); void setHandlerUp(uint8_t whichButton, Callback onUp); @@ -65,7 +65,6 @@ class TwoButton : protected concurrency::OSThread // Per-button config uint8_t pin = 0xFF; // 0xFF: unset bool activeLogic = LOW; // Active LOW by default. Currently unimplemented. - uint8_t mode = INPUT; // Whether to use internal pull up / pull down resistors uint32_t debounceLength = 50; // Minimum length for shortpress, in ms uint32_t longpressLength = 500; // How long after button down to fire longpress, in ms volatile State state = State::REST; // Internal state diff --git a/variants/t-echo/nicheGraphics.h b/variants/t-echo/nicheGraphics.h index f5dde6b19..5862dcdfb 100644 --- a/variants/t-echo/nicheGraphics.h +++ b/variants/t-echo/nicheGraphics.h @@ -112,7 +112,7 @@ void setupNicheGraphics() // Setup the capacitive touch button // - short: momentary backlight // - long: latch backlight on - buttons->setWiring(TOUCH_BUTTON, PIN_BUTTON_TOUCH, LOW); + buttons->setWiring(TOUCH_BUTTON, PIN_BUTTON_TOUCH); buttons->setTiming(TOUCH_BUTTON, 50, 5000); // 5 seconds before latch - limited by T-Echo's capacitive touch IC buttons->setHandlerDown(TOUCH_BUTTON, [backlight]() { backlight->peek(); diff --git a/variants/tlora_t3s3_epaper/nicheGraphics.h b/variants/tlora_t3s3_epaper/nicheGraphics.h new file mode 100644 index 000000000..55bb9a203 --- /dev/null +++ b/variants/tlora_t3s3_epaper/nicheGraphics.h @@ -0,0 +1,102 @@ +#pragma once + +#include "configuration.h" + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +// InkHUD-specific components +// --------------------------- +#include "graphics/niche/InkHUD/InkHUD.h" + +// Applets +#include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h" +#include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h" +#include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h" +#include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h" +#include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h" +#include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h" + +// #include "graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h" +// #include "graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h" + +// Shared NicheGraphics components +// -------------------------------- +#include "graphics/niche/Drivers/EInk/DEPG0213BNS800.h" +#include "graphics/niche/Inputs/TwoButton.h" + +#include "graphics/niche/Fonts/FreeSans6pt7b.h" +#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h" +#include + +void setupNicheGraphics() +{ + using namespace NicheGraphics; + + // SPI + // ----------------------------- + + // Display is connected to HSPI + SPIClass *hspi = new SPIClass(HSPI); + hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS); + + // E-Ink Driver + // ----------------------------- + + // Use E-Ink driver + Drivers::EInk *driver = new Drivers::DEPG0213BNS800; + driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES); + + // InkHUD + // ---------------------------- + + InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance(); + + // Set the driver + inkhud->setDriver(driver); + + // Set how many FAST updates per FULL update + // Set how unhealthy additional FAST updates beyond this number are + inkhud->setDisplayResilience(15, 1.5); + + // Prepare fonts + InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b); + InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b); + /* + // Font localization demo: Cyrillic + InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic); + InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); + */ + + // Customize default settings + inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle? + inkhud->persistence->settings.rotation = 3; // 270 degrees clockwise + inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users + + // Pick applets + inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown + inkhud->addApplet("DMs", new InkHUD::DMApplet); // Inactive + inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); // Inactive + inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); // Inactive + inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated + inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); // Inactive + inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 + // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet); + // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet); + + // Start running InkHUD + inkhud->begin(); + + // Buttons + // -------------------------- + + Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component + + // Setup the main user button + buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin(), true); + buttons->setHandlerShortPress(0, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); + buttons->setHandlerLongPress(0, []() { InkHUD::InkHUD::getInstance()->longpress(); }); + + buttons->start(); +} + +#endif \ No newline at end of file diff --git a/variants/tlora_t3s3_epaper/platformio.ini b/variants/tlora_t3s3_epaper/platformio.ini index 87351e586..957c37b95 100644 --- a/variants/tlora_t3s3_epaper/platformio.ini +++ b/variants/tlora_t3s3_epaper/platformio.ini @@ -7,6 +7,7 @@ upload_protocol = esptool build_flags = ${esp32_base.build_flags} -D TLORA_T3S3_EPAPER -I variants/tlora_t3s3_epaper -DGPS_POWER_TOGGLE + -DUSE_EINK -DEINK_DISPLAY_MODEL=GxEPD2_213_BN -DEINK_WIDTH=250 -DEINK_HEIGHT=122 @@ -16,3 +17,21 @@ build_flags = lib_deps = ${esp32s3_base.lib_deps} https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip + +[env:tlora-t3s3-epaper-inkhud] +extends = esp32s3_base, inkhud +board = tlora-t3s3-v1 +board_check = true +upload_protocol = esptool +build_src_filter = + ${esp32_base.build_src_filter} + ${inkhud.build_src_filter} +build_flags = + ${esp32s3_base.build_flags} + ${inkhud.build_flags} + -I variants/tlora_t3s3_epaper + -D TLORA_T3S3_EPAPER + -D MAX_THREADS=40 ; Required if used with WiFi +lib_deps = + ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX + ${esp32s3_base.lib_deps} \ No newline at end of file diff --git a/variants/tlora_t3s3_epaper/variant.h b/variants/tlora_t3s3_epaper/variant.h index 732869b20..1ed505420 100644 --- a/variants/tlora_t3s3_epaper/variant.h +++ b/variants/tlora_t3s3_epaper/variant.h @@ -2,7 +2,6 @@ #define SDCARD_USE_SPI1 // Display (E-Ink) -#define USE_EINK #define PIN_EINK_CS 15 #define PIN_EINK_BUSY 48 #define PIN_EINK_DC 16 From 78fa4c5c7057232b9b1f70e4e072310b76cb1ff8 Mon Sep 17 00:00:00 2001 From: Austin Date: Wed, 9 Apr 2025 13:31:40 -0400 Subject: [PATCH 053/100] Setup RenovateBot (#6535) --- .github/dependabot.yml | 29 --------------- .trunk/trunk.yaml | 1 + arch/esp32/esp32.ini | 10 +++++- arch/esp32/esp32c6.ini | 7 +++- arch/esp32/esp32s2.ini | 2 +- arch/esp32/esp32s3.ini | 1 - arch/nrf52/nrf52.ini | 8 +++-- arch/nrf52/nrf52840.ini | 1 + arch/portduino/portduino.ini | 7 +++- arch/rp2xx0/rp2040.ini | 12 +++++-- arch/rp2xx0/rp2350.ini | 14 +++++--- arch/stm32/stm32.ini | 9 +++-- platformio.ini | 49 +++++++++++++++++++++++++ renovate.json | 70 ++++++++++++++++++++++++++++++++++++ 14 files changed, 175 insertions(+), 45 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 renovate.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index b14290be2..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,29 +0,0 @@ -#trunk-ignore-all(yamllint/quoted-strings): required by dependabot syntax check -version: 2 -updates: - - package-ecosystem: docker - directory: /.devcontainer - schedule: - interval: daily - time: "05:00" - timezone: US/Pacific - - package-ecosystem: docker - directory: / - schedule: - interval: daily - time: "05:00" - timezone: US/Pacific - - package-ecosystem: gitsubmodule - directory: / - schedule: - interval: daily - time: "05:00" - timezone: US/Pacific - ignore: - - dependency-name: protobufs - - package-ecosystem: github-actions - directory: /.github/workflows - schedule: - interval: daily - time: "05:00" - timezone: US/Pacific diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 903b4c298..e74c1a362 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -8,6 +8,7 @@ plugins: uri: https://github.com/trunk-io/plugins lint: enabled: + - renovate@39.235.2 - prettier@3.5.3 - trufflehog@3.88.23 - yamllint@1.37.0 diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini index df3778002..3dfefbdb6 100644 --- a/arch/esp32/esp32.ini +++ b/arch/esp32/esp32.ini @@ -2,7 +2,9 @@ [esp32_base] extends = arduino_base custom_esp32_kind = esp32 -platform = platformio/espressif32@6.10.0 +platform = + # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32 + platformio/espressif32@6.10.0 build_src_filter = ${arduino_base.build_src_filter} - - - - - @@ -45,11 +47,17 @@ lib_deps = ${networking_base.lib_deps} ${environmental_base.lib_deps} ${radiolib_base.lib_deps} + # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master https://github.com/meshtastic/esp32_https_server/archive/23665b3adc080a311dcbb586ed5941b5f94d6ea2.zip + # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino h2zero/NimBLE-Arduino@^1.4.3 + # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip + # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib lewisxhe/XPowersLib@^0.2.7 + # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip + # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto rweather/Crypto@^0.4.0 lib_ignore = diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini index dba3bac08..e1cf955e8 100644 --- a/arch/esp32/esp32c6.ini +++ b/arch/esp32/esp32c6.ini @@ -1,6 +1,8 @@ [esp32c6_base] extends = esp32_base -platform = https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip +platform = + # renovate: datasource=git-refs depName=ESP32c6 platform-espressif32 packageName=https://github.com/Jason2866/platform-espressif32 gitBranch=Arduino/IDF5 + https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip build_flags = ${arduino_base.build_flags} -Wall @@ -24,8 +26,11 @@ lib_deps = ${networking_base.lib_deps} ${environmental_base.lib_deps} ${radiolib_base.lib_deps} + # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib lewisxhe/XPowersLib@^0.2.7 + # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip + # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto rweather/Crypto@^0.4.0 build_src_filter = diff --git a/arch/esp32/esp32s2.ini b/arch/esp32/esp32s2.ini index 40fdc461a..0f97408b8 100644 --- a/arch/esp32/esp32s2.ini +++ b/arch/esp32/esp32s2.ini @@ -16,4 +16,4 @@ build_flags = lib_ignore = ${esp32_base.lib_ignore} NimBLE-Arduino - libpax \ No newline at end of file + libpax diff --git a/arch/esp32/esp32s3.ini b/arch/esp32/esp32s3.ini index 1cd0e2033..8d8b6899e 100644 --- a/arch/esp32/esp32s3.ini +++ b/arch/esp32/esp32s3.ini @@ -3,4 +3,3 @@ extends = esp32_base custom_esp32_kind = esp32s3 monitor_speed = 115200 - diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index ca12be6b1..127f46183 100644 --- a/arch/nrf52/nrf52.ini +++ b/arch/nrf52/nrf52.ini @@ -1,10 +1,14 @@ [nrf52_base] ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files -platform = platformio/nordicnrf52@^10.8.0 +platform = + # renovate: datasource=custom.pio depName=platformio/nordicnrf52 packageName=platformio/platform/nordicnrf52 + platformio/nordicnrf52@^10.8.0 extends = arduino_base platform_packages = ; our custom Git version until they merge our PR + # TODO renovate platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf + # renovate: datasource=custom.pio depName=platformio/toolchain-gccarmnoneeabi packageName=platformio/tool/toolchain-gccarmnoneeabi platformio/toolchain-gccarmnoneeabi@~1.90301.0 build_type = debug @@ -28,4 +32,4 @@ lib_deps= lib_ignore = BluetoothOTA - lvgl \ No newline at end of file + lvgl diff --git a/arch/nrf52/nrf52840.ini b/arch/nrf52/nrf52840.ini index 0dab5d9ba..fb5ba9960 100644 --- a/arch/nrf52/nrf52840.ini +++ b/arch/nrf52/nrf52840.ini @@ -6,6 +6,7 @@ build_flags = ${nrf52_base.build_flags} lib_deps = ${nrf52_base.lib_deps} ${environmental_base.lib_deps} + # renovate: datasource=git-refs depName=Kongduino-Adafruit_nRFCrypto packageName=https://github.com/Kongduino/Adafruit_nRFCrypto gitBranch=master https://github.com/Kongduino/Adafruit_nRFCrypto/archive/e31a8825ea3300b163a0a3c1ddd5de34e10e1371.zip ; Common NRF52 debugging settings follow. See the Meshtastic developer docs for how to connect SWD debugging probes to your board. diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index e0488aeff..07e7db95c 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -1,6 +1,8 @@ ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated). [portduino_base] -platform = https://github.com/meshtastic/platform-native/archive/c5bd469ab9b5a6966321e09557b27d906961da63.zip +platform = + # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop + https://github.com/meshtastic/platform-native/archive/c5bd469ab9b5a6966321e09557b27d906961da63.zip framework = arduino build_src_filter = @@ -24,8 +26,11 @@ lib_deps = ${env.lib_deps} ${networking_base.lib_deps} ${radiolib_base.lib_deps} + # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto rweather/Crypto@^0.4.0 + # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX lovyan03/LovyanGFX@^1.2.0 + # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main https://github.com/pine64/libch341-spi-userspace/archive/a9b17e3452f7fb747000d9b4ad4409155b39f6ef.zip build_flags = diff --git a/arch/rp2xx0/rp2040.ini b/arch/rp2xx0/rp2040.ini index 33fcfb211..cd7e684b4 100644 --- a/arch/rp2xx0/rp2040.ini +++ b/arch/rp2xx0/rp2040.ini @@ -1,8 +1,13 @@ ; Common settings for rp2040 Processor based targets [rp2040_base] -platform = https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3 +platform = + # TODO renovate + https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 + ; For arduino-pico >= 4.4.3 extends = arduino_base -platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3 +platform_packages = + # TODO renovate + framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3 board_build.core = earlephilhower board_build.filesystem_size = 0.5m @@ -24,4 +29,5 @@ lib_deps = ${arduino_base.lib_deps} ${environmental_base.lib_deps} ${radiolib_base.lib_deps} - rweather/Crypto \ No newline at end of file + # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto + rweather/Crypto@0.4.0 diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini index 841035c80..1c7af8be4 100644 --- a/arch/rp2xx0/rp2350.ini +++ b/arch/rp2xx0/rp2350.ini @@ -1,8 +1,13 @@ -; Common settings for rp2040 Processor based targets +; Common settings for rp2350 Processor based targets [rp2350_base] -platform = https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3 +platform = + # TODO renovate + https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 + ; For arduino-pico >= 4.4.3 extends = arduino_base -platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3 +platform_packages = + # TODO renovate + framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3 board_build.core = earlephilhower board_build.filesystem_size = 0.5m @@ -21,4 +26,5 @@ lib_deps = ${arduino_base.lib_deps} ${environmental_base.lib_deps} ${radiolib_base.lib_deps} - rweather/Crypto \ No newline at end of file + # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto + rweather/Crypto@0.4.0 diff --git a/arch/stm32/stm32.ini b/arch/stm32/stm32.ini index c1b58bb82..dd190c9d4 100644 --- a/arch/stm32/stm32.ini +++ b/arch/stm32/stm32.ini @@ -1,7 +1,11 @@ [stm32_base] extends = arduino_base -platform = ststm32 -platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip +platform = + # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32 + platformio/ststm32@19.1.0 +platform_packages = + # TODO renovate + platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip extra_scripts = ${env.extra_scripts} post:extra_scripts/extra_stm32.py @@ -35,6 +39,7 @@ debug_tool = stlink lib_deps = ${env.lib_deps} ${radiolib_base.lib_deps} + # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip lib_ignore = diff --git a/platformio.ini b/platformio.ini index 749aa94c7..844ba261d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -56,12 +56,19 @@ build_flags = -Wno-missing-field-initializers monitor_speed = 115200 monitor_filters = direct lib_deps = + # renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip + # renovate: datasource=custom.pio depName=OneButton packageName=mathertel/library/OneButton mathertel/OneButton@2.6.1 + # renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master https://github.com/meshtastic/arduino-fsm/archive/7db3702bf0cfe97b783d6c72595e3f38e0b19159.zip + # renovate: datasource=git-refs depName=meshtastic-TinyGPSPlus packageName=https://github.com/meshtastic/TinyGPSPlus gitBranch=master https://github.com/meshtastic/TinyGPSPlus/archive/71a82db35f3b973440044c476d4bcdc673b104f4.zip + # renovate: datasource=git-refs depName=meshtastic-ArduinoThread packageName=https://github.com/meshtastic/ArduinoThread gitBranch=master https://github.com/meshtastic/ArduinoThread/archive/7c3ee9e1951551b949763b1f5280f8db1fa4068d.zip + # renovate: datasource=custom.pio depName=Nanopb packageName=nanopb/library/Nanopb nanopb/Nanopb@0.4.91 + # renovate: datasource=custom.pio depName=ErriezCRC32 packageName=erriez/library/ErriezCRC32 erriez/ErriezCRC32@1.0.1 ; Used for the code analysis in PIO Home / Inspect @@ -77,6 +84,7 @@ check_flags = framework = arduino lib_deps = ${env.lib_deps} + # renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL end2endzone/NonBlockingRTTTL@1.3.0 build_flags = ${env.build_flags} -Os build_src_filter = ${env.build_src_filter} - - @@ -84,57 +92,98 @@ build_src_filter = ${env.build_src_filter} - -.+)$"], + "datasourceTemplate": "github-releases", + "depNameTemplate": "meshtastic/web", + "versioningTemplate": "semver-coerced" + }, + { + "customType": "regex", + "description": "Match normal PIO dependencies", + "fileMatch": [".*\\.ini$"], + "matchStrings": [ + "# renovate: datasource=(?.*?)(?: depName=(?.+?))? packageName=(?.+?)(?: versioning=(?[a-z-]+?))?\\s+?.+?@(?.+?)\\s" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}" + }, + { + "customType": "regex", + "description": "Match PIO zipped dependencies with github tag ref", + "fileMatch": [".*\\.ini$"], + "matchStrings": [ + "# renovate: datasource=github-tags(?: depName=(?.+?))? packageName=(?.+?)(?: versioning=(?[a-z-]+?))?\\s+?https:\/\/.+?archive\/(?.+?).zip\\s" + ], + "datasourceTemplate": "github-tags", + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}" + }, + { + "customType": "regex", + "description": "Match PIO zipped dependencies with git commit ref", + "fileMatch": [".*\\.ini$"], + "matchStrings": [ + "# renovate: datasource=git-refs(?: depName=(?.+?))? packageName=(?.+?)(?: versioning=(?[a-z-]+?))?\\sgitBranch=(?.+?)\\s+?https:\/\/.+?archive\/(?.+?).zip\\s" + ], + "datasourceTemplate": "git-refs", + "currentValueTemplate": "{{{gitBranch}}}", + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}git{{/if}}" + } + ], + "packageRules": [] +} From 0d8e39cc2ad748b5a45407c8c309d1913034989a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 12:46:58 -0500 Subject: [PATCH 054/100] chore(deps): update ntpclient to v3.2.1 (#6545) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 844ba261d..5f3cbe7cd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -95,7 +95,7 @@ lib_deps = # renovate: datasource=custom.pio depName=PubSubClient packageName=knolleary/library/PubSubClient knolleary/PubSubClient@2.8 # renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient - arduino-libraries/NTPClient@3.1.0 + arduino-libraries/NTPClient@3.2.1 # renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog arcao/Syslog@2.0.0 From 8e40d88e2436e00a7a5f7f23312f90a07cff1430 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 12:56:36 -0500 Subject: [PATCH 055/100] chore(deps): update platform-native digest to 46f509b (#6540) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- arch/portduino/portduino.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index 07e7db95c..7d2569c32 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -2,7 +2,7 @@ [portduino_base] platform = # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop - https://github.com/meshtastic/platform-native/archive/c5bd469ab9b5a6966321e09557b27d906961da63.zip + https://github.com/meshtastic/platform-native/archive/46f509b96ddce22d1bf38efc93319dfb3e4f5acf.zip framework = arduino build_src_filter = From 1888342a5701cfbab620d889f1893fbc93181930 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 12:57:21 -0500 Subject: [PATCH 056/100] chore(deps): update platformio/toolchain-gccarmnoneeabi to v1.140201.0 (#6546) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- arch/nrf52/nrf52.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index 127f46183..e311089ae 100644 --- a/arch/nrf52/nrf52.ini +++ b/arch/nrf52/nrf52.ini @@ -9,7 +9,7 @@ platform_packages = # TODO renovate platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf # renovate: datasource=custom.pio depName=platformio/toolchain-gccarmnoneeabi packageName=platformio/tool/toolchain-gccarmnoneeabi - platformio/toolchain-gccarmnoneeabi@~1.90301.0 + platformio/toolchain-gccarmnoneeabi@1.140201.0 build_type = debug build_flags = From 456f94511f45844dae9db709ec79486046c755d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 12:57:43 -0500 Subject: [PATCH 057/100] chore(deps): update libch341-spi-userspace digest to af9bc27 (#6539) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- arch/portduino/portduino.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index 7d2569c32..6df3854f4 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -31,7 +31,7 @@ lib_deps = # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX lovyan03/LovyanGFX@^1.2.0 # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main - https://github.com/pine64/libch341-spi-userspace/archive/a9b17e3452f7fb747000d9b4ad4409155b39f6ef.zip + https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip build_flags = ${arduino_base.build_flags} From daa03aba306375324c8a59d4464149bb9697633a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:02:42 -0500 Subject: [PATCH 058/100] chore(deps): update meshtastic-esp32_https_server digest to 896f177 (#6542) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- arch/esp32/esp32.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini index 3dfefbdb6..5e15cb451 100644 --- a/arch/esp32/esp32.ini +++ b/arch/esp32/esp32.ini @@ -48,7 +48,7 @@ lib_deps = ${environmental_base.lib_deps} ${radiolib_base.lib_deps} # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master - https://github.com/meshtastic/esp32_https_server/archive/23665b3adc080a311dcbb586ed5941b5f94d6ea2.zip + https://github.com/meshtastic/esp32_https_server/archive/896f1771ceb5979987a0b41028bf1b4e7aad419b.zip # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino h2zero/NimBLE-Arduino@^1.4.3 # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master From e98da27446a9878984f7197d06a3191c67e72a5c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:38:21 -0500 Subject: [PATCH 059/100] chore(deps): update ubuntu to v24 (#6541) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/sec_sast_semgrep_cron.yml | 2 +- .github/workflows/sec_sast_semgrep_pull.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sec_sast_semgrep_cron.yml b/.github/workflows/sec_sast_semgrep_cron.yml index db308c9f5..d7eef29b4 100644 --- a/.github/workflows/sec_sast_semgrep_cron.yml +++ b/.github/workflows/sec_sast_semgrep_cron.yml @@ -13,7 +13,7 @@ permissions: jobs: semgrep-full: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 container: image: semgrep/semgrep diff --git a/.github/workflows/sec_sast_semgrep_pull.yml b/.github/workflows/sec_sast_semgrep_pull.yml index 527a5c076..3707c91b8 100644 --- a/.github/workflows/sec_sast_semgrep_pull.yml +++ b/.github/workflows/sec_sast_semgrep_pull.yml @@ -6,7 +6,7 @@ permissions: read-all jobs: semgrep-diff: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 container: image: semgrep/semgrep From 1008a08c9911a849952158c9276ada5275de4dfa Mon Sep 17 00:00:00 2001 From: Austin Date: Wed, 9 Apr 2025 16:36:53 -0400 Subject: [PATCH 060/100] =?UTF-8?q?Revert=20"chore(deps):=20update=20platf?= =?UTF-8?q?ormio/toolchain-gccarmnoneeabi=20to=20v1.140201.=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1888342a5701cfbab620d889f1893fbc93181930. --- arch/nrf52/nrf52.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index e311089ae..127f46183 100644 --- a/arch/nrf52/nrf52.ini +++ b/arch/nrf52/nrf52.ini @@ -9,7 +9,7 @@ platform_packages = # TODO renovate platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf # renovate: datasource=custom.pio depName=platformio/toolchain-gccarmnoneeabi packageName=platformio/tool/toolchain-gccarmnoneeabi - platformio/toolchain-gccarmnoneeabi@1.140201.0 + platformio/toolchain-gccarmnoneeabi@~1.90301.0 build_type = debug build_flags = From 5c13f3451cf710a2f0e65b4f7872532c13520f71 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 16:10:01 -0500 Subject: [PATCH 061/100] chore(deps): update meshtastic-device-ui digest to 9345b03 (#6552) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 5f3cbe7cd..3c052e6ad 100644 --- a/platformio.ini +++ b/platformio.ini @@ -107,7 +107,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/56ef8db7eb4dda44dc0c1ec5828044debbbc6d33.zip + https://github.com/meshtastic/device-ui/archive/9345b03d47d3e2be91125325842b8bced0daaf86.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) From 3694805938777e2be05385cf33f8b901fb840724 Mon Sep 17 00:00:00 2001 From: Austin Date: Wed, 9 Apr 2025 18:40:14 -0400 Subject: [PATCH 062/100] renovate: Link PIO deps to PlatformIO page (#6548) --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 417e17d9b..bf6ffdd4b 100644 --- a/renovate.json +++ b/renovate.json @@ -21,7 +21,7 @@ "defaultRegistryUrlTemplate": "https://api.registry.platformio.org/v3/packages/{{packageName}}", "format": "json", "transformTemplates": [ - "{\"releases\": [$map($.versions, function($v) { { \"version\": $v.name, \"releaseTimestamp\": $v.released_at } })] }" + "{\"releases\": [$map($.versions, function($v) { { \"version\": $v.name, \"releaseTimestamp\": $v.released_at } })], \"homepage\": $encodeUrl($join([\"https://registry.platformio.org/\",$.type,\"/\",$.owner.username,\"/\",$.name])) }" ] } }, From 06ce6f3e8a31e062f6ad5af8d1de165a62128cd4 Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Thu, 10 Apr 2025 11:48:40 +1200 Subject: [PATCH 063/100] fix: remove redundant GPS code targeting Heltec T114 (#6497) --- src/gps/GPS.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 689f5e204..55f62d8ad 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -810,13 +810,6 @@ void GPS::setPowerState(GPSPowerState newState, uint32_t sleepTime) powerState = newState; LOG_INFO("GPS power state move from %s to %s", getGPSPowerStateString(oldState), getGPSPowerStateString(newState)); -#ifdef HELTEC_MESH_NODE_T114 - if ((oldState == GPS_OFF || oldState == GPS_HARDSLEEP) && (newState != GPS_OFF && newState != GPS_HARDSLEEP)) { - _serial_gps->begin(serialSpeeds[speedSelect]); - } else if ((newState == GPS_OFF || newState == GPS_HARDSLEEP) && (oldState != GPS_OFF && oldState != GPS_HARDSLEEP)) { - _serial_gps->end(); - } -#endif switch (newState) { case GPS_ACTIVE: case GPS_IDLE: From 91f38797a8c770b693a30ee52f5be6d81bcf14c9 Mon Sep 17 00:00:00 2001 From: Austin Date: Wed, 9 Apr 2025 20:23:15 -0400 Subject: [PATCH 064/100] Don't renovate toolchain-gccarmnoneeabi (#6554) --- arch/nrf52/nrf52.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index 127f46183..d49d8920c 100644 --- a/arch/nrf52/nrf52.ini +++ b/arch/nrf52/nrf52.ini @@ -8,7 +8,7 @@ platform_packages = ; our custom Git version until they merge our PR # TODO renovate platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf - # renovate: datasource=custom.pio depName=platformio/toolchain-gccarmnoneeabi packageName=platformio/tool/toolchain-gccarmnoneeabi + ; Don't renovate toolchain-gccarmnoneeabi platformio/toolchain-gccarmnoneeabi@~1.90301.0 build_type = debug From 854d74f8db468e0be0db9e8c60bdbf43e22a4a5b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 22:18:42 +0200 Subject: [PATCH 065/100] chore(deps): update meshtastic-device-ui digest to acf343b (#6559) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 3c052e6ad..647114537 100644 --- a/platformio.ini +++ b/platformio.ini @@ -107,7 +107,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/9345b03d47d3e2be91125325842b8bced0daaf86.zip + https://github.com/meshtastic/device-ui/archive/acf343b73cedbdcd5838ba1407c054974a0b6914.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) From 4ef9eae69571517b6954d4292691603682c5938c Mon Sep 17 00:00:00 2001 From: Austin Date: Fri, 11 Apr 2025 07:02:55 -0400 Subject: [PATCH 066/100] Portduino: Set C standard to 17 (#6561) --- arch/portduino/portduino.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index 6df3854f4..1d731f6b7 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -47,4 +47,5 @@ build_flags = -lyaml-cpp -li2c -luv + -std=gnu17 -std=c++17 From baa05aacf53b910b206b39fb4b55395d2103ab69 Mon Sep 17 00:00:00 2001 From: Ken Piper Date: Fri, 11 Apr 2025 06:04:37 -0500 Subject: [PATCH 067/100] fix: Correct underlying cause of T-Watch not functioning when set to a 16MB filesystem (#6563) * Fix maximum flash size in T-Watch S3 board definition * Revert "Fix: T-Watch-S3 has 8MB Flash (#6407)" This reverts commit 769f0623be6a7d7503c56bc1b6e468114dacdff0. --- bin/device-install.bat | 4 ++-- bin/device-install.sh | 2 +- boards/t-watch-s3.json | 6 +++--- variants/t-watch-s3/platformio.ini | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/device-install.bat b/bin/device-install.bat index 594d973f5..3ffca0b63 100755 --- a/bin/device-install.bat +++ b/bin/device-install.bat @@ -17,8 +17,8 @@ SET "LOGCOUNTER=0" SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone" SET "C3=esp32c3" @REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable. -SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core t-watch-s3 tracksenger" -SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite" +SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger" +SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3" GOTO getopts :help diff --git a/bin/device-install.sh b/bin/device-install.sh index 796626a9d..a43ccbdb4 100755 --- a/bin/device-install.sh +++ b/bin/device-install.sh @@ -22,7 +22,6 @@ BIGDB_8MB=( "icarus" "seeed-xiao-s3" "tbeam-s3-core" - "t-watch-s3" "tracksenger" ) BIGDB_16MB=( @@ -34,6 +33,7 @@ BIGDB_16MB=( "m5stack-cores3" "station-g2" "t-eth-elite" + "t-watch-s3" ) S3_VARIANTS=( "s3" diff --git a/boards/t-watch-s3.json b/boards/t-watch-s3.json index 51bb7cf4b..bae4f47b0 100644 --- a/boards/t-watch-s3.json +++ b/boards/t-watch-s3.json @@ -24,16 +24,16 @@ "mcu": "esp32s3", "variant": "t-watch-s3" }, - "connectivity": ["wifi", "bluetooth"], + "connectivity": ["wifi", "bluetooth", "lora"], "debug": { "openocd_target": "esp32s3.cfg" }, "frameworks": ["arduino"], "name": "LilyGo T-Watch 2020 V3", "upload": { - "flash_size": "8MB", + "flash_size": "16MB", "maximum_ram_size": 327680, - "maximum_size": 8388608, + "maximum_size": 16777216, "require_upload_port": true, "use_1200bps_touch": true, "wait_for_upload_port": true, diff --git a/variants/t-watch-s3/platformio.ini b/variants/t-watch-s3/platformio.ini index d650b1f11..f98237943 100644 --- a/variants/t-watch-s3/platformio.ini +++ b/variants/t-watch-s3/platformio.ini @@ -3,7 +3,7 @@ extends = esp32s3_base board = t-watch-s3 board_check = true -board_build.partitions = default_8MB.csv +board_build.partitions = default_16MB.csv upload_protocol = esptool build_flags = ${esp32_base.build_flags} From 7079f538edc1d90560453e5246218a95db5eba25 Mon Sep 17 00:00:00 2001 From: Kevin Jahaziel Leon Morales Date: Fri, 11 Apr 2025 04:26:30 -0700 Subject: [PATCH 068/100] feat: Add Electronic Cats variant for Catsniffer (#6483) * feat: Add Electronic Cats variant for catsniffer * fix: Trunk fmt * fix: Variant error --- variants/ec_catsniffer/platformio.ini | 15 ++++++++++ variants/ec_catsniffer/variant.cpp | 39 +++++++++++++++++++++++++ variants/ec_catsniffer/variant.h | 41 +++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 variants/ec_catsniffer/platformio.ini create mode 100644 variants/ec_catsniffer/variant.cpp create mode 100644 variants/ec_catsniffer/variant.h diff --git a/variants/ec_catsniffer/platformio.ini b/variants/ec_catsniffer/platformio.ini new file mode 100644 index 000000000..9afb44236 --- /dev/null +++ b/variants/ec_catsniffer/platformio.ini @@ -0,0 +1,15 @@ +[env:catsniffer] +extends = rp2040_base +board = rpipico +upload_protocol = picotool + +build_flags = ${rp2040_base.build_flags} + -DRPI_PICO + -Ivariants/ec_catsniffer + -DDEBUG_RP2040_PORT=Serial + # -DHW_SPI1_DEVICE + -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus" +lib_deps = + ${rp2040_base.lib_deps} +debug_build_flags = ${rp2040_base.build_flags}, -g +debug_tool = cmsis-dap \ No newline at end of file diff --git a/variants/ec_catsniffer/variant.cpp b/variants/ec_catsniffer/variant.cpp new file mode 100644 index 000000000..db5226541 --- /dev/null +++ b/variants/ec_catsniffer/variant.cpp @@ -0,0 +1,39 @@ +/* + Copyright (c) 2014-2015 Arduino LLC. All right reserved. + Copyright (c) 2016 Sandeep Mistry All right reserved. + Copyright (c) 2018, Adafruit Industries (adafruit.com) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "variant.h" +#include "wiring_constants.h" +#include "wiring_digital.h" + +#define CTF1 8 +#define CTF2 9 +#define CTF3 10 + +void initVariant() +{ + // Config the LoRa Switch + pinMode(CTF1, OUTPUT); + pinMode(CTF2, OUTPUT); + pinMode(CTF3, OUTPUT); + + digitalWrite(CTF1, HIGH); + digitalWrite(CTF2, LOW); + digitalWrite(CTF3, LOW); +} \ No newline at end of file diff --git a/variants/ec_catsniffer/variant.h b/variants/ec_catsniffer/variant.h new file mode 100644 index 000000000..400074e59 --- /dev/null +++ b/variants/ec_catsniffer/variant.h @@ -0,0 +1,41 @@ +// #define RADIOLIB_CUSTOM_ARDUINO 1 +// #define RADIOLIB_TONE_UNSUPPORTED 1 +// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1 + +#define ARDUINO_ARCH_AVR + +#define HAS_SCREEN 0 +#define HAS_GPS 0 +#undef GPS_RX_PIN +#undef GPS_TX_PIN + +#define LED_PIN 27 + +#define USE_SX1262 + +#undef LORA_SCK +#undef LORA_MISO +#undef LORA_MOSI +#undef LORA_CS + +#define LORA_SCK 18 +#define LORA_MISO 16 +#define LORA_MOSI 19 +#define LORA_CS 17 // NSS + +#define LORA_DIO0 5 +#define LORA_RESET 24 +#define LORA_DIO1 4 +#define LORA_DIO2 23 +#define LORA_DIO3 25 +#define SX126X_RXEN 21 +#define SX126X_TXEN 20 + +#ifdef USE_SX1262 +#define SX126X_CS LORA_CS +#define SX126X_DIO1 LORA_DIO0 +#define SX126X_BUSY LORA_DIO1 +#define SX126X_RESET LORA_RESET +// #define SX126X_DIO2_AS_RF_SWITCH +#define SX126X_DIO3_TCXO_VOLTAGE 0 +#endif From e9570090193cca7d428dcd951220a280116b54e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Apr 2025 07:48:13 -0500 Subject: [PATCH 069/100] Upgrade trunk (#6564) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index e74c1a362..ba0dd97cc 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -8,7 +8,7 @@ plugins: uri: https://github.com/trunk-io/plugins lint: enabled: - - renovate@39.235.2 + - renovate@39.238.1 - prettier@3.5.3 - trufflehog@3.88.23 - yamllint@1.37.0 From e7ce910c3b6613ca50ce8133e3998758c3f07eaa Mon Sep 17 00:00:00 2001 From: Tavis Date: Fri, 11 Apr 2025 07:38:44 -1000 Subject: [PATCH 070/100] Add generic thread module (#5484) * compiling, untested * use INCLUDE not EXLUDE for option to include module * protobuf update * working genericthread module Update protobufs * use EXCLUDE style instead of INCLUDE * Update Modules.cpp --------- Co-authored-by: Ben Meadors --- platformio.ini | 1 + src/modules/GenericThreadModule.cpp | 28 ++++++++++++++++++++++++++++ src/modules/GenericThreadModule.h | 21 +++++++++++++++++++++ src/modules/Modules.cpp | 9 ++++++++- 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 src/modules/GenericThreadModule.cpp create mode 100644 src/modules/GenericThreadModule.h diff --git a/platformio.ini b/platformio.ini index 647114537..e1eabf952 100644 --- a/platformio.ini +++ b/platformio.ini @@ -50,6 +50,7 @@ build_flags = -Wno-missing-field-initializers -DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1 -DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1 -DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware + -DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1 #-DBUILD_EPOCH=$UNIX_TIME #-D OLED_PL=1 diff --git a/src/modules/GenericThreadModule.cpp b/src/modules/GenericThreadModule.cpp new file mode 100644 index 000000000..eb92566bd --- /dev/null +++ b/src/modules/GenericThreadModule.cpp @@ -0,0 +1,28 @@ +#include "GenericThreadModule.h" +#include "MeshService.h" +#include "configuration.h" +#include + +/* +Generic Thread Module allows for the execution of custom code at a set interval. +*/ +GenericThreadModule *genericThreadModule; + +GenericThreadModule::GenericThreadModule() : concurrency::OSThread("GenericThreadModule") {} + +int32_t GenericThreadModule::runOnce() +{ + + bool enabled = true; + if (!enabled) + return disable(); + + if (firstTime) { + // do something the first time we run + firstTime = 0; + LOG_INFO("first time GenericThread running"); + } + + LOG_INFO("GenericThread executing"); + return (my_interval); +} diff --git a/src/modules/GenericThreadModule.h b/src/modules/GenericThreadModule.h new file mode 100644 index 000000000..05f7946bb --- /dev/null +++ b/src/modules/GenericThreadModule.h @@ -0,0 +1,21 @@ +#pragma once + +#include "MeshModule.h" +#include "concurrency/OSThread.h" +#include "configuration.h" +#include +#include + +class GenericThreadModule : private concurrency::OSThread +{ + bool firstTime = 1; + + public: + GenericThreadModule(); + + protected: + unsigned int my_interval = 10000; // interval in millisconds + virtual int32_t runOnce() override; +}; + +extern GenericThreadModule *genericThreadModule; diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp index e2a4a970c..1f2b50057 100644 --- a/src/modules/Modules.cpp +++ b/src/modules/Modules.cpp @@ -65,6 +65,10 @@ #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_POWER_TELEMETRY #include "modules/Telemetry/PowerTelemetry.h" #endif +#if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE +#include "modules/GenericThreadModule.h" +#endif + #ifdef ARCH_ESP32 #if defined(USE_SX1280) && !MESHTASTIC_EXCLUDE_AUDIO #include "modules/esp32/AudioModule.h" @@ -131,6 +135,9 @@ void setupModules() #if !MESHTASTIC_EXCLUDE_DROPZONE dropzoneModule = new DropzoneModule(); +#endif +#if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE + new GenericThreadModule(); #endif // Note: if the rest of meshtastic doesn't need to explicitly use your module, you do not need to assign the instance // to a global variable. @@ -249,4 +256,4 @@ void setupModules() // NOTE! This module must be added LAST because it likes to check for replies from other modules and avoid sending extra // acks routingModule = new RoutingModule(); -} \ No newline at end of file +} From e7d0837d014271c9d3e8a2b1d61b75102cf4184c Mon Sep 17 00:00:00 2001 From: Austin Date: Fri, 11 Apr 2025 16:54:53 -0400 Subject: [PATCH 071/100] Add Meshtastic Linux desktop metadata (#6568) --- bin/org.meshtastic.meshtasticd.desktop | 8 ++ bin/org.meshtastic.meshtasticd.metainfo.xml | 94 +++++++++++++++++++++ bin/org.meshtastic.meshtasticd.svg | 16 ++++ 3 files changed, 118 insertions(+) create mode 100644 bin/org.meshtastic.meshtasticd.desktop create mode 100644 bin/org.meshtastic.meshtasticd.metainfo.xml create mode 100644 bin/org.meshtastic.meshtasticd.svg diff --git a/bin/org.meshtastic.meshtasticd.desktop b/bin/org.meshtastic.meshtasticd.desktop new file mode 100644 index 000000000..215c7ee05 --- /dev/null +++ b/bin/org.meshtastic.meshtasticd.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Meshtastic +Comment=Meshtastic App +Exec=meshtasticd +Icon=org.meshtastic.meshtasticd +Terminal=true +Type=Application +Categories=Network;Chat;HamRadio; \ No newline at end of file diff --git a/bin/org.meshtastic.meshtasticd.metainfo.xml b/bin/org.meshtastic.meshtasticd.metainfo.xml new file mode 100644 index 000000000..a9e6cbdf5 --- /dev/null +++ b/bin/org.meshtastic.meshtasticd.metainfo.xml @@ -0,0 +1,94 @@ + + + org.meshtastic.meshtasticd + + Meshtastic +

Decentralized mesh communication + + CC-BY-4.0 + GPL-3.0-or-later + + + Meshtastic + + + +

+ Meshtastic is an open source project for creating off-grid, affordable, and resilient communication with LoRa mesh networks. +

+ + + org.meshtastic.meshtasticd.desktop + + + Network + Chat + HamRadio + + + mesh + LoRa + + + + keyboard + pointing + touch + + + 360 + + + + #97be89 + #206538 + + + + intense + intense + + + https://github.com/meshtastic/firmware/issues + https://meshtastic.org/ + https://opencollective.com/meshtastic + https://meshtastic.org/docs/software/linux/usage/ + https://github.com/meshtastic/firmware/ + + + + https://meshtastic.org/img/software/meshtastic-ui/mui_home_dashboard_dark.webp + Home Dashboard + + + https://meshtastic.org/img/software/meshtastic-ui/mui_initial_boot.webp + Setup + + + https://meshtastic.org/img/software/meshtastic-ui/mui_node_list_dark.webp + Nodes List + + + https://meshtastic.org/img/software/meshtastic-ui/mui_chat_list_dark.webp + Chats List + + + https://meshtastic.org/img/software/meshtastic-ui/mui_chat_message_dark.webp + Messages + + + https://meshtastic.org/img/software/meshtastic-ui/mui_map_dark.webp + Map + + + https://meshtastic.org/img/software/meshtastic-ui/mui_settings_dark.webp + Settings + + + + + + https://github.com/meshtastic/firmware/releases/tag/v2.6.4.b89355f + + + \ No newline at end of file diff --git a/bin/org.meshtastic.meshtasticd.svg b/bin/org.meshtastic.meshtasticd.svg new file mode 100644 index 000000000..e6863f6a6 --- /dev/null +++ b/bin/org.meshtastic.meshtasticd.svg @@ -0,0 +1,16 @@ + + + +Created with Fabric.js 4.6.0 + + + + + + + + + + + + \ No newline at end of file From e4c2730f71f7002a374bcf17cd30f3dbc47b8036 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 12 Apr 2025 19:47:36 +0200 Subject: [PATCH 072/100] chore(deps): update meshtastic-device-ui digest to 13f69c5 (#6567) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index e1eabf952..b0d9d6237 100644 --- a/platformio.ini +++ b/platformio.ini @@ -108,7 +108,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/acf343b73cedbdcd5838ba1407c054974a0b6914.zip + https://github.com/meshtastic/device-ui/archive/13f69c5f8d992b9e028d036bfc9b6485183e742f.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) From 3eb845eaae6421de8a642a7d7c85cef6ec7657e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 12 Apr 2025 19:28:37 -0500 Subject: [PATCH 073/100] chore(deps): update meshtastic-device-ui digest to 3cdb8a6 (#6572) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index b0d9d6237..bba4dfe18 100644 --- a/platformio.ini +++ b/platformio.ini @@ -108,7 +108,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/13f69c5f8d992b9e028d036bfc9b6485183e742f.zip + https://github.com/meshtastic/device-ui/archive/3cdb8a63039aa2cf426104ab02656996730f79fa.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) From 28e62e53e5dd83888ecf1bf5bd288c3684fcde62 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 07:50:09 -0500 Subject: [PATCH 074/100] Upgrade trunk (#6581) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index ba0dd97cc..01e8f8d1b 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -4,7 +4,7 @@ cli: plugins: sources: - id: trunk - ref: v1.6.7 + ref: v1.6.8 uri: https://github.com/trunk-io/plugins lint: enabled: @@ -16,7 +16,7 @@ lint: - terrascan@1.19.9 - trivy@0.61.0 - taplo@0.9.3 - - ruff@0.11.4 + - ruff@0.11.5 - isort@6.0.1 - markdownlint@0.44.0 - oxipng@9.1.4 From c4dc3472ac3d8f987bb905a570b2c2a5dbd785c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 01:09:32 +0200 Subject: [PATCH 075/100] chore(deps): update meshtastic-device-ui digest to 3fde170 (#6586) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index bba4dfe18..f22d92b2e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -108,7 +108,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/3cdb8a63039aa2cf426104ab02656996730f79fa.zip + https://github.com/meshtastic/device-ui/archive/3fde170dca16863218cec133e05c5f2fc8d6e59a.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) From b46aad85ccd765edf75a45b8434833a85d2910d2 Mon Sep 17 00:00:00 2001 From: "Aaron.Lee" <32860565+Heltec-Aaron-Lee@users.noreply.github.com> Date: Tue, 15 Apr 2025 11:34:30 +0800 Subject: [PATCH 076/100] Add new hardware: Heltec MeshPocket (#6533) * Add Heltec MeshPocket. * MeshPocket source code update * Optimiz code for refresh border during full update. * Update Heltec MeshPocket json file info. --- boards/heltec_mesh_pocket.json | 54 +++++++ src/graphics/EInkDisplay2.cpp | 16 ++- src/graphics/EInkDisplay2.h | 4 + .../niche/Drivers/EInk/LCMEN2R13ECC1.cpp | 68 +++++++++ .../niche/Drivers/EInk/LCMEN2R13ECC1.h | 41 ++++++ src/platform/nrf52/architecture.h | 2 + src/power.h | 4 + variants/heltec_mesh_pocket/nicheGraphics.h | 107 ++++++++++++++ variants/heltec_mesh_pocket/platformio.ini | 92 ++++++++++++ variants/heltec_mesh_pocket/variant.cpp | 13 ++ variants/heltec_mesh_pocket/variant.h | 135 ++++++++++++++++++ 11 files changed, 535 insertions(+), 1 deletion(-) create mode 100644 boards/heltec_mesh_pocket.json create mode 100644 src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp create mode 100644 src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h create mode 100644 variants/heltec_mesh_pocket/nicheGraphics.h create mode 100644 variants/heltec_mesh_pocket/platformio.ini create mode 100644 variants/heltec_mesh_pocket/variant.cpp create mode 100644 variants/heltec_mesh_pocket/variant.h diff --git a/boards/heltec_mesh_pocket.json b/boards/heltec_mesh_pocket.json new file mode 100644 index 000000000..a35387857 --- /dev/null +++ b/boards/heltec_mesh_pocket.json @@ -0,0 +1,54 @@ +{ + "build": { + "arduino": { + "ldscript": "nrf52840_s140_v6.ld" + }, + "core": "nRF5", + "cpu": "cortex-m4", + "extra_flags": "-DNRF52840_XXAA", + "f_cpu": "64000000L", + "hwids": [ + ["0x239A", "0x4405"], + ["0x239A", "0x0029"], + ["0x239A", "0x002A"] + ], + "usb_product": "HT-n5262", + "mcu": "nrf52840", + "variant": "heltec_mesh_pocket", + "variants_dir": "variants", + "bsp": { + "name": "adafruit" + }, + "softdevice": { + "sd_flags": "-DS140", + "sd_name": "s140", + "sd_version": "6.1.1", + "sd_fwid": "0x00B6" + }, + "bootloader": { + "settings_addr": "0xFF000" + } + }, + "connectivity": ["bluetooth"], + "debug": { + "jlink_device": "nRF52840_xxAA", + "onboard_tools": ["jlink"], + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52840-mdk-rs" + }, + "frameworks": ["arduino"], + "name": "Heltec nrf (Adafruit BSP)", + "upload": { + "maximum_ram_size": 248832, + "maximum_size": 815104, + "speed": 115200, + "protocol": "nrfutil", + "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"], + "use_1200bps_touch": true, + "require_upload_port": true, + "wait_for_upload_port": true + }, + "url": "https://heltec.org/project/meshpocket/", + "vendor": "Heltec" + } + \ No newline at end of file diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp index d2d373d24..737fcc3f0 100644 --- a/src/graphics/EInkDisplay2.cpp +++ b/src/graphics/EInkDisplay2.cpp @@ -181,7 +181,6 @@ bool EInkDisplay::connect() // Start HSPI hspi = new SPIClass(HSPI); hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS); // SCLK, MISO, MOSI, SS - // VExt already enabled in setup() // RTC GPIO hold disabled in setup() @@ -218,6 +217,21 @@ bool EInkDisplay::connect() adafruitDisplay->setRotation(1); adafruitDisplay->setPartialWindow(0, 0, EINK_WIDTH, EINK_HEIGHT); } +#elif defined(HELTEC_MESH_POCKET) + { + spi1=&SPI1; + spi1->begin(); + // VExt already enabled in setup() + // RTC GPIO hold disabled in setup() + + // Create GxEPD2 objects + auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, *spi1); + adafruitDisplay = new GxEPD2_BW(*lowLevel); + + // Init GxEPD2 + adafruitDisplay->init(); + adafruitDisplay->setRotation(3); + } #endif return true; diff --git a/src/graphics/EInkDisplay2.h b/src/graphics/EInkDisplay2.h index 9c1c8d18e..93be197b0 100644 --- a/src/graphics/EInkDisplay2.h +++ b/src/graphics/EInkDisplay2.h @@ -73,6 +73,10 @@ class EInkDisplay : public OLEDDisplay SPIClass *hspi = NULL; #endif +#if defined(HELTEC_MESH_POCKET) + SPIClass *spi1 = NULL; +#endif + private: // FIXME quick hack to limit drawing to a very slow rate uint32_t lastDrawMsec = 0; diff --git a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp new file mode 100644 index 000000000..5e21c00f6 --- /dev/null +++ b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp @@ -0,0 +1,68 @@ +#include "./LCMEN2R13ECC1.h" + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +using namespace NicheGraphics::Drivers; + +// Map the display controller IC's output to the connected panel +void LCMEN2R13ECC1::configScanning() +{ + // "Driver output control" + sendCommand(0x01); + sendData(0xF9); + sendData(0x00); + sendData(0x00); + + // To-do: delete this method? + // Values set here might be redundant: F9, 00, 00 seems to be default +} + +// Specify which information is used to control the sequence of voltages applied to move the pixels +// - For this display, configUpdateSequence() specifies that a suitable LUT will be loaded from +// the controller IC's OTP memory, when the update procedure begins. +void LCMEN2R13ECC1::configWaveform() +{ + switch (updateType) { + case FAST: + sendCommand(0x3C); // Border waveform: + sendData(0x85); + break; + + case FULL: + default: + // From OTP memory + break; + } +} + +void LCMEN2R13ECC1::configUpdateSequence() +{ + switch (updateType) { + case FAST: + sendCommand(0x22); // Set "update sequence" + sendData(0xFF); // Will load LUT from OTP memory, Display mode 2 "differential refresh" + break; + + case FULL: + default: + sendCommand(0x22); // Set "update sequence" + sendData(0xF7); // Will load LUT from OTP memory + break; + } +} + +// Once the refresh operation has been started, +// begin periodically polling the display to check for completion, using the normal Meshtastic threading code +// Only used when refresh is "async" +void LCMEN2R13ECC1::detachFromUpdate() +{ + switch (updateType) { + case FAST: + return beginPolling(50, 800); // At least 500ms for fast refresh + case FULL: + default: + return beginPolling(100, 2500); // At least 2 seconds for full refresh + } +} + +#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h new file mode 100644 index 000000000..7b0aed282 --- /dev/null +++ b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h @@ -0,0 +1,41 @@ +/* + +E-Ink display driver + - SSD1680 + - Manufacturer: WISEVAST + - Size: 2.13 inch + - Resolution: 122px x 255px + - Flex connector marking: Soldering connector, no connector is needed + +*/ + +#pragma once + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +#include "configuration.h" + +#include "./SSD16XX.h" + +namespace NicheGraphics::Drivers +{ +class LCMEN2R13ECC1 : public SSD16XX +{ + // Display properties + private: + static constexpr uint32_t width = 122; + static constexpr uint32_t height = 250; + static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST); + + public: + LCMEN2R13ECC1() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte + + protected: + virtual void configScanning() override; + virtual void configWaveform() override; + virtual void configUpdateSequence() override; + void detachFromUpdate() override; +}; + +} // namespace NicheGraphics::Drivers +#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h index 4e8823063..21296c3fc 100644 --- a/src/platform/nrf52/architecture.h +++ b/src/platform/nrf52/architecture.h @@ -81,6 +81,8 @@ #define HW_VENDOR meshtastic_HardwareModel_MESHLINK #elif defined(SEEED_XIAO_NRF52840_KIT) #define HW_VENDOR meshtastic_HardwareModel_XIAO_NRF52_KIT +#elif defined(HELTEC_MESH_POCKET) +#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_POCKET #else #define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN #endif diff --git a/src/power.h b/src/power.h index e9c0deb7c..a21f7d164 100644 --- a/src/power.h +++ b/src/power.h @@ -26,6 +26,10 @@ #define OCV_ARRAY 2700, 2560, 2540, 2520, 2500, 2460, 2420, 2400, 2380, 2320, 1500 #elif defined(TRACKER_T1000_E) #define OCV_ARRAY 4190, 4078, 4017, 3969, 3887, 3818, 3798, 3791, 3766, 3712, 3100 +#elif defined(HELTEC_MESH_POCKET_BATTERY_5000) +#define OCV_ARRAY 4300, 4240, 4120, 4000, 3888, 3800, 3740, 3698, 3655, 3580, 3400 +#elif defined(HELTEC_MESH_POCKET_BATTERY_10000) +#define OCV_ARRAY 4100, 4060, 3960, 3840, 3729, 3625, 3550, 3500, 3420, 3345, 3100 #else // LiIon #define OCV_ARRAY 4190, 4050, 3990, 3890, 3800, 3720, 3630, 3530, 3420, 3300, 3100 #endif diff --git a/variants/heltec_mesh_pocket/nicheGraphics.h b/variants/heltec_mesh_pocket/nicheGraphics.h new file mode 100644 index 000000000..352a9bc47 --- /dev/null +++ b/variants/heltec_mesh_pocket/nicheGraphics.h @@ -0,0 +1,107 @@ +#pragma once + +#include "configuration.h" + +#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS + +// InkHUD-specific components +// --------------------------- +#include "graphics/niche/InkHUD/InkHUD.h" + +// Applets +#include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h" +#include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h" +#include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h" +#include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h" +#include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h" +#include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h" + +// #include "graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h" +// #include "graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h" + +// Shared NicheGraphics components +// -------------------------------- +#include "graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h" +#include "graphics/niche/Inputs/TwoButton.h" + +#include "graphics/niche/Fonts/FreeSans6pt7b.h" +#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h" +#include + +void setupNicheGraphics() +{ + using namespace NicheGraphics; + + // SPI + // ----------------------------- + SPIClass *spi1=&SPI1; + spi1->begin(); + // Display is connected to SPI1 + + // E-Ink Driver + // ----------------------------- + // Use E-Ink driver + Drivers::EInk *driver = new Drivers::LCMEN2R13ECC1; + driver->begin(spi1, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES); + + // InkHUD + // ---------------------------- + + InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance(); + + // Set the driver + inkhud->setDriver(driver); + + // Set how many FAST updates per FULL update + // Set how unhealthy additional FAST updates beyond this number are + inkhud->setDisplayResilience(10, 1.5); + + // Prepare fonts + InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b); + InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b); + /* + // Font localization demo: Cyrillic + InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic); + InkHUD::Applet::fontSmall.addSubstitutionsWin1251(); + */ + + // Customize default settings + inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle? + inkhud->persistence->settings.rotation = 3; // 270 degrees clockwise + inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users + inkhud->persistence->settings.optionalMenuItems.nextTile = true; + + // Pick applets + inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown + inkhud->addApplet("DMs", new InkHUD::DMApplet); // Inactive + inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0)); // Inactive + inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1)); // Inactive + inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated + inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); // Inactive + inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0 + // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet); + // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet); + + // Start running InkHUD + inkhud->begin(); + + // Buttons + // -------------------------- + + Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component + constexpr uint8_t MAIN_BUTTON = 0; + // constexpr uint8_t AUX_BUTTON = 1; + + // Setup the main user button + buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin()); + buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); }); + buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); }); + + // Setup the aux button + // Bonus feature of VME213 + // buttons->setWiring(AUX_BUTTON, BUTTON_PIN_SECONDARY); + // buttons->setHandlerShortPress(AUX_BUTTON, []() { InkHUD::InkHUD::getInstance()->nextTile(); }); + buttons->start(); +} + +#endif \ No newline at end of file diff --git a/variants/heltec_mesh_pocket/platformio.ini b/variants/heltec_mesh_pocket/platformio.ini new file mode 100644 index 000000000..53f56e973 --- /dev/null +++ b/variants/heltec_mesh_pocket/platformio.ini @@ -0,0 +1,92 @@ +; First prototype nrf52840/sx1262 device +[env:heltec-mesh-pocket-5000] +extends = nrf52840_base +board = heltec_mesh_pocket +debug_tool = jlink + +# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling. +build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket + -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" + -DHELTEC_MESH_POCKET + -DHELTEC_MESH_POCKET_BATTERY_5000 + -DUSE_EINK + -DEINK_DISPLAY_MODEL=GxEPD2_213_B74 + -DEINK_WIDTH=250 + -DEINK_HEIGHT=122 + -DUSE_EINK_DYNAMICDISPLAY ; Enable Dynamic EInk + -DEINK_LIMIT_FASTREFRESH=10 ; How many consecutive fast-refreshes are permitted + -DEINK_LIMIT_RATE_BACKGROUND_SEC=30 ; Minimum interval between BACKGROUND updates + -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 ; Minimum interval between RESPONSIVE updates +; -D EINK_LIMIT_GHOSTING_PX=2000 ; (Optional) How much image ghosting is tolerated + -DEINK_BACKGROUND_USES_FAST ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached. + -DEINK_HASQUIRK_GHOSTING ; Display model is identified as "prone to ghosting" + -DEINK_HASQUIRK_WEAKFASTREFRESH ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight + +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> +lib_deps = + ${nrf52840_base.lib_deps} + lewisxhe/PCF8563_Library@^1.0.1 + https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d + + +[env:heltec-mesh-pocket-inkhud-5000] +extends = nrf52840_base, inkhud +board = heltec_mesh_pocket +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> ${inkhud.build_src_filter} +build_flags = + ${inkhud.build_flags} + ${nrf52840_base.build_flags} + -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" + -I variants/heltec_mesh_pocket + -D HELTEC_MESH_POCKET + -D HELTEC_MESH_POCKET_BATTERY_5000 +lib_deps = + ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX + ${nrf52840_base.lib_deps} + + +; First prototype nrf52840/sx1262 device +[env:heltec-mesh-pocket-10000] +extends = nrf52840_base +board = heltec_mesh_pocket +debug_tool = jlink + +# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling. +build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket + -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" + -DHELTEC_MESH_POCKET + -DHELTEC_MESH_POCKET_BATTERY_10000 + -DUSE_EINK + -DEINK_DISPLAY_MODEL=GxEPD2_213_B74 + -DEINK_WIDTH=250 + -DEINK_HEIGHT=122 + -DUSE_EINK_DYNAMICDISPLAY ; Enable Dynamic EInk + -DEINK_LIMIT_FASTREFRESH=10 ; How many consecutive fast-refreshes are permitted + -DEINK_LIMIT_RATE_BACKGROUND_SEC=30 ; Minimum interval between BACKGROUND updates + -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 ; Minimum interval between RESPONSIVE updates +; -D EINK_LIMIT_GHOSTING_PX=2000 ; (Optional) How much image ghosting is tolerated + -DEINK_BACKGROUND_USES_FAST ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached. + -DEINK_HASQUIRK_GHOSTING ; Display model is identified as "prone to ghosting" + -DEINK_HASQUIRK_WEAKFASTREFRESH ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight + +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> +lib_deps = + ${nrf52840_base.lib_deps} + lewisxhe/PCF8563_Library@^1.0.1 + https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d + + +[env:heltec-mesh-pocket-inkhud-10000] +extends = nrf52840_base, inkhud +board = heltec_mesh_pocket +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> ${inkhud.build_src_filter} +build_flags = + ${inkhud.build_flags} + ${nrf52840_base.build_flags} + -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" + -I variants/heltec_mesh_pocket + -D HELTEC_MESH_POCKET + -D HELTEC_MESH_POCKET_BATTERY_10000 +lib_deps = + ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX + ${nrf52840_base.lib_deps} diff --git a/variants/heltec_mesh_pocket/variant.cpp b/variants/heltec_mesh_pocket/variant.cpp new file mode 100644 index 000000000..20ba5f2ae --- /dev/null +++ b/variants/heltec_mesh_pocket/variant.cpp @@ -0,0 +1,13 @@ +#include "variant.h" +#include "nrf.h" +#include "wiring_constants.h" +#include "wiring_digital.h" + +const uint32_t g_ADigitalPinMap[] = { + // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled + 0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + + // P1 + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47}; + + diff --git a/variants/heltec_mesh_pocket/variant.h b/variants/heltec_mesh_pocket/variant.h new file mode 100644 index 000000000..89f06f358 --- /dev/null +++ b/variants/heltec_mesh_pocket/variant.h @@ -0,0 +1,135 @@ +#ifndef _VARIANT_HELTEC_NRF_ +#define _VARIANT_HELTEC_NRF_ +/** Master clock frequency */ +#define VARIANT_MCK (64000000ul) + +#define USE_LFXO // Board uses 32khz crystal for LF + +/*---------------------------------------------------------------------------- + * Headers + *----------------------------------------------------------------------------*/ + +#include "WVariant.h" + +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +// Number of pins defined in PinDescription array +#define PINS_COUNT (48) +#define NUM_DIGITAL_PINS (48) +#define NUM_ANALOG_INPUTS (1) +#define NUM_ANALOG_OUTPUTS (0) + +// LEDs +#define PIN_LED1 (13) // 13 red (confirmed on 1.0 board) +#define LED_RED PIN_LED1 +#define LED_BLUE PIN_LED1 +#define LED_GREEN PIN_LED1 +#define LED_BUILTIN LED_BLUE +#define LED_CONN LED_BLUE +#define LED_STATE_ON 0 // State when LED is lit + +/* + * Buttons + */ +#define PIN_BUTTON1 (32 + 10) +// #define PIN_BUTTON2 (0 + 18) // 0.18 is labeled on the board as RESET but we configure it in the bootloader as a regular +// GPIO + +/* +No longer populated on PCB +*/ +#define PIN_SERIAL2_RX (0 + 7) +#define PIN_SERIAL2_TX (0 + 8) +// #define PIN_SERIAL2_EN (0 + 17) + +/** + Wire Interfaces + */ +#define WIRE_INTERFACES_COUNT 1 + +#define PIN_WIRE_SDA (32+15) +#define PIN_WIRE_SCL (32+13) + +/* + * Lora radio + */ + +#define USE_SX1262 +#define SX126X_CS (0 + 26) // FIXME - we really should define LORA_CS instead +#define LORA_CS (0 + 26) +#define SX126X_DIO1 (0 + 16) +// Note DIO2 is attached internally to the module to an analog switch for TX/RX switching +// #define SX1262_DIO3 (0 + 21) +// This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not drive from the +// main +// CPU? +#define SX126X_BUSY (0 + 15) +#define SX126X_RESET (0 + 12) +// Not really an E22 but TTGO seems to be trying to clone that +#define SX126X_DIO2_AS_RF_SWITCH +#define SX126X_DIO3_TCXO_VOLTAGE 1.8 + +// Display (E-Ink) +#define PIN_EINK_CS 24 +#define PIN_EINK_BUSY 32+6 +#define PIN_EINK_DC 31 +#define PIN_EINK_RES 32+4 +#define PIN_EINK_SCLK 22 +#define PIN_EINK_MOSI 20 + + +#define PIN_SPI1_MISO -1 +#define PIN_SPI1_MOSI PIN_EINK_MOSI +#define PIN_SPI1_SCK PIN_EINK_SCLK + + +/* + * GPS pins + */ + +#define PIN_SERIAL1_RX 32+5 +#define PIN_SERIAL1_TX 32+7 + +/* + * SPI Interfaces + */ +#define SPI_INTERFACES_COUNT 2 + +// For LORA, spi 0 +#define PIN_SPI_MISO (32 + 9) +#define PIN_SPI_MOSI (0 + 5) +#define PIN_SPI_SCK (0 + 4) + +// #define PIN_PWR_EN (0 + 6) + +// To debug via the segger JLINK console rather than the CDC-ACM serial device +// #define USE_SEGGER + +// Battery +// The battery sense is hooked to pin A0 (4) +// it is defined in the anlaolgue pin section of this file +// and has 12 bit resolution + +#define ADC_CTRL 32+2 +#define ADC_CTRL_ENABLED HIGH +#define BATTERY_PIN 29 +#define ADC_RESOLUTION 14 + +#define BATTERY_SENSE_RESOLUTION_BITS 12 +#define BATTERY_SENSE_RESOLUTION 4096.0 +#undef AREF_VOLTAGE +#define AREF_VOLTAGE 3.0 +#define VBAT_AR_INTERNAL AR_INTERNAL_3_0 +#define ADC_MULTIPLIER (4.90F) + +#undef HAS_GPS +#define HAS_GPS 0 +#define HAS_RTC 0 +#ifdef __cplusplus +} +#endif + + +#endif \ No newline at end of file From 4e30023a4bd9a010d2f2b34d103897278ff898b4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 06:41:33 -0500 Subject: [PATCH 077/100] [create-pull-request] automated change (#6589) Co-authored-by: fifieldt <1287116+fifieldt@users.noreply.github.com> --- protobufs | 2 +- src/mesh/generated/meshtastic/mesh.pb.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/protobufs b/protobufs index 5a5ab103d..f9aa5cfd0 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 5a5ab103d2f6aa071fca29417475681a2cec5dcf +Subproject commit f9aa5cfd08cf14917fce54e5ebc0441b35ce32b3 diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index 191f9e121..46f9d8315 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -239,6 +239,8 @@ typedef enum _meshtastic_HardwareModel { meshtastic_HardwareModel_HELTEC_SENSOR_HUB = 92, /* Reserved Fried Chicken ID for future use */ meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN = 93, + /* Heltec Magnetic Power Bank with Meshtastic compatible */ + meshtastic_HardwareModel_HELTEC_MESH_POCKET = 94, /* ------------------------------------------------------------------------------------------------------------------------------------------ Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. ------------------------------------------------------------------------------------------------------------------------------------------ */ From ecd9f015d8f079a0170a06afdc1243655f5867db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 06:41:52 -0500 Subject: [PATCH 078/100] chore(deps): update meshtastic-device-ui digest to da8fb5e (#6593) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index f22d92b2e..cb36e412e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -108,7 +108,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/3fde170dca16863218cec133e05c5f2fc8d6e59a.zip + https://github.com/meshtastic/device-ui/archive/da8fb5eaac7874c31508fad5252999ec82c02498.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino) From 040a34fca8cd0a9581d575c3bf344e8fd82ddf84 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Tue, 15 Apr 2025 10:50:24 -0500 Subject: [PATCH 079/100] Switch to actually maintained thingsboard pubsubclient (#5204) * Switch to actually maintained thingsboard pubsubclient * .0 * TBPubSubClient * SetBufferSize is split into Send and Receive. * Update TBPubSubClient to 2.11 * Update platformio.ini Co-authored-by: Austin * Re-add setBufferSize fix --------- Co-authored-by: Tom Fifield Co-authored-by: Austin --- platformio.ini | 4 ++-- src/mqtt/MQTT.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index cb36e412e..85505d63a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -93,8 +93,8 @@ build_src_filter = ${env.build_src_filter} - - Date: Wed, 16 Apr 2025 07:37:09 +1000 Subject: [PATCH 080/100] Trunk fixes for heltec mesh pocket. (#6588) https://github.com/meshtastic/firmware/pull/6533 was merged without running trunk. This patch fixes the newly introduced trunk errors. --- boards/heltec_mesh_pocket.json | 99 +++++++++---------- src/graphics/EInkDisplay2.cpp | 2 +- .../niche/Drivers/EInk/LCMEN2R13ECC1.cpp | 22 ++--- .../niche/Drivers/EInk/LCMEN2R13ECC1.h | 10 +- variants/heltec_mesh_pocket/nicheGraphics.h | 2 +- variants/heltec_mesh_pocket/variant.cpp | 2 - variants/heltec_mesh_pocket/variant.h | 27 +++-- 7 files changed, 79 insertions(+), 85 deletions(-) diff --git a/boards/heltec_mesh_pocket.json b/boards/heltec_mesh_pocket.json index a35387857..e078c860c 100644 --- a/boards/heltec_mesh_pocket.json +++ b/boards/heltec_mesh_pocket.json @@ -1,54 +1,53 @@ { - "build": { - "arduino": { - "ldscript": "nrf52840_s140_v6.ld" - }, - "core": "nRF5", - "cpu": "cortex-m4", - "extra_flags": "-DNRF52840_XXAA", - "f_cpu": "64000000L", - "hwids": [ - ["0x239A", "0x4405"], - ["0x239A", "0x0029"], - ["0x239A", "0x002A"] - ], - "usb_product": "HT-n5262", - "mcu": "nrf52840", - "variant": "heltec_mesh_pocket", - "variants_dir": "variants", - "bsp": { - "name": "adafruit" - }, - "softdevice": { - "sd_flags": "-DS140", - "sd_name": "s140", - "sd_version": "6.1.1", - "sd_fwid": "0x00B6" - }, - "bootloader": { - "settings_addr": "0xFF000" - } + "build": { + "arduino": { + "ldscript": "nrf52840_s140_v6.ld" }, - "connectivity": ["bluetooth"], - "debug": { - "jlink_device": "nRF52840_xxAA", - "onboard_tools": ["jlink"], - "svd_path": "nrf52840.svd", - "openocd_target": "nrf52840-mdk-rs" + "core": "nRF5", + "cpu": "cortex-m4", + "extra_flags": "-DNRF52840_XXAA", + "f_cpu": "64000000L", + "hwids": [ + ["0x239A", "0x4405"], + ["0x239A", "0x0029"], + ["0x239A", "0x002A"] + ], + "usb_product": "HT-n5262", + "mcu": "nrf52840", + "variant": "heltec_mesh_pocket", + "variants_dir": "variants", + "bsp": { + "name": "adafruit" }, - "frameworks": ["arduino"], - "name": "Heltec nrf (Adafruit BSP)", - "upload": { - "maximum_ram_size": 248832, - "maximum_size": 815104, - "speed": 115200, - "protocol": "nrfutil", - "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"], - "use_1200bps_touch": true, - "require_upload_port": true, - "wait_for_upload_port": true + "softdevice": { + "sd_flags": "-DS140", + "sd_name": "s140", + "sd_version": "6.1.1", + "sd_fwid": "0x00B6" }, - "url": "https://heltec.org/project/meshpocket/", - "vendor": "Heltec" - } - \ No newline at end of file + "bootloader": { + "settings_addr": "0xFF000" + } + }, + "connectivity": ["bluetooth"], + "debug": { + "jlink_device": "nRF52840_xxAA", + "onboard_tools": ["jlink"], + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52840-mdk-rs" + }, + "frameworks": ["arduino"], + "name": "Heltec nrf (Adafruit BSP)", + "upload": { + "maximum_ram_size": 248832, + "maximum_size": 815104, + "speed": 115200, + "protocol": "nrfutil", + "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"], + "use_1200bps_touch": true, + "require_upload_port": true, + "wait_for_upload_port": true + }, + "url": "https://heltec.org/project/meshpocket/", + "vendor": "Heltec" +} diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp index 737fcc3f0..5a2749482 100644 --- a/src/graphics/EInkDisplay2.cpp +++ b/src/graphics/EInkDisplay2.cpp @@ -219,7 +219,7 @@ bool EInkDisplay::connect() } #elif defined(HELTEC_MESH_POCKET) { - spi1=&SPI1; + spi1 = &SPI1; spi1->begin(); // VExt already enabled in setup() // RTC GPIO hold disabled in setup() diff --git a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp index 5e21c00f6..e9a663f80 100644 --- a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp +++ b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp @@ -23,16 +23,16 @@ void LCMEN2R13ECC1::configScanning() void LCMEN2R13ECC1::configWaveform() { switch (updateType) { - case FAST: - sendCommand(0x3C); // Border waveform: - sendData(0x85); - break; - - case FULL: - default: - // From OTP memory - break; - } + case FAST: + sendCommand(0x3C); // Border waveform: + sendData(0x85); + break; + + case FULL: + default: + // From OTP memory + break; + } } void LCMEN2R13ECC1::configUpdateSequence() @@ -65,4 +65,4 @@ void LCMEN2R13ECC1::detachFromUpdate() } } -#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file +#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS \ No newline at end of file diff --git a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h index 7b0aed282..b78e3bcca 100644 --- a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h +++ b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h @@ -28,13 +28,13 @@ class LCMEN2R13ECC1 : public SSD16XX static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST); public: - LCMEN2R13ECC1() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte + LCMEN2R13ECC1() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte protected: - virtual void configScanning() override; - virtual void configWaveform() override; - virtual void configUpdateSequence() override; - void detachFromUpdate() override; + virtual void configScanning() override; + virtual void configWaveform() override; + virtual void configUpdateSequence() override; + void detachFromUpdate() override; }; } // namespace NicheGraphics::Drivers diff --git a/variants/heltec_mesh_pocket/nicheGraphics.h b/variants/heltec_mesh_pocket/nicheGraphics.h index 352a9bc47..b697faa57 100644 --- a/variants/heltec_mesh_pocket/nicheGraphics.h +++ b/variants/heltec_mesh_pocket/nicheGraphics.h @@ -34,7 +34,7 @@ void setupNicheGraphics() // SPI // ----------------------------- - SPIClass *spi1=&SPI1; + SPIClass *spi1 = &SPI1; spi1->begin(); // Display is connected to SPI1 diff --git a/variants/heltec_mesh_pocket/variant.cpp b/variants/heltec_mesh_pocket/variant.cpp index 20ba5f2ae..bdded700b 100644 --- a/variants/heltec_mesh_pocket/variant.cpp +++ b/variants/heltec_mesh_pocket/variant.cpp @@ -9,5 +9,3 @@ const uint32_t g_ADigitalPinMap[] = { // P1 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47}; - - diff --git a/variants/heltec_mesh_pocket/variant.h b/variants/heltec_mesh_pocket/variant.h index 89f06f358..79f47bd0e 100644 --- a/variants/heltec_mesh_pocket/variant.h +++ b/variants/heltec_mesh_pocket/variant.h @@ -49,16 +49,16 @@ No longer populated on PCB */ #define WIRE_INTERFACES_COUNT 1 -#define PIN_WIRE_SDA (32+15) -#define PIN_WIRE_SCL (32+13) +#define PIN_WIRE_SDA (32 + 15) +#define PIN_WIRE_SCL (32 + 13) /* * Lora radio */ #define USE_SX1262 -#define SX126X_CS (0 + 26) // FIXME - we really should define LORA_CS instead -#define LORA_CS (0 + 26) +#define SX126X_CS (0 + 26) // FIXME - we really should define LORA_CS instead +#define LORA_CS (0 + 26) #define SX126X_DIO1 (0 + 16) // Note DIO2 is attached internally to the module to an analog switch for TX/RX switching // #define SX1262_DIO3 (0 + 21) @@ -72,25 +72,23 @@ No longer populated on PCB #define SX126X_DIO3_TCXO_VOLTAGE 1.8 // Display (E-Ink) -#define PIN_EINK_CS 24 -#define PIN_EINK_BUSY 32+6 -#define PIN_EINK_DC 31 -#define PIN_EINK_RES 32+4 +#define PIN_EINK_CS 24 +#define PIN_EINK_BUSY 32 + 6 +#define PIN_EINK_DC 31 +#define PIN_EINK_RES 32 + 4 #define PIN_EINK_SCLK 22 #define PIN_EINK_MOSI 20 - #define PIN_SPI1_MISO -1 #define PIN_SPI1_MOSI PIN_EINK_MOSI #define PIN_SPI1_SCK PIN_EINK_SCLK - /* * GPS pins */ -#define PIN_SERIAL1_RX 32+5 -#define PIN_SERIAL1_TX 32+7 +#define PIN_SERIAL1_RX 32 + 5 +#define PIN_SERIAL1_TX 32 + 7 /* * SPI Interfaces @@ -112,7 +110,7 @@ No longer populated on PCB // it is defined in the anlaolgue pin section of this file // and has 12 bit resolution -#define ADC_CTRL 32+2 +#define ADC_CTRL 32 + 2 #define ADC_CTRL_ENABLED HIGH #define BATTERY_PIN 29 #define ADC_RESOLUTION 14 @@ -124,12 +122,11 @@ No longer populated on PCB #define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define ADC_MULTIPLIER (4.90F) -#undef HAS_GPS +#undef HAS_GPS #define HAS_GPS 0 #define HAS_RTC 0 #ifdef __cplusplus } #endif - #endif \ No newline at end of file From 7e8294dfad233e883c58005cff549812587145ff Mon Sep 17 00:00:00 2001 From: Kalle Lilja <15094562+ThatKalle@users.noreply.github.com> Date: Wed, 16 Apr 2025 00:57:21 +0200 Subject: [PATCH 081/100] FlatHub: bump metainfo.xml on release (#6578) * add bump_metainfo.py * bump org.meshtastic.meshtasticd.metainfo.xml on release * update bump-version job to trigger on published * use defusedxml.ElementTree parse * move bump_metainfo, use requirements.txt * add bin/bump_metainfo/requirements.txt to renovate * Switch to short version string * Bump version.properties to 2.6.6 * change version format * remove url * Add url back in * Update url format * manual add 2.6.6 * consolidate into one PR * update run steps * add ability to add date if missing * update pull request title * add comments * remove quote changes --------- Co-authored-by: Austin --- .github/workflows/release_channels.yml | 32 ++++++--- bin/bump_metainfo/bump_metainfo.py | 72 +++++++++++++++++++++ bin/bump_metainfo/requirements.txt | 1 + bin/org.meshtastic.meshtasticd.metainfo.xml | 10 ++- renovate.json | 3 + version.properties | 2 +- 6 files changed, 109 insertions(+), 11 deletions(-) create mode 100755 bin/bump_metainfo/bump_metainfo.py create mode 100644 bin/bump_metainfo/requirements.txt diff --git a/.github/workflows/release_channels.yml b/.github/workflows/release_channels.yml index 710e8e51d..eece12346 100644 --- a/.github/workflows/release_channels.yml +++ b/.github/workflows/release_channels.yml @@ -46,11 +46,14 @@ jobs: # Create a PR to bump version when a release is Published bump-version: - if: ${{ github.event.release.published }} + if: github.event.action == 'published' runs-on: ubuntu-latest permissions: pull-requests: write contents: write + defaults: + run: + shell: bash steps: - name: Checkout uses: actions/checkout@v4 @@ -63,29 +66,42 @@ jobs: - name: Get release version string run: | echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT + echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT id: version env: BUILD_LOCATION: local - name: Bump version.properties - run: >- - bin/bump_version.py + run: | + # Bump version.properties + chmod +x ./bin/bump_version.py + ./bin/bump_version.py - name: Ensure debian deps are installed - shell: bash run: | sudo apt-get update -y --fix-missing sudo apt-get install -y devscripts - name: Update debian changelog - run: >- - debian/ci_changelog.sh + run: | + # Update debian changelog + chmod +x ./debian/ci_changelog.sh + ./debian/ci_changelog.sh - - name: Create version.properties pull request + - name: Bump org.meshtastic.meshtasticd.metainfo.xml + run: | + # Bump org.meshtastic.meshtasticd.metainfo.xml + pip install -r bin/bump_metainfo/requirements.txt -q + chmod +x ./bin/bump_metainfo/bump_metainfo.py + ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.version.outputs.short }}" + + - name: Create Bumps pull request uses: peter-evans/create-pull-request@v7 with: - title: Bump version.properties + title: Bump release version + commit-message: automated bumps add-paths: | version.properties debian/changelog + bin/org.meshtastic.meshtasticd.metainfo.xml diff --git a/bin/bump_metainfo/bump_metainfo.py b/bin/bump_metainfo/bump_metainfo.py new file mode 100755 index 000000000..290cbae79 --- /dev/null +++ b/bin/bump_metainfo/bump_metainfo.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python3 +import argparse +import xml.etree.ElementTree as ET +from defusedxml.ElementTree import parse +from datetime import datetime, timezone + + +# Indent by 2 spaces to align with xml formatting. +def indent(elem, level=0): + i = "\n" + level * " " + if len(elem): + if not elem.text or not elem.text.strip(): + elem.text = i + " " + for child in elem: + indent(child, level + 1) + if not child.tail or not child.tail.strip(): + child.tail = i + if level and (not elem.tail or not elem.tail.strip()): + elem.tail = i + + +def main(): + parser = argparse.ArgumentParser( + description="Prepend new release entry to metainfo.xml file.") + parser.add_argument("--file", help="Path to the metainfo.xml file", + default="org.meshtastic.meshtasticd.metainfo.xml") + parser.add_argument("version", help="Version string (e.g. 2.6.4)") + parser.add_argument("--date", help="Release date (YYYY-MM-DD), defaults to today", + default=datetime.now(timezone.utc).date().isoformat()) + + args = parser.parse_args() + + tree = parse(args.file) + root = tree.getroot() + + releases = root.find('releases') + if releases is None: + raise RuntimeError(" element not found in XML.") + + existing_versions = { + release.get('version'): release + for release in releases.findall('release') + } + existing_release = existing_versions.get(args.version) + + if existing_release is not None: + if not existing_release.get('date'): + print(f"Version {args.version} found without date. Adding date...") + existing_release.set('date', args.date) + else: + print( + f"Version {args.version} is already present with date, skipping insertion.") + else: + new_release = ET.Element('release', { + 'version': args.version, + 'date': args.date + }) + url = ET.SubElement(new_release, 'url', {'type': 'details'}) + url.text = f"https://github.com/meshtastic/firmware/releases?q=tag%3Av{args.version}" + + releases.insert(0, new_release) + + indent(releases, level=1) + releases.tail = "\n" + + print(f"Inserted new release: {args.version}") + + tree.write(args.file, encoding='UTF-8', xml_declaration=True) + + +if __name__ == "__main__": + main() diff --git a/bin/bump_metainfo/requirements.txt b/bin/bump_metainfo/requirements.txt new file mode 100644 index 000000000..09dd20d24 --- /dev/null +++ b/bin/bump_metainfo/requirements.txt @@ -0,0 +1 @@ +defusedxml==0.7.1 diff --git a/bin/org.meshtastic.meshtasticd.metainfo.xml b/bin/org.meshtastic.meshtasticd.metainfo.xml index a9e6cbdf5..cb921fcb3 100644 --- a/bin/org.meshtastic.meshtasticd.metainfo.xml +++ b/bin/org.meshtastic.meshtasticd.metainfo.xml @@ -87,8 +87,14 @@ - - https://github.com/meshtastic/firmware/releases/tag/v2.6.4.b89355f + + https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.6 + + + https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.5 + + + https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.4 \ No newline at end of file diff --git a/renovate.json b/renovate.json index bf6ffdd4b..11d35aff8 100644 --- a/renovate.json +++ b/renovate.json @@ -13,6 +13,9 @@ "git-submodules": { "enabled": true }, + "pip_requirements": { + "fileMatch": ["bin/bump_metainfo/requirements.txt"] + }, "commitMessageTopic": "{{depName}}", "labels": ["dependencies"], "customDatasources": { diff --git a/version.properties b/version.properties index 0b46aeec6..8f5953fdc 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 6 -build = 5 +build = 6 From cf5c8de92e21acf7b5814225b225ceac7d87553b Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Wed, 16 Apr 2025 13:33:44 +1200 Subject: [PATCH 082/100] Fix spurious button presses on some T-Echos (#6590) Co-authored-by: Ben Meadors --- src/graphics/niche/Inputs/TwoButton.cpp | 2 +- src/mesh/RadioLibInterface.cpp | 8 ++++++++ src/mesh/RadioLibInterface.h | 5 +++++ variants/t-echo/nicheGraphics.h | 19 +++++++++++++++++-- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/graphics/niche/Inputs/TwoButton.cpp b/src/graphics/niche/Inputs/TwoButton.cpp index 1e91d9080..bd29f981d 100644 --- a/src/graphics/niche/Inputs/TwoButton.cpp +++ b/src/graphics/niche/Inputs/TwoButton.cpp @@ -181,7 +181,7 @@ void TwoButton::isrSecondary() void TwoButton::startThread() { if (!OSThread::enabled) { - OSThread::setInterval(50); + OSThread::setInterval(10); OSThread::enabled = true; } } diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp index a6faebff4..e3ef58f14 100644 --- a/src/mesh/RadioLibInterface.cpp +++ b/src/mesh/RadioLibInterface.cpp @@ -210,6 +210,14 @@ bool RadioLibInterface::canSleep() return res; } +/** Allow other firmware components to ask whether we are currently sending a packet +Initially implemented to protect T-Echo's capacitive touch button from spurious presses during tx +*/ +bool RadioLibInterface::isSending() +{ + return sendingPacket != NULL; +} + /** Attempt to cancel a previously sent packet. Returns true if a packet was found we could cancel */ bool RadioLibInterface::cancelSending(NodeNum from, PacketId id) { diff --git a/src/mesh/RadioLibInterface.h b/src/mesh/RadioLibInterface.h index b24879eaf..9622bd625 100644 --- a/src/mesh/RadioLibInterface.h +++ b/src/mesh/RadioLibInterface.h @@ -132,6 +132,11 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified */ virtual bool isActivelyReceiving() = 0; + /** Are we are currently sending a packet? + * This method is public, intending to expose this information to other firmware components + */ + virtual bool isSending(); + /** Attempt to cancel a previously sent packet. Returns true if a packet was found we could cancel */ virtual bool cancelSending(NodeNum from, PacketId id) override; diff --git a/variants/t-echo/nicheGraphics.h b/variants/t-echo/nicheGraphics.h index 5862dcdfb..af310db25 100644 --- a/variants/t-echo/nicheGraphics.h +++ b/variants/t-echo/nicheGraphics.h @@ -29,6 +29,12 @@ #include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h" #include +// Special case - fix T-Echo's touch button +// ---------------------------------------- +// On a handful of T-Echos, LoRa TX triggers the capacitive touch +// To avoid this, we lockout the button during TX +#include "mesh/RadioLibInterface.h" + void setupNicheGraphics() { using namespace NicheGraphics; @@ -115,13 +121,22 @@ void setupNicheGraphics() buttons->setWiring(TOUCH_BUTTON, PIN_BUTTON_TOUCH); buttons->setTiming(TOUCH_BUTTON, 50, 5000); // 5 seconds before latch - limited by T-Echo's capacitive touch IC buttons->setHandlerDown(TOUCH_BUTTON, [backlight]() { + // Discard the button press if radio is active + // Rare hardware fault: LoRa activity triggers touch button + if (!RadioLibInterface::instance || RadioLibInterface::instance->isSending()) + return; + + // Backlight on (while held) backlight->peek(); - InkHUD::InkHUD::getInstance()->persistence->settings.optionalMenuItems.backlight = - false; // We've proved user still has the button. No need to make backlight togglable via the menu. + + // Handler has run, which confirms touch button wasn't removed as part of DIY build. + // No longer need the fallback backlight toggle in menu. + InkHUD::InkHUD::getInstance()->persistence->settings.optionalMenuItems.backlight = false; }); buttons->setHandlerLongPress(TOUCH_BUTTON, [backlight]() { backlight->latch(); }); buttons->setHandlerShortPress(TOUCH_BUTTON, [backlight]() { backlight->off(); }); + // Begin handling button events buttons->start(); } From 1138f74e2c025852534cd529248de45e6a6347ac Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Wed, 16 Apr 2025 03:39:13 +0200 Subject: [PATCH 083/100] fix: set upload_speed for tlora_v1_3 & tlora_v2_1_16 (#6595) --- variants/tlora_v1_3/platformio.ini | 3 ++- variants/tlora_v2_1_16/platformio.ini | 3 ++- variants/tlora_v2_1_16_tcxo/platformio.ini | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/variants/tlora_v1_3/platformio.ini b/variants/tlora_v1_3/platformio.ini index 99df28e56..c5eca589f 100644 --- a/variants/tlora_v1_3/platformio.ini +++ b/variants/tlora_v1_3/platformio.ini @@ -3,4 +3,5 @@ board_level = extra extends = esp32_base board = ttgo-lora32-v1 build_flags = - ${esp32_base.build_flags} -D TLORA_V1_3 -I variants/tlora_v1_3 \ No newline at end of file + ${esp32_base.build_flags} -D TLORA_V1_3 -I variants/tlora_v1_3 +upload_speed = 115200 \ No newline at end of file diff --git a/variants/tlora_v2_1_16/platformio.ini b/variants/tlora_v2_1_16/platformio.ini index 351f71676..4253cc6af 100644 --- a/variants/tlora_v2_1_16/platformio.ini +++ b/variants/tlora_v2_1_16/platformio.ini @@ -4,4 +4,5 @@ board = ttgo-lora32-v21 board_check = true build_flags = ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/tlora_v2_1_16 - -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely. \ No newline at end of file + -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely. +upload_speed = 115200 \ No newline at end of file diff --git a/variants/tlora_v2_1_16_tcxo/platformio.ini b/variants/tlora_v2_1_16_tcxo/platformio.ini index 538fd81b0..5c7cb7eb3 100644 --- a/variants/tlora_v2_1_16_tcxo/platformio.ini +++ b/variants/tlora_v2_1_16_tcxo/platformio.ini @@ -7,4 +7,5 @@ build_flags = -D TLORA_V2_1_16 -I variants/tlora_v2_1_16 -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely. - -D LORA_TCXO_GPIO=33 \ No newline at end of file + -D LORA_TCXO_GPIO=33 +upload_speed = 115200 \ No newline at end of file From 447703197174d38e5326cdd70e3edaa0276bb82a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 09:46:06 +0200 Subject: [PATCH 084/100] [create-pull-request] automated change (#6599) --- protobufs | 2 +- src/mesh/generated/meshtastic/mesh.pb.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/protobufs b/protobufs index f9aa5cfd0..b982b36df 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit f9aa5cfd08cf14917fce54e5ebc0441b35ce32b3 +Subproject commit b982b36dfab2e96b8f8be90af891c68ebf8790c2 diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index 46f9d8315..36bded9b2 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -241,6 +241,8 @@ typedef enum _meshtastic_HardwareModel { meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN = 93, /* Heltec Magnetic Power Bank with Meshtastic compatible */ meshtastic_HardwareModel_HELTEC_MESH_POCKET = 94, + /* Seeed Solar Node */ + meshtastic_HardwareModel_SEEED_SOLAR_NODE = 95, /* ------------------------------------------------------------------------------------------------------------------------------------------ Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. ------------------------------------------------------------------------------------------------------------------------------------------ */ From 64c8bde04a222aea6694d40897b3f5db996ce4bf Mon Sep 17 00:00:00 2001 From: Benjamin Kyd Date: Wed, 16 Apr 2025 09:12:23 +0100 Subject: [PATCH 085/100] Update platformio.ini to exclude unused modules from t1000-e (#6584) * Update platformio.ini to exclude unused modules * Add No EXT GPIO flag and also correct some exclusions in main * CANNEDMSG != CANNEDMESSAGES * Remove NO_EXT_GPIO --- src/main.cpp | 8 ++++---- variants/tracker-t1000-e/platformio.ini | 6 +++++- variants/tracker-t1000-e/variant.h | 4 +++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index bfbd73a43..535a7afa1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1310,7 +1310,7 @@ extern meshtastic_DeviceMetadata getDeviceMetadata() deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AUDIO_CONFIG; #endif // Option to explicitly include canned messages for edge cases, e.g. niche graphics -#if (!HAS_SCREEN && NO_EXT_GPIO) && !MESHTASTIC_INCLUDE_CANNEDMSG +#if (!HAS_SCREEN || NO_EXT_GPIO) || MESHTASTIC_EXCLUDE_CANNEDMESSAGES deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_CANNEDMSG_CONFIG; #endif #if NO_EXT_GPIO @@ -1318,11 +1318,11 @@ extern meshtastic_DeviceMetadata getDeviceMetadata() #endif // Only edge case here is if we apply this a device with built in Accelerometer and want to detect interrupts // We'll have to macro guard against those targets potentially -#if NO_EXT_GPIO +#if NO_EXT_GPIO || MESHTASTIC_EXCLUDE_DETECTIONSENSOR deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_DETECTIONSENSOR_CONFIG; #endif -// If we don't have any GPIO and we don't have GPS, no purpose in having serial config -#if NO_EXT_GPIO && NO_GPS +// If we don't have any GPIO and we don't have GPS OR we don't want too - no purpose in having serial config +#if NO_EXT_GPIO && NO_GPS || MESHTASTIC_EXCLUDE_SERIAL deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_SERIAL_CONFIG; #endif #ifndef ARCH_ESP32 diff --git a/variants/tracker-t1000-e/platformio.ini b/variants/tracker-t1000-e/platformio.ini index 8c3c97e6c..64da61434 100644 --- a/variants/tracker-t1000-e/platformio.ini +++ b/variants/tracker-t1000-e/platformio.ini @@ -5,6 +5,10 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/plat -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" -DGPS_POWER_TOGGLE -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1 + -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 + -DMESHTASTIC_EXCLUDE_SCREEN=1 + -DMESHTASTIC_EXCLUDE_DETECTIONSENSOR=1 + -DMESHTASTIC_EXCLUDE_WIFI=1 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld build_src_filter = ${nrf52_base.build_src_filter} +<../variants/tracker-t1000-e> lib_deps = @@ -12,4 +16,4 @@ lib_deps = https://github.com/meshtastic/QMA6100P_Arduino_Library/archive/14c900b8b2e4feaac5007a7e41e0c1b7f0841136.zip debug_tool = jlink ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm) -upload_protocol = nrfutil \ No newline at end of file +upload_protocol = nrfutil diff --git a/variants/tracker-t1000-e/variant.h b/variants/tracker-t1000-e/variant.h index 0d98a3033..81b4ef3fb 100644 --- a/variants/tracker-t1000-e/variant.h +++ b/variants/tracker-t1000-e/variant.h @@ -152,6 +152,8 @@ extern "C" { #define T1000X_NTC_PIN (0 + 31) // P0.31/AIN7 #define T1000X_LUX_PIN (0 + 29) // P0.29/AIN5 +#define HAS_SCREEN 0 + #ifdef __cplusplus } #endif @@ -160,4 +162,4 @@ extern "C" { * Arduino objects - C++ only *----------------------------------------------------------------------------*/ -#endif // _VARIANT_TRACKER_T1000_E_ \ No newline at end of file +#endif // _VARIANT_TRACKER_T1000_E_ From e5cd0d613cc2cdf643e162cda80aa9d24af3b4f8 Mon Sep 17 00:00:00 2001 From: "Aaron.Lee" <32860565+Heltec-Aaron-Lee@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:20:12 +0800 Subject: [PATCH 086/100] Make startup screen show the short ID (#6591) * Update the short ID show on the boot up screen function --- .../InkHUD/Applets/System/Logo/LogoApplet.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp index 520b3ef65..89bdb0bc7 100644 --- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp +++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp @@ -11,10 +11,19 @@ InkHUD::LogoApplet::LogoApplet() : concurrency::OSThread("LogoApplet") OSThread::setIntervalFromNow(8 * 1000UL); OSThread::enabled = true; - textLeft = ""; - textRight = ""; - textTitle = xstr(APP_VERSION_SHORT); - fontTitle = fontSmall; + // During onboarding, show the default short name as well as the version string + // This behavior assists manufacturers during mass production, and should not be modified without good reason + if (!settings->tips.safeShutdownSeen) { + fontTitle = fontLarge; + textLeft = xstr(APP_VERSION_SHORT); + textRight = owner.short_name; + textTitle = "Meshtastic"; + } else { + fontTitle = fontSmall; + textLeft = ""; + textRight = ""; + textTitle = xstr(APP_VERSION_SHORT); + } bringToForeground(); // This is then drawn with a FULL refresh by Renderer::begin From 5699d8632ef27d527e6907735208cbdec51d1de2 Mon Sep 17 00:00:00 2001 From: Austin Date: Wed, 16 Apr 2025 05:21:31 -0400 Subject: [PATCH 087/100] Debian: use native-tft compile target (#6580) --- debian/ci_pack_sdeb.sh | 4 ++-- debian/control | 5 ++++- debian/meshtasticd.install | 10 +++++----- debian/rules | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/ci_pack_sdeb.sh b/debian/ci_pack_sdeb.sh index c0cea0010..81e681e0c 100755 --- a/debian/ci_pack_sdeb.sh +++ b/debian/ci_pack_sdeb.sh @@ -5,8 +5,8 @@ export PLATFORMIO_PACKAGES_DIR=pio/packages export PLATFORMIO_CORE_DIR=pio/core # Download libraries to `pio` -platformio pkg install -e native -platformio pkg install -e native -t platformio/tool-scons@4.40502.0 +platformio pkg install -e native-tft +platformio pkg install -e native-tft -t platformio/tool-scons@4.40502.0 # Compress `pio` directory to prevent dh_clean from sanitizing it tar -cf pio.tar pio/ rm -rf pio diff --git a/debian/control b/debian/control index 693cd6aa5..9277f6f54 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,10 @@ Build-Depends: debhelper-compat (= 13), openssl, libssl-dev, libulfius-dev, - liborcania-dev + liborcania-dev, + libx11-dev, + libinput-dev, + libxkbcommon-x11-dev Standards-Version: 4.6.2 Homepage: https://github.com/meshtastic/firmware Rules-Requires-Root: no diff --git a/debian/meshtasticd.install b/debian/meshtasticd.install index da1b0685d..6b6b5a361 100644 --- a/debian/meshtasticd.install +++ b/debian/meshtasticd.install @@ -1,8 +1,8 @@ -.pio/build/native/meshtasticd usr/sbin +.pio/build/native-tft/meshtasticd usr/sbin -bin/config.yaml etc/meshtasticd -bin/config.d/* etc/meshtasticd/available.d +bin/config.yaml etc/meshtasticd +bin/config.d/* etc/meshtasticd/available.d -bin/meshtasticd.service lib/systemd/system +bin/meshtasticd.service lib/systemd/system -web/* usr/share/meshtasticd/web \ No newline at end of file +web/* usr/share/meshtasticd/web \ No newline at end of file diff --git a/debian/rules b/debian/rules index 0612ba352..0b5d1ac57 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ override_dh_auto_build: mkdir -p web && tar -xf web.tar -C web gunzip web/ -r # Build with platformio - $(PIO_ENV) platformio run -e native + $(PIO_ENV) platformio run -e native-tft # Move the binary and default config to the correct name - mv .pio/build/native/program .pio/build/native/meshtasticd + mv .pio/build/native-tft/program .pio/build/native-tft/meshtasticd cp bin/config-dist.yaml bin/config.yaml From 4a9a59342a3f6227fb8f48807314e1bbb2b6f650 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Wed, 16 Apr 2025 11:23:52 +0200 Subject: [PATCH 088/100] Create lora-piggystick-lr1121.yaml (#6600) --- bin/config.d/lora-piggystick-lr1121.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 bin/config.d/lora-piggystick-lr1121.yaml diff --git a/bin/config.d/lora-piggystick-lr1121.yaml b/bin/config.d/lora-piggystick-lr1121.yaml new file mode 100644 index 000000000..348db61b1 --- /dev/null +++ b/bin/config.d/lora-piggystick-lr1121.yaml @@ -0,0 +1,11 @@ +Lora: + Module: lr1121 + CS: 0 + IRQ: 6 + Reset: 2 + Busy: 4 + spidev: ch341 + DIO3_TCXO_VOLTAGE: 1.8 +# USB_Serialnum: 12345678 + USB_PID: 0x5512 + USB_VID: 0x1A86 From e0dafc3618ae8ce6c115caafdd7a1f68fdb94df6 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Wed, 16 Apr 2025 13:15:16 +0200 Subject: [PATCH 089/100] fix: set upload_speed for tlora_v1 (#6601) --- variants/tlora_v1/platformio.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/variants/tlora_v1/platformio.ini b/variants/tlora_v1/platformio.ini index 65ec4bcdc..17fc71d72 100644 --- a/variants/tlora_v1/platformio.ini +++ b/variants/tlora_v1/platformio.ini @@ -3,4 +3,5 @@ board_level = extra extends = esp32_base board = ttgo-lora32-v1 build_flags = - ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1 \ No newline at end of file + ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1 +upload_speed = 115200 \ No newline at end of file From 816d948ee53d9125001945963a5cd9fe800ae980 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 06:15:33 -0500 Subject: [PATCH 090/100] Upgrade trunk (#6592) Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com> --- .trunk/trunk.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 01e8f8d1b..60e422312 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -8,7 +8,7 @@ plugins: uri: https://github.com/trunk-io/plugins lint: enabled: - - renovate@39.238.1 + - renovate@39.243.0 - prettier@3.5.3 - trufflehog@3.88.23 - yamllint@1.37.0 @@ -28,7 +28,7 @@ lint: - shellcheck@0.10.0 - black@25.1.0 - git-diff-check - - gitleaks@8.24.2 + - gitleaks@8.24.3 - clang-format@16.0.3 ignore: - linters: [ALL] From 5fd64d41143c3ef33d1f5e584f6964e39b806ac4 Mon Sep 17 00:00:00 2001 From: Benjamin Kyd Date: Wed, 16 Apr 2025 20:42:08 +0100 Subject: [PATCH 091/100] Fix uninitialised memory read (adminModule) (#6605) --- src/graphics/Screen.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 8075dd468..9afd88c76 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1796,7 +1796,9 @@ void Screen::setup() powerStatusObserver.observe(&powerStatus->onNewStatus); gpsStatusObserver.observe(&gpsStatus->onNewStatus); nodeStatusObserver.observe(&nodeStatus->onNewStatus); +#if !MESHTASTIC_EXCLUDE_ADMIN adminMessageObserver.observe(adminModule); +#endif if (textMessageModule) textMessageObserver.observe(textMessageModule); if (inputBroker) @@ -2857,4 +2859,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg) } // namespace graphics #else graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {} -#endif // HAS_SCREEN \ No newline at end of file +#endif // HAS_SCREEN From d74359abf0d07d66b893f1e1366f7d5dd21364ee Mon Sep 17 00:00:00 2001 From: dylanli Date: Thu, 17 Apr 2025 14:11:17 +0800 Subject: [PATCH 092/100] add support for Seeed solar panel (#6597) * add seeed_solar_node * fix RF_SW problem * fix IIC problem * Update Button redefination * Add on-board flash pin defination * fix missing a ',' * update seeed sorlar panel defination * fix word spell * fix upstream change * fix upstream change * fix upstream change * fix formate * Restore the FLASH definition that was deleted by mistake and pull down the CS pin to ensure low power consumption * fix led defination conflict * Delete lib/device-ui directory * Restore protobufs submodule --------- Co-authored-by: WayenWeng --- boards/Seeed_Solar_Node.json | 54 ++++++++ src/platform/nrf52/architecture.h | 4 +- variants/Seeed_Solar_Node/platformio.ini | 14 ++ variants/Seeed_Solar_Node/variant.cpp | 108 ++++++++++++++++ variants/Seeed_Solar_Node/variant.h | 157 +++++++++++++++++++++++ 5 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 boards/Seeed_Solar_Node.json create mode 100644 variants/Seeed_Solar_Node/platformio.ini create mode 100644 variants/Seeed_Solar_Node/variant.cpp create mode 100644 variants/Seeed_Solar_Node/variant.h diff --git a/boards/Seeed_Solar_Node.json b/boards/Seeed_Solar_Node.json new file mode 100644 index 000000000..e1b502cfa --- /dev/null +++ b/boards/Seeed_Solar_Node.json @@ -0,0 +1,54 @@ +{ + "build": { + "arduino": { + "ldscript": "nrf52840_s140_v7.ld" + }, + "core": "nRF5", + "cpu": "cortex-m4", + "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA", + "f_cpu": "64000000L", + "hwids": [["0x2886", "0x0059"]], + "usb_product": "XIAO-BOOT", + "mcu": "nrf52840", + "variant": "Seeed_Solar_Node", + "bsp": { + "name": "adafruit" + }, + "softdevice": { + "sd_flags": "-DS140", + "sd_name": "s140", + "sd_version": "7.3.0", + "sd_fwid": "0x0123" + }, + "bootloader": { + "settings_addr": "0xFF000" + } + }, + "connectivity": ["bluetooth"], + "debug": { + "jlink_device": "nRF52840_xxAA", + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52840-mdk-rs" + }, + "frameworks": ["arduino"], + "name": "Seeed_Solar_Node", + "upload": { + "maximum_ram_size": 248832, + "maximum_size": 815104, + "speed": 115200, + "protocol": "nrfutil", + "protocols": [ + "jlink", + "nrfjprog", + "nrfutil", + "stlink", + "cmsis-dap", + "blackmagic" + ], + "use_1200bps_touch": true, + "require_upload_port": true, + "wait_for_upload_port": true + }, + "url": "https://www.seeedstudio.com/Seeed-XIAO-BLE-Sense-nRF52840-p-5253.html", + "vendor": "Seeed Studio" +} diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h index 21296c3fc..9d1d48f1c 100644 --- a/src/platform/nrf52/architecture.h +++ b/src/platform/nrf52/architecture.h @@ -81,6 +81,8 @@ #define HW_VENDOR meshtastic_HardwareModel_MESHLINK #elif defined(SEEED_XIAO_NRF52840_KIT) #define HW_VENDOR meshtastic_HardwareModel_XIAO_NRF52_KIT +#elif defined(SEEED_SOLAR_NODE) +#define HW_VENDOR meshtastic_HardwareModel_SEEED_SOLAR_NODE #elif defined(HELTEC_MESH_POCKET) #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_POCKET #else @@ -135,4 +137,4 @@ #if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA) // No serial ports on this board - ONLY use segger in memory console #define USE_SEGGER -#endif +#endif \ No newline at end of file diff --git a/variants/Seeed_Solar_Node/platformio.ini b/variants/Seeed_Solar_Node/platformio.ini new file mode 100644 index 000000000..9651d3a77 --- /dev/null +++ b/variants/Seeed_Solar_Node/platformio.ini @@ -0,0 +1,14 @@ +[env:Seeed_Solar_Node] +board = Seeed_Solar_Node +extends = nrf52840_base +;board_level = extra +build_flags = ${nrf52840_base.build_flags} + -I $PROJECT_DIR/variants/Seeed_Solar_Node + -D SEEED_SOLAR_NODE + -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 + -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard" +board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Seeed_Solar_Node> +lib_deps = + ${nrf52840_base.lib_deps} +debug_tool = jlink diff --git a/variants/Seeed_Solar_Node/variant.cpp b/variants/Seeed_Solar_Node/variant.cpp new file mode 100644 index 000000000..994e97ff9 --- /dev/null +++ b/variants/Seeed_Solar_Node/variant.cpp @@ -0,0 +1,108 @@ +/* + * variant.cpp - Digital pin mapping for nRF52-based development board + * + * This file defines the pin mapping array that maps logical digital pins (D0-D17) + * to physical GPIO ports/pins on the Nordic nRF52 series microcontroller. + * + * Board: [Seeed Studio XIAO nRF52840 Sense (Seeed Solar Node)] + * Hardware Features: + * - LoRa module (CS/SCK/MISO/MOSI control pins) + * - GNSS module (TX/RX/Reset/Wakeup) + * - User LEDs (D11-D12) + * - User button (D13) + * - Grove/NFC interface (D14-D15) + * - Battery voltage monitoring (D16) + * + * Created [20250225] + * By [Dylan] + * Version 1.0 + * License: [MIT] + */ + +#include "variant.h" +#include "nrf.h" +#include "wiring_constants.h" +#include "wiring_digital.h" + +/** + * @brief Digital pin to GPIO port/pin mapping table + * + * Format: Logical Pin (Dx) -> nRF Port.Pin (Px.xx) + * + * Pin Groupings: + * [D0-D10] - Peripheral control (LoRa, GNSS) + * [D11-D12] - LED outputs + * [D13] - User button + * [D14-D15] - Grove/NFC interface + * [D16] - Battery voltage ADC input + * [D17] - GNSS module reset + */ + +extern "C" { +const uint32_t g_ADigitalPinMap[] = { + // D0 .. D10 - Peripheral control pins + 2, // D0 P0.02 (A0) GNSS_WAKEUP + 3, // D1 P0.03 (A1) LORA_DIO1 + 28, // D2 P0.28 (A2) LORA_RESET + 29, // D3 P0.29 (A3) LORA_BUSY + 4, // D4 P0.04 (A4/SDA) LORA_CS + 5, // D5 P0.05 (A5/SCL) LORA_SW + 43, // D6 P1.11 (UART_TX) GNSS_TX + 44, // D7 P1.12 (UART_RX) GNSS_RX + 45, // D8 P1.13 (SPI_SCK) LORA_SCK + 46, // D9 P1.14 (SPI_MISO) LORA_MISO + 47, // D10 P1.15 (SPI_MOSI) LORA_MOSI + + // D11-D12 - LED outputs + 15, // D11 P0.15 User LED + 19, // D12 P0.19 Breathing LED + + // D13 - User input + 33, // D13 P1.01 User Button + + // D14-D15 - Grove/NFC interface + 9, // D14 P0.09 NFC1/GROVE_D1 + 10, // D15 P0.10 NFC2/GROVE_D0 + + // D16 - Power management + // 31, // D16 P0.31 VBAT_ADC (Battery voltage) + 31, // D16 P0.31 VBAT_ADC (Battery voltage) + // D17 - GNSS control + 35, // D17 P1.03 GNSS_RESET + + 37, // D18 P1.05 GNSS_ENABLE + 14, // D19 P0.14 BAT_READ + 39, // D20 P1.07 USER_BUTTON + + // + 21, // D21 P0.21 (QSPI_SCK) + 25, // D22 P0.25 (QSPI_CSN) + 20, // D23 P0.20 (QSPI_SIO_0 DI) + 24, // D24 P0.24 (QSPI_SIO_1 DO) + 22, // D25 P0.22 (QSPI_SIO_2 WP) + 23, // D26 P0.23 (QSPI_SIO_3 HOLD) +}; +} + +void initVariant() +{ + pinMode(PIN_QSPI_CS, OUTPUT); + digitalWrite(PIN_QSPI_CS, HIGH); + // This setup is crucial for ensuring low power consumption and proper initialization of the hardware components. + pinMode(GPS_EN, OUTPUT); + digitalWrite(GPS_EN, LOW); + + // VBAT_ENABLE + pinMode(BAT_READ, OUTPUT); + digitalWrite(BAT_READ, LOW); + + pinMode(PIN_LED1, OUTPUT); + digitalWrite(PIN_LED1, LOW); + pinMode(PIN_LED2, OUTPUT); + digitalWrite(PIN_LED2, LOW); + pinMode(PIN_LED2, OUTPUT); + // digitalWrite(LED_PIN, LOW); + + pinMode(GPS_EN, OUTPUT); + digitalWrite(GPS_EN, HIGH); +} \ No newline at end of file diff --git a/variants/Seeed_Solar_Node/variant.h b/variants/Seeed_Solar_Node/variant.h new file mode 100644 index 000000000..86682302b --- /dev/null +++ b/variants/Seeed_Solar_Node/variant.h @@ -0,0 +1,157 @@ +#ifndef _SEEED_SOLAR_NODE_H_ +#define _SEEED_SOLAR_NODE_H_ +#include "WVariant.h" +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Clock Configuration +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +#define VARIANT_MCK (64000000ul) // Master clock frequency +#define USE_LFXO // 32.768kHz crystal for LFCLK + +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Pin Capacity Definitions +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +#define PINS_COUNT (33u) // Total GPIO pins +#define NUM_DIGITAL_PINS (33u) // Digital I/O pins +#define NUM_ANALOG_INPUTS (8u) // Analog inputs (A0-A5 + VBAT + AREF) +#define NUM_ANALOG_OUTPUTS (0u) + +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// LED Configuration +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// LEDs +// LEDs +#define PIN_LED1 (11) // LED P1.15 +#define PIN_LED2 (12) // + +#define LED_BUILTIN PIN_LED1 +#define LED_CONN PIN_LED2 + +#define LED_GREEN PIN_LED1 +#define LED_BLUE PIN_LED2 +// #define LED_PIN PIN_LED2 +#define LED_STATE_ON 1 // State when LED is litted +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Button Configuration +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +#define BUTTON_PIN D13 // This is the Program Button +// #define BUTTON_NEED_PULLUP 1 +#define BUTTON_ACTIVE_LOW true +#define BUTTON_ACTIVE_PULLUP false + +#define BUTTON_PIN_TOUCH 20 // Touch button +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Digital Pin Mapping (D0-D10) +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +#define D0 0 // P0.02 GNSS_WAKEUP/IO0 +#define D1 1 // P0.03 LORA_DIO1 +#define D2 2 // P0.28 LORA_RESET +#define D3 3 // P0.29 LORA_BUSY +#define D4 4 // P0.04 LORA_CS/I2C_SDA +#define D5 5 // P0.05 LORA_SW/I2C_SCL +#define D6 6 // P1.11 GNSS_TX +#define D7 7 // P1.12 GNSS_RX +#define D8 8 // P1.13 SPI_SCK +#define D9 9 // P1.14 SPI_MISO +#define D10 10 // P1.15 SPI_MOSI +#define D13 13 // P1.01 User Button +#define D14 14 // P0.09 NFC1/GROVE_D1 +#define D15 15 // P0.10 NFC2/GROVE_D0 +#define D16 16 // P0.31 VBAT_ADC (Battery voltage) +#define D17 17 // P1.03 GNSS_RESET +#define D18 18 // P1.05 GNSS_ENABLE +#define D19 19 // P0.14 BAT_READ +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Analog Pin Definitions +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +#define PIN_A0 0 // P0.02 Analog Input 0 +#define PIN_A1 1 // P0.03 Analog Input 1 +#define PIN_A2 2 // P0.28 Analog Input 2 +#define PIN_A3 3 // P0.29 Analog Input 3 +#define PIN_A4 4 // P0.04 Analog Input 4 +#define PIN_A5 5 // P0.05 Analog Input 5 +#define PIN_VBAT D16 // P0.31 Battery voltage sense +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Communication Interfaces +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// I2C Configuration +#define HAS_WIRE 1 +#define PIN_WIRE_SDA D14 // P0.09 +#define PIN_WIRE_SCL D15 // P0.10 +#define WIRE_INTERFACES_COUNT 1 +#define I2C_NO_RESCAN + +static const uint8_t SDA = PIN_WIRE_SDA; +static const uint8_t SCL = PIN_WIRE_SCL; +// SPI Configuration (SX1262) + +#define SPI_INTERFACES_COUNT 1 +#define PIN_SPI_MISO 9 // P1.14 (D9) +#define PIN_SPI_MOSI 10 // P1.15 (D10) +#define PIN_SPI_SCK 8 // P1.13 (D8) + +// SX1262 LoRa Module Pins +#define USE_SX1262 +#define SX126X_CS D4 // Chip select +#define SX126X_DIO1 D1 // Digital IO 1 (Interrupt) +#define SX126X_BUSY D3 // Busy status +#define SX126X_RESET D2 // Reset control +#define SX126X_DIO3_TCXO_VOLTAGE 1.8 // TCXO supply voltage +#define SX126X_RXEN D5 // RX enable control +#define SX126X_TXEN RADIOLIB_NC +#define SX126X_DIO2_AS_RF_SWITCH // This Line is really necessary for SX1262 to work with RF switch or will loss TX power +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Power Management +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + +#define BAT_READ \ + D19 // P0_14 = 14 Reads battery voltage from divider on signal board. (PIN_VBAT is reading voltage divider on XIAO and is + // program pin 32 / or P0.31) +#define BATTERY_SENSE_RESOLUTION_BITS 12 +#define ADC_MULTIPLIER 3.3 +#define BATTERY_PIN PIN_VBAT // PIN_A7 +#define AREF_VOLTAGE 3.3 +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// GPS L76KB +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +#define GPS_L76K +#ifdef GPS_L76K +#define PIN_GPS_RX D6 // 44 +#define PIN_GPS_TX D7 // 43 +#define HAS_GPS 1 +#define GPS_BAUDRATE 9600 +#define GPS_THREAD_INTERVAL 50 +#define PIN_SERIAL1_RX PIN_GPS_TX +#define PIN_SERIAL1_TX PIN_GPS_RX +#define PIN_GPS_STANDBY D0 +#define GPS_EN D18 // P1.05 +#endif + +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// On-board QSPI Flash +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// On-board QSPI Flash +#define PIN_QSPI_SCK (21) +#define PIN_QSPI_CS (22) +#define PIN_QSPI_IO0 (23) +#define PIN_QSPI_IO1 (24) +#define PIN_QSPI_IO2 (25) +#define PIN_QSPI_IO3 (26) + +#define EXTERNAL_FLASH_DEVICES P25Q16H +#define EXTERNAL_FLASH_USE_QSPI + +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +// Compatibility Definitions +// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ +#ifdef __cplusplus +extern "C" { +#endif +// Serial port placeholders + +#define PIN_SERIAL2_RX (-1) +#define PIN_SERIAL2_TX (-1) +#ifdef __cplusplus +} +#endif + +#endif // _SEEED_SOLAR_NODE_H_ \ No newline at end of file From a36f21b29ae22b5c1476277aa3b9768460cd7642 Mon Sep 17 00:00:00 2001 From: Benjamin Kyd Date: Thu, 17 Apr 2025 10:36:19 +0100 Subject: [PATCH 093/100] Fix compiler error in PowerFSM when WiFi is excluded (#6603) --- src/PowerFSM.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp index 4c4d203c2..dbe4796cf 100644 --- a/src/PowerFSM.cpp +++ b/src/PowerFSM.cpp @@ -19,7 +19,7 @@ #include "sleep.h" #include "target_specific.h" -#if HAS_WIFI && !defined(ARCH_PORTDUINO) +#if HAS_WIFI && !defined(ARCH_PORTDUINO) || defined(MESHTASTIC_EXCLUDE_WIFI) #include "mesh/wifi/WiFiAPClient.h" #endif @@ -269,9 +269,6 @@ Fsm powerFSM(&stateBOOT); void PowerFSM_setup() { bool isRouter = (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ? 1 : 0); - bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER || - config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER || - config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR; bool hasPower = isPowered(); LOG_INFO("PowerFSM init, USB power=%d", hasPower ? 1 : 0); @@ -383,6 +380,12 @@ void PowerFSM_setup() // See: https://github.com/meshtastic/firmware/issues/1071 // Don't add power saving transitions if we are a power saving tracker or sensor or have Wifi enabled. Sleep will be initiated // through the modules + +#if HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI) + bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER || + config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER || + config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR; + if ((isRouter || config.power.is_power_saving) && !isWifiAvailable() && !isTrackerOrSensor) { powerFSM.add_timed_transition(&stateNB, &stateLS, Default::getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL, @@ -400,7 +403,9 @@ void PowerFSM_setup() Default::getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL, "Screen-on timeout"); } -#else +#endif // HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI) + +#else // (not) ARCH_ESP32 // If not ESP32, light-sleep not used. Check periodically if config has drifted out of stateDark powerFSM.add_timed_transition(&stateDARK, &stateDARK, Default::getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL, @@ -409,4 +414,4 @@ void PowerFSM_setup() powerFSM.run_machine(); // run one iteration of the state machine, so we run our on enter tasks for the initial DARK state } -#endif \ No newline at end of file +#endif From c177c6d655b2bbb05d4d8711fd67756de9fc6412 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Apr 2025 05:33:42 -0500 Subject: [PATCH 094/100] [create-pull-request] automated change (#6610) Co-authored-by: caveman99 <25002+caveman99@users.noreply.github.com> --- protobufs | 2 +- src/mesh/generated/meshtastic/mesh.pb.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/protobufs b/protobufs index b982b36df..27fac3914 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit b982b36dfab2e96b8f8be90af891c68ebf8790c2 +Subproject commit 27fac39141d99fe727a0a1824c5397409b1aea75 diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h index 36bded9b2..6fa0b60b0 100644 --- a/src/mesh/generated/meshtastic/mesh.pb.h +++ b/src/mesh/generated/meshtastic/mesh.pb.h @@ -243,6 +243,10 @@ typedef enum _meshtastic_HardwareModel { meshtastic_HardwareModel_HELTEC_MESH_POCKET = 94, /* Seeed Solar Node */ meshtastic_HardwareModel_SEEED_SOLAR_NODE = 95, + /* NomadStar Meteor Pro https://nomadstar.ch/ */ + meshtastic_HardwareModel_NOMADSTAR_METEOR_PRO = 96, + /* Elecrow CrowPanel Advance models, ESP32-S3 and TFT with SX1262 radio plugin */ + meshtastic_HardwareModel_CROWPANEL = 97, /* ------------------------------------------------------------------------------------------------------------------------------------------ Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. ------------------------------------------------------------------------------------------------------------------------------------------ */ From ef14967fbf29f0aa2dc38f5dcc9c8289b7461ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 17 Apr 2025 16:03:37 +0200 Subject: [PATCH 095/100] Crowpanel 2.4,2.8 and 3.5 support (#6355) Co-authored-by: mverch67 --- boards/crowpanel.json | 43 ++++ src/FSCommon.cpp | 9 +- src/Power.cpp | 2 + src/graphics/Screen.cpp | 12 +- src/graphics/ScreenFonts.h | 4 +- src/graphics/TFTDisplay.cpp | 330 +++++++++++++++++++++++++- src/graphics/images.h | 2 +- src/main.cpp | 24 +- src/mesh/NodeDB.cpp | 7 +- src/platform/esp32/architecture.h | 2 + src/sleep.cpp | 4 +- variants/elecrow_panel/pins_arduino.h | 64 +++++ variants/elecrow_panel/platformio.ini | 123 ++++++++++ variants/elecrow_panel/variant.h | 195 +++++++++++++++ 14 files changed, 789 insertions(+), 32 deletions(-) create mode 100644 boards/crowpanel.json create mode 100644 variants/elecrow_panel/pins_arduino.h create mode 100644 variants/elecrow_panel/platformio.ini create mode 100644 variants/elecrow_panel/variant.h diff --git a/boards/crowpanel.json b/boards/crowpanel.json new file mode 100644 index 000000000..570961ed7 --- /dev/null +++ b/boards/crowpanel.json @@ -0,0 +1,43 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32s3_out.ld", + "memory_type": "qio_opi", + "partitions": "default_16MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_USB_MODE=0", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=0" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [["0x303A", "0x1001"]], + "mcu": "esp32s3", + "variant": "ESP32-S3-WROOM-1-N16R8" + }, + "connectivity": ["wifi", "bluetooth", "lora"], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": ["esp-builtin"], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": ["arduino", "espidf"], + "name": "ESP32-S3-WROOM-1-N16R8 (16 MB Flash, 8 MB PSRAM)", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 524288, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 921600 + }, + "monitor": { + "speed": 115200 + }, + "url": "https://www.espressif.com/sites/default/files/documentation/esp32-s3-wroom-1_wroom-1u_datasheet_en.pdf", + "vendor": "Espressif" +} diff --git a/src/FSCommon.cpp b/src/FSCommon.cpp index 88f0764b5..f215be80f 100644 --- a/src/FSCommon.cpp +++ b/src/FSCommon.cpp @@ -12,13 +12,14 @@ #include "SPILock.h" #include "configuration.h" -#ifdef HAS_SDCARD +// Software SPI is used by MUI so disable SD card here until it's also implemented +#if defined(HAS_SDCARD) && !defined(SDCARD_USE_SOFT_SPI) #include #include #ifdef SDCARD_USE_SPI1 -SPIClass SPI1(HSPI); -#define SDHandler SPI1 +SPIClass SPI_HSPI(HSPI); +#define SDHandler SPI_HSPI #else #define SDHandler SPI #endif @@ -306,7 +307,7 @@ void fsInit() */ void setupSDCard() { -#ifdef HAS_SDCARD +#if defined(HAS_SDCARD) && !defined(SDCARD_USE_SOFT_SPI) concurrency::LockGuard g(spiLock); SDHandler.begin(SPI_SCK, SPI_MISO, SPI_MOSI); if (!SD.begin(SDCARD_CS, SDHandler, SD_SPI_FREQUENCY)) { diff --git a/src/Power.cpp b/src/Power.cpp index f11f8eac3..ed1bd20ef 100644 --- a/src/Power.cpp +++ b/src/Power.cpp @@ -450,6 +450,8 @@ class AnalogBatteryLevel : public HasBatteryLevel return isBatteryConnect() && isVbusIn(); #endif #endif + // by default, we check the battery voltage only + return isVbusIn(); } private: diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 9afd88c76..ad0b94efe 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1104,7 +1104,7 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const NodeStat char usersString[20]; snprintf(usersString, sizeof(usersString), "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal()); #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || \ - defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) && \ + defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS)) && \ !defined(DISPLAY_FORCE_SMALL_FONTS) display->drawFastImage(x, y + 3, 8, 8, imgUser); #else @@ -1545,7 +1545,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O dispdev = new SSD1306Wire(address.address, -1, -1, geometry, (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE); #elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) || \ - defined(RAK14014) || defined(HX8357_CS) + defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) dispdev = new TFTDisplay(address.address, -1, -1, geometry, (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE); #elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY) @@ -1751,7 +1751,7 @@ void Screen::setup() // flip it. If you have a headache now, you're welcome. if (!config.display.flip_screen) { #if defined(ST7701_CS) || defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || \ - defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS) + defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) static_cast(dispdev)->flipScreenVertically(); #elif defined(USE_ST7789) static_cast(dispdev)->flipScreenVertically(); @@ -2492,7 +2492,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16 if (!Throttle::isWithinTimespanMs(storeForwardModule->lastHeartbeat, (storeForwardModule->heartbeatInterval * 1200))) { // no heartbeat, overlap a bit #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || \ - defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) && \ + defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || ARCH_PORTDUINO) && \ !defined(DISPLAY_FORCE_SMALL_FONTS) display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8, imgQuestionL1); @@ -2504,7 +2504,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16 #endif } else { #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || \ - defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) && \ + defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS)) && \ !defined(DISPLAY_FORCE_SMALL_FONTS) display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8, imgSFL1); @@ -2519,7 +2519,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16 } else { // TODO: Raspberry Pi supports more than just the one screen size #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || \ - defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) && \ + defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || ARCH_PORTDUINO) && \ !defined(DISPLAY_FORCE_SMALL_FONTS) display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8, imgInfoL1); diff --git a/src/graphics/ScreenFonts.h b/src/graphics/ScreenFonts.h index 079a3e282..0be0dc814 100644 --- a/src/graphics/ScreenFonts.h +++ b/src/graphics/ScreenFonts.h @@ -65,8 +65,8 @@ #endif #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || \ - defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) && \ - !defined(DISPLAY_FORCE_SMALL_FONTS) + defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) || \ + defined(ILI9488_CS) && !defined(DISPLAY_FORCE_SMALL_FONTS) // The screen is bigger so use bigger fonts #define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19 #define FONT_MEDIUM FONT_LARGE_LOCAL // Height: 28 diff --git a/src/graphics/TFTDisplay.cpp b/src/graphics/TFTDisplay.cpp index c5187cffc..14787baff 100644 --- a/src/graphics/TFTDisplay.cpp +++ b/src/graphics/TFTDisplay.cpp @@ -120,6 +120,303 @@ static void rak14014_tpIntHandle(void) _rak14014_touch_int = true; } +#elif defined(ST72xx_DE) +#include +#include +#include +#include +TCA9534 ioex; + +class LGFX : public lgfx::LGFX_Device +{ + lgfx::Bus_RGB _bus_instance; + lgfx::Panel_RGB _panel_instance; + lgfx::Touch_GT911 _touch_instance; + + public: + const uint16_t screenWidth = TFT_WIDTH; + const uint16_t screenHeight = TFT_HEIGHT; + + bool init_impl(bool use_reset, bool use_clear) override + { + ioex.attach(Wire); + ioex.setDeviceAddress(0x18); + ioex.config(1, TCA9534::Config::OUT); + ioex.config(2, TCA9534::Config::OUT); + ioex.config(3, TCA9534::Config::OUT); + ioex.config(4, TCA9534::Config::OUT); + + ioex.output(1, TCA9534::Level::H); + ioex.output(3, TCA9534::Level::L); + ioex.output(4, TCA9534::Level::H); + + pinMode(1, OUTPUT); + digitalWrite(1, LOW); + ioex.output(2, TCA9534::Level::L); + delay(20); + ioex.output(2, TCA9534::Level::H); + delay(100); + pinMode(1, INPUT); + + return LGFX_Device::init_impl(use_reset, use_clear); + } + + LGFX(void) + { + { + auto cfg = _panel_instance.config(); + + cfg.memory_width = screenWidth; + cfg.memory_height = screenHeight; + cfg.panel_width = screenWidth; + cfg.panel_height = screenHeight; + cfg.offset_x = 0; + cfg.offset_y = 0; + cfg.offset_rotation = 0; + _panel_instance.config(cfg); + } + + { + auto cfg = _panel_instance.config_detail(); + cfg.use_psram = 0; + _panel_instance.config_detail(cfg); + } + + { + auto cfg = _bus_instance.config(); + cfg.panel = &_panel_instance; + cfg.pin_d0 = ST72xx_B0; // B0 + cfg.pin_d1 = ST72xx_B1; // B1 + cfg.pin_d2 = ST72xx_B2; // B2 + cfg.pin_d3 = ST72xx_B3; // B3 + cfg.pin_d4 = ST72xx_B4; // B4 + cfg.pin_d5 = ST72xx_G0; // G0 + cfg.pin_d6 = ST72xx_G1; // G1 + cfg.pin_d7 = ST72xx_G2; // G2 + cfg.pin_d8 = ST72xx_G3; // G3 + cfg.pin_d9 = ST72xx_G4; // G4 + cfg.pin_d10 = ST72xx_G5; // G5 + cfg.pin_d11 = ST72xx_R0; // R0 + cfg.pin_d12 = ST72xx_R1; // R1 + cfg.pin_d13 = ST72xx_R2; // R2 + cfg.pin_d14 = ST72xx_R3; // R3 + cfg.pin_d15 = ST72xx_R4; // R4 + + cfg.pin_henable = ST72xx_DE; + cfg.pin_vsync = ST72xx_VSYNC; + cfg.pin_hsync = ST72xx_HSYNC; + cfg.pin_pclk = ST72xx_PCLK; + cfg.freq_write = 13000000; + +#ifdef ST7265_HSYNC_POLARITY + cfg.hsync_polarity = ST7265_HSYNC_POLARITY; + cfg.hsync_front_porch = ST7265_HSYNC_FRONT_PORCH; // 8; + cfg.hsync_pulse_width = ST7265_HSYNC_PULSE_WIDTH; // 4; + cfg.hsync_back_porch = ST7265_HSYNC_BACK_PORCH; // 8; + + cfg.vsync_polarity = ST7265_VSYNC_POLARITY; // 0; + cfg.vsync_front_porch = ST7265_VSYNC_FRONT_PORCH; // 8; + cfg.vsync_pulse_width = ST7265_VSYNC_PULSE_WIDTH; // 4; + cfg.vsync_back_porch = ST7265_VSYNC_BACK_PORCH; // 8; + + cfg.pclk_idle_high = 1; + cfg.pclk_active_neg = ST7265_PCLK_ACTIVE_NEG; // 0; + // cfg.pclk_idle_high = 0; + // cfg.de_idle_high = 1; +#endif + +#ifdef ST7262_HSYNC_POLARITY + cfg.hsync_polarity = ST7262_HSYNC_POLARITY; + cfg.hsync_front_porch = ST7262_HSYNC_FRONT_PORCH; // 8; + cfg.hsync_pulse_width = ST7262_HSYNC_PULSE_WIDTH; // 4; + cfg.hsync_back_porch = ST7262_HSYNC_BACK_PORCH; // 8; + + cfg.vsync_polarity = ST7262_VSYNC_POLARITY; // 0; + cfg.vsync_front_porch = ST7262_VSYNC_FRONT_PORCH; // 8; + cfg.vsync_pulse_width = ST7262_VSYNC_PULSE_WIDTH; // 4; + cfg.vsync_back_porch = ST7262_VSYNC_BACK_PORCH; // 8; + + cfg.pclk_idle_high = 1; + cfg.pclk_active_neg = ST7262_PCLK_ACTIVE_NEG; // 0; + // cfg.pclk_idle_high = 0; + // cfg.de_idle_high = 1; +#endif + +#ifdef SC7277_HSYNC_POLARITY + cfg.hsync_polarity = SC7277_HSYNC_POLARITY; + cfg.hsync_front_porch = SC7277_HSYNC_FRONT_PORCH; // 8; + cfg.hsync_pulse_width = SC7277_HSYNC_PULSE_WIDTH; // 4; + cfg.hsync_back_porch = SC7277_HSYNC_BACK_PORCH; // 8; + + cfg.vsync_polarity = SC7277_VSYNC_POLARITY; // 0; + cfg.vsync_front_porch = SC7277_VSYNC_FRONT_PORCH; // 8; + cfg.vsync_pulse_width = SC7277_VSYNC_PULSE_WIDTH; // 4; + cfg.vsync_back_porch = SC7277_VSYNC_BACK_PORCH; // 8; + + cfg.pclk_idle_high = 1; + cfg.pclk_active_neg = SC7277_PCLK_ACTIVE_NEG; // 0; + // cfg.pclk_idle_high = 0; + // cfg.de_idle_high = 1; +#endif + + _bus_instance.config(cfg); + } + _panel_instance.setBus(&_bus_instance); + + { + auto cfg = _touch_instance.config(); + cfg.x_min = 0; + cfg.x_max = TFT_WIDTH; + cfg.y_min = 0; + cfg.y_max = TFT_HEIGHT; + cfg.pin_int = -1; + cfg.pin_rst = -1; + cfg.bus_shared = true; + cfg.offset_rotation = 0; + + cfg.i2c_port = 0; + cfg.i2c_addr = 0x5D; + cfg.pin_sda = I2C_SDA; + cfg.pin_scl = I2C_SCL; + cfg.freq = 400000; + _touch_instance.config(cfg); + _panel_instance.setTouch(&_touch_instance); + } + + setPanel(&_panel_instance); + } +}; + +static LGFX *tft = nullptr; + +#elif defined(ILI9488_CS) +#include // Graphics and font library for ILI9488 driver chip + +class LGFX : public lgfx::LGFX_Device +{ + lgfx::Panel_ILI9488 _panel_instance; + lgfx::Bus_SPI _bus_instance; + lgfx::Light_PWM _light_instance; + lgfx::Touch_GT911 _touch_instance; + + public: + LGFX(void) + { + { + auto cfg = _bus_instance.config(); + + // configure SPI + cfg.spi_host = ILI9488_SPI_HOST; // ESP32-S2,S3,C3 : SPI2_HOST or SPI3_HOST / ESP32 : VSPI_HOST or HSPI_HOST + cfg.spi_mode = 0; + cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing + // 80MHz by an integer) + cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving + cfg.spi_3wire = false; // Set to true if reception is done on the MOSI pin + cfg.use_lock = true; // Set to true to use transaction locking + cfg.dma_channel = SPI_DMA_CH_AUTO; // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch / + // SPI_DMA_CH_AUTO=auto setting) + cfg.pin_sclk = ILI9488_SCK; // Set SPI SCLK pin number + cfg.pin_mosi = ILI9488_SDA; // Set SPI MOSI pin number + cfg.pin_miso = ILI9488_MISO; // Set SPI MISO pin number (-1 = disable) + cfg.pin_dc = ILI9488_RS; // Set SPI DC pin number (-1 = disable) + + _bus_instance.config(cfg); // applies the set value to the bus. + _panel_instance.setBus(&_bus_instance); // set the bus on the panel. + } + + { // Set the display panel control. + auto cfg = _panel_instance.config(); // Gets a structure for display panel settings. + + cfg.pin_cs = ILI9488_CS; // Pin number where CS is connected (-1 = disable) + cfg.pin_rst = -1; // Pin number where RST is connected (-1 = disable) + cfg.pin_busy = -1; // Pin number where BUSY is connected (-1 = disable) + + // The following setting values ​​are general initial values ​​for each panel, so please comment out any + // unknown items and try them. + + cfg.memory_width = TFT_WIDTH; // Maximum width supported by the driver IC + cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC + cfg.panel_width = TFT_WIDTH; // actual displayable width + cfg.panel_height = TFT_HEIGHT; // actual displayable height + cfg.offset_x = TFT_OFFSET_X; // Panel offset amount in X direction + cfg.offset_y = TFT_OFFSET_Y; // Panel offset amount in Y direction + cfg.offset_rotation = TFT_OFFSET_ROTATION; // Rotation direction value offset 0~7 (4~7 is mirrored) +#ifdef TFT_DUMMY_READ_PIXELS + cfg.dummy_read_pixel = TFT_DUMMY_READ_PIXELS; // Number of bits for dummy read before pixel readout +#else + cfg.dummy_read_pixel = 9; // Number of bits for dummy read before pixel readout +#endif + cfg.dummy_read_bits = 1; // Number of bits for dummy read before non-pixel data read + cfg.readable = true; // Set to true if data can be read + cfg.invert = true; // Set to true if the light/darkness of the panel is reversed + cfg.rgb_order = false; // Set to true if the panel's red and blue are swapped + cfg.dlen_16bit = + false; // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI + cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.) + + // Set the following only when the display is shifted with a driver with a variable number of pixels, such as the + // ST7735 or ILI9163. + // cfg.memory_width = TFT_WIDTH; // Maximum width supported by the driver IC + // cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC + _panel_instance.config(cfg); + } + +#ifdef ILI9488_BL + // Set the backlight control + { + auto cfg = _light_instance.config(); // Gets a structure for backlight settings. + + cfg.pin_bl = ILI9488_BL; // Pin number to which the backlight is connected + cfg.invert = false; // true to invert the brightness of the backlight + // cfg.freq = 44100; // PWM frequency of backlight + // cfg.pwm_channel = 1; // PWM channel number to use + + _light_instance.config(cfg); + _panel_instance.setLight(&_light_instance); // Set the backlight on the panel. + } +#endif + +#if HAS_TOUCHSCREEN + // Configure settings for touch screen control. + { + auto cfg = _touch_instance.config(); + + cfg.pin_cs = -1; + cfg.x_min = 0; + cfg.x_max = TFT_HEIGHT - 1; + cfg.y_min = 0; + cfg.y_max = TFT_WIDTH - 1; + cfg.pin_int = SCREEN_TOUCH_INT; +#ifdef SCREEN_TOUCH_RST + cfg.pin_rst = SCREEN_TOUCH_RST; +#endif + cfg.bus_shared = true; + cfg.offset_rotation = TFT_OFFSET_ROTATION; + // cfg.freq = 2500000; + + // I2C + cfg.i2c_port = TOUCH_I2C_PORT; + cfg.i2c_addr = TOUCH_SLAVE_ADDRESS; +#ifdef SCREEN_TOUCH_USE_I2C1 + cfg.pin_sda = I2C_SDA1; + cfg.pin_scl = I2C_SCL1; +#else + cfg.pin_sda = I2C_SDA; + cfg.pin_scl = I2C_SCL; +#endif + // cfg.freq = 400000; + + _touch_instance.config(cfg); + _panel_instance.setTouch(&_touch_instance); + } +#endif + + setPanel(&_panel_instance); + } +}; + +static LGFX *tft = nullptr; + #elif defined(ST7789_CS) #include // Graphics and font library for ST7735 driver chip @@ -129,7 +426,7 @@ class LGFX : public lgfx::LGFX_Device lgfx::Bus_SPI _bus_instance; lgfx::Light_PWM _light_instance; #if HAS_TOUCHSCREEN -#ifdef T_WATCH_S3 +#if defined(T_WATCH_S3) || defined(ELECROW) lgfx::Touch_FT5x06 _touch_instance; #else lgfx::Touch_GT911 _touch_instance; @@ -171,16 +468,22 @@ class LGFX : public lgfx::LGFX_Device // The following setting values ​​are general initial values ​​for each panel, so please comment out any // unknown items and try them. - cfg.panel_width = TFT_WIDTH; // actual displayable width - cfg.panel_height = TFT_HEIGHT; // actual displayable height - cfg.offset_x = TFT_OFFSET_X; // Panel offset amount in X direction - cfg.offset_y = TFT_OFFSET_Y; // Panel offset amount in Y direction - cfg.offset_rotation = TFT_OFFSET_ROTATION; // Rotation direction value offset 0~7 (4~7 is mirrored) - cfg.dummy_read_pixel = 9; // Number of bits for dummy read before pixel readout - cfg.dummy_read_bits = 1; // Number of bits for dummy read before non-pixel data read - cfg.readable = true; // Set to true if data can be read - cfg.invert = true; // Set to true if the light/darkness of the panel is reversed - cfg.rgb_order = false; // Set to true if the panel's red and blue are swapped + cfg.memory_width = TFT_WIDTH; // Maximum width supported by the driver IC + cfg.memory_height = TFT_HEIGHT; // Maximum height supported by the driver IC + cfg.panel_width = TFT_WIDTH; // actual displayable width + cfg.panel_height = TFT_HEIGHT; // actual displayable height + cfg.offset_x = TFT_OFFSET_X; // Panel offset amount in X direction + cfg.offset_y = TFT_OFFSET_Y; // Panel offset amount in Y direction + cfg.offset_rotation = TFT_OFFSET_ROTATION; // Rotation direction value offset 0~7 (4~7 is mirrored) +#ifdef TFT_DUMMY_READ_PIXELS + cfg.dummy_read_pixel = TFT_DUMMY_READ_PIXELS; // Number of bits for dummy read before pixel readout +#else + cfg.dummy_read_pixel = 9; // Number of bits for dummy read before pixel readout +#endif + cfg.dummy_read_bits = 1; // Number of bits for dummy read before non-pixel data read + cfg.readable = true; // Set to true if data can be read + cfg.invert = true; // Set to true if the light/darkness of the panel is reversed + cfg.rgb_order = false; // Set to true if the panel's red and blue are swapped cfg.dlen_16bit = false; // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.) @@ -217,6 +520,9 @@ class LGFX : public lgfx::LGFX_Device cfg.y_min = 0; cfg.y_max = TFT_WIDTH - 1; cfg.pin_int = SCREEN_TOUCH_INT; +#ifdef SCREEN_TOUCH_RST + cfg.pin_rst = SCREEN_TOUCH_RST; +#endif cfg.bus_shared = true; cfg.offset_rotation = TFT_OFFSET_ROTATION; // cfg.freq = 2500000; @@ -640,7 +946,7 @@ static LGFX *tft = nullptr; #endif #if defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || \ - defined(RAK14014) || defined(HX8357_CS) || (ARCH_PORTDUINO && HAS_SCREEN != 0) + defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST72xx_DE) || (ARCH_PORTDUINO && HAS_SCREEN != 0) #include "SPILock.h" #include "TFTDisplay.h" #include diff --git a/src/graphics/images.h b/src/graphics/images.h index b757dcf30..069839a16 100644 --- a/src/graphics/images.h +++ b/src/graphics/images.h @@ -21,7 +21,7 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03 #endif #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || \ - defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) && \ + defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || ARCH_PORTDUINO) && \ !defined(DISPLAY_FORCE_SMALL_FONTS) const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff}; const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f}; diff --git a/src/main.cpp b/src/main.cpp index 535a7afa1..eb93a70d1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -115,6 +115,10 @@ AccelerometerThread *accelerometerThread = nullptr; AudioThread *audioThread = nullptr; #endif +#ifdef USE_PCA9557 +PCA9557 IOEXP; +#endif + #if HAS_TFT extern void tftSetup(void); #endif @@ -133,6 +137,10 @@ void setupNicheGraphics(); #include "nicheGraphics.h" #endif +#if defined(HW_SPI1_DEVICE) && defined(ARCH_ESP32) +SPIClass SPI1(HSPI); +#endif + using namespace concurrency; volatile static const char slipstreamTZString[] = {USERPREFS_TZ_STRING}; @@ -364,9 +372,11 @@ void setup() SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0); #endif +#if !HAS_TFT meshtastic_Config_DisplayConfig_OledType screen_model = meshtastic_Config_DisplayConfig_OledType::meshtastic_Config_DisplayConfig_OledType_OLED_AUTO; OLEDDISPLAY_GEOMETRY screen_geometry = GEOMETRY_128_64; +#endif #ifdef USE_SEGGER auto mode = false ? SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL : SEGGER_RTT_MODE_NO_BLOCK_TRIM; @@ -595,6 +605,7 @@ void setup() } #endif +#if !HAS_TFT auto screenInfo = i2cScanner->firstScreen(); screen_found = screenInfo.type != ScanI2C::DeviceType::NONE ? screenInfo.address : ScanI2C::ADDRESS_NONE; @@ -612,6 +623,7 @@ void setup() screen_model = meshtastic_Config_DisplayConfig_OledType::meshtastic_Config_DisplayConfig_OledType_OLED_AUTO; } } +#endif #define UPDATE_FROM_SCANNER(FIND_FN) @@ -779,9 +791,11 @@ void setup() else playStartMelody(); +#if !HAS_TFT // fixed screen override? if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO) screen_model = config.display.oled; +#endif #if defined(USE_SH1107) screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1107; // set dimension of 128x128 @@ -837,10 +851,16 @@ void setup() #elif !defined(ARCH_ESP32) // ARCH_RP2040 SPI.begin(); #else - // ESP32 + // ESP32 +#if defined(HW_SPI1_DEVICE) + SPI1.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); + LOG_DEBUG("SPI1.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); + SPI1.setFrequency(4000000); +#else SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); LOG_DEBUG("SPI.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); SPI.setFrequency(4000000); +#endif #endif // Initialize the screen first so we can show the logo while we start up everything else. @@ -934,7 +954,7 @@ void setup() // Don't call screen setup until after nodedb is setup (because we need // the current region name) #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || \ - defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) + defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) screen->setup(); #elif defined(ARCH_PORTDUINO) if (screen_found.port != ScanI2C::I2CPort::NO_I2C || settingsMap[displayPanel]) { diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index c89abbe74..90a90e89f 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -584,7 +584,8 @@ void NodeDB::installDefaultConfig(bool preserveKey = false) resetRadioConfig(true); // This also triggers NodeInfo/Position requests since we're fresh strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32); -#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR)) && \ +#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) || \ + defined(ELECROW)) && \ HAS_TFT // switch BT off by default; use TFT programming mode or hotkey to enable config.bluetooth.enabled = false; @@ -595,7 +596,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false) config.bluetooth.fixed_pin = defaultBLEPin; #if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7789_CS) || \ - defined(HX8357_CS) || defined(USE_ST7789) + defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) bool hasScreen = true; #ifdef HELTEC_MESH_NODE_T114 uint32_t st7789_id = get_st7789_id(ST7789_NSS, ST7789_SCK, ST7789_SDA, ST7789_RS, ST7789_RESET); @@ -689,7 +690,7 @@ void NodeDB::initConfigIntervals() config.display.screen_on_secs = default_screen_on_secs; -#if defined(T_WATCH_S3) || defined(T_DECK) || defined(UNPHONE) || defined(MESH_TAB) || defined(RAK14014) +#if defined(T_WATCH_S3) || defined(T_DECK) || defined(UNPHONE) || defined(MESH_TAB) || defined(RAK14014) || defined(ELECROW) config.power.is_power_saving = true; config.display.screen_on_secs = 30; config.power.wait_bluetooth_secs = 30; diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h index 0af6d4d04..68d06c6d7 100644 --- a/src/platform/esp32/architecture.h +++ b/src/platform/esp32/architecture.h @@ -182,6 +182,8 @@ #define HW_VENDOR meshtastic_HardwareModel_T_ETH_ELITE #elif defined(HELTEC_SENSOR_HUB) #define HW_VENDOR meshtastic_HardwareModel_HELTEC_SENSOR_HUB +#elif defined(ELECROW_PANEL) +#define HW_VENDOR meshtastic_HardwareModel_CROWPANEL #endif // ----------------------------------------------------------------------------- diff --git a/src/sleep.cpp b/src/sleep.cpp index 02fa8d871..2985db0c2 100644 --- a/src/sleep.cpp +++ b/src/sleep.cpp @@ -400,7 +400,7 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r #ifdef INPUTDRIVER_ENCODER_BTN gpio_wakeup_enable((gpio_num_t)INPUTDRIVER_ENCODER_BTN, GPIO_INTR_LOW_LEVEL); #endif -#ifdef T_WATCH_S3 +#if defined(T_WATCH_S3) || defined(ELECROW) gpio_wakeup_enable((gpio_num_t)SCREEN_TOUCH_INT, GPIO_INTR_LOW_LEVEL); #endif enableLoraInterrupt(); @@ -434,7 +434,7 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r gpio_wakeup_disable(pin); #endif -#ifdef T_WATCH_S3 +#if defined(T_WATCH_S3) || defined(ELECROW) gpio_wakeup_disable((gpio_num_t)SCREEN_TOUCH_INT); #endif diff --git a/variants/elecrow_panel/pins_arduino.h b/variants/elecrow_panel/pins_arduino.h new file mode 100644 index 000000000..b98530378 --- /dev/null +++ b/variants/elecrow_panel/pins_arduino.h @@ -0,0 +1,64 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +// static const uint8_t LED_BUILTIN = -1; + +// static const uint8_t TX = 43; +// static const uint8_t RX = 44; + +static const uint8_t SDA = 39; +static const uint8_t SCL = 40; + +// Default SPI will be mapped to Radio +static const uint8_t SS = -1; +static const uint8_t MOSI = 48; +static const uint8_t MISO = 47; +static const uint8_t SCK = 41; + +#ifndef CROW_SELECT +static const uint8_t SPI_MOSI = 6; +static const uint8_t SPI_SCK = 5; +static const uint8_t SPI_MISO = 4; +static const uint8_t SPI_CS = 7; // SD does not support -1 +static const uint8_t SDCARD_CS = SPI_CS; +#endif + +static const uint8_t A0 = 1; +static const uint8_t A1 = 2; +static const uint8_t A2 = 3; +static const uint8_t A3 = 4; +static const uint8_t A4 = 5; +static const uint8_t A5 = 6; +static const uint8_t A6 = 7; +static const uint8_t A7 = 8; +static const uint8_t A8 = 9; +static const uint8_t A9 = 10; +static const uint8_t A10 = 11; +static const uint8_t A11 = 12; +static const uint8_t A12 = 13; +static const uint8_t A13 = 14; +static const uint8_t A14 = 15; +static const uint8_t A15 = 16; +static const uint8_t A16 = 17; +static const uint8_t A17 = 18; +static const uint8_t A18 = 19; +static const uint8_t A19 = 20; + +static const uint8_t T1 = 1; +static const uint8_t T2 = 2; +static const uint8_t T3 = 3; +static const uint8_t T4 = 4; +static const uint8_t T5 = 5; +static const uint8_t T6 = 6; +static const uint8_t T7 = 7; +static const uint8_t T8 = 8; +static const uint8_t T9 = 9; +static const uint8_t T10 = 10; +static const uint8_t T11 = 11; +static const uint8_t T12 = 12; +static const uint8_t T13 = 13; +static const uint8_t T14 = 14; + +#endif /* Pins_Arduino_h */ \ No newline at end of file diff --git a/variants/elecrow_panel/platformio.ini b/variants/elecrow_panel/platformio.ini new file mode 100644 index 000000000..66dc35c3b --- /dev/null +++ b/variants/elecrow_panel/platformio.ini @@ -0,0 +1,123 @@ +[crowpanel_base] +extends = esp32s3_base +board = crowpanel +board_check = true +upload_protocol = esptool +board_build.partitions = default_16MB.csv ; must be here for some reason, board.json is not enough !? + +build_flags = ${esp32s3_base.build_flags} -Os + -I variants/elecrow_panel + -D ELECROW + -D ELECROW_PANEL + -D CONFIG_ARDUHAL_LOG_COLORS + -D RADIOLIB_DEBUG_SPI=0 + -D RADIOLIB_DEBUG_PROTOCOL=0 + -D RADIOLIB_DEBUG_BASIC=0 + -D RADIOLIB_VERBOSE_ASSERT=0 + -D RADIOLIB_SPI_PARANOID=0 + -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 + -D MESHTASTIC_EXCLUDE_INPUTBROKER=1 + -D MESHTASTIC_EXCLUDE_WEBSERVER=1 + -D MESHTASTIC_EXCLUDE_SERIAL=1 + -D MESHTASTIC_EXCLUDE_SOCKETAPI=1 + -D MESHTASTIC_EXCLUDE_SCREEN=1 + -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1 +; -D INPUTDRIVER_BUTTON_TYPE=0 + -D HAS_TELEMETRY=0 + -D CONFIG_DISABLE_HAL_LOCKS=1 + -D HAS_SCREEN=0 + -D HAS_TFT=1 + -D RAM_SIZE=6144 + -D LV_LVGL_H_INCLUDE_SIMPLE + -D LV_CONF_INCLUDE_SIMPLE + -D LV_COMP_CONF_INCLUDE_SIMPLE + -D LV_USE_SYSMON=0 + -D LV_USE_PROFILER=0 + -D LV_USE_PERF_MONITOR=0 + -D LV_USE_MEM_MONITOR=0 + -D LV_USE_LOG=0 + -D LV_BUILD_TEST=0 + -D USE_LOG_DEBUG + -D LOG_DEBUG_INC=\"DebugConfiguration.h\" + -D USE_PACKET_API + +lib_deps = ${esp32s3_base.lib_deps} + ${device-ui_base.lib_deps} + earlephilhower/ESP8266Audio@^1.9.9 + earlephilhower/ESP8266SAM@^1.0.1 + lovyan03/LovyanGFX@^1.2.0 + hideakitai/TCA9534@^0.1.1 + +[env:elecrow-24-28-tft] +extends = crowpanel_base + +build_flags = + ${crowpanel_base.build_flags} + -D TFT_HEIGHT=320 ; needed in variant.h + -D HAS_SDCARD + -D SDCARD_USE_SOFT_SPI + -D SPI_DRIVER_SELECT=2 + -D USE_PIN_BUZZER +; -D INPUTDRIVER_BUTTON_TYPE=0 ; no button as this pin is assigned to LoRa cs! + -D SCREEN_TOUCH_INT=47 ; used to wake up the MCU by touch + -D LGFX_DRIVER_TEMPLATE + -D LGFX_DRIVER=LGFX_GENERIC + -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\" + -D SPI_FREQUENCY=80000000 + -D LGFX_SCREEN_WIDTH=240 + -D LGFX_SCREEN_HEIGHT=320 + -D LGFX_PANEL=ST7789 + -D LGFX_ROTATION=1 + -D LGFX_CFG_HOST=SPI2_HOST + -D LGFX_PIN_SCK=42 + -D LGFX_PIN_MOSI=39 + -D LGFX_PIN_DC=41 + -D LGFX_PIN_CS=40 + -D LGFX_PIN_BL=38 + -D LGFX_TOUCH=FT5x06 + -D LGFX_TOUCH_I2C_ADDR=0x38 + -D LGFX_TOUCH_I2C_SDA=15 + -D LGFX_TOUCH_I2C_SCL=16 + -D LGFX_TOUCH_INT=47 + -D LGFX_TOUCH_RST=48 + -D LGFX_TOUCH_ROTATION=0 + -D VIEW_320x240 + -D MAP_FULL_REDRAW + +[env:elecrow-35-tft] +extends = crowpanel_base + +build_flags = + ${crowpanel_base.build_flags} + -D TFT_HEIGHT=480 ; needed in variant.h + -D HAS_SDCARD + -D SDCARD_USE_SOFT_SPI + -D SPI_DRIVER_SELECT=2 + -D USE_PIN_BUZZER +; -D INPUTDRIVER_BUTTON_TYPE=0 ; no button as this pin is assigned to LoRa cs! + -D SCREEN_TOUCH_INT=47 ; used to wake up the MCU by touch + -D LV_CACHE_DEF_SIZE=2097152 + -D LGFX_DRIVER_TEMPLATE + -D LGFX_DRIVER=LGFX_GENERIC + -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\" + -D SPI_FREQUENCY=60000000 + -D LGFX_SCREEN_WIDTH=320 + -D LGFX_SCREEN_HEIGHT=480 + -D LGFX_PANEL=ILI9488 + -D LGFX_ROTATION=0 + -D LGFX_CFG_HOST=SPI2_HOST + -D LGFX_PIN_SCK=42 + -D LGFX_PIN_MOSI=39 + -D LGFX_PIN_DC=41 + -D LGFX_PIN_CS=40 + -D LGFX_PIN_BL=38 + -D LGFX_TOUCH=GT911 + -D LGFX_TOUCH_I2C_ADDR=0x5D + -D LGFX_TOUCH_I2C_SDA=15 + -D LGFX_TOUCH_I2C_SCL=16 + -D LGFX_TOUCH_INT=47 + -D LGFX_TOUCH_RST=48 + -D LGFX_TOUCH_ROTATION=0 + -D DISPLAY_SET_RESOLUTION + -D VIEW_320x240 + -D MAP_FULL_REDRAW diff --git a/variants/elecrow_panel/variant.h b/variants/elecrow_panel/variant.h new file mode 100644 index 000000000..b1035ed31 --- /dev/null +++ b/variants/elecrow_panel/variant.h @@ -0,0 +1,195 @@ +#define I2C_SDA 15 +#define I2C_SCL 16 + +#if TFT_HEIGHT == 320 && not defined(HAS_TFT) // 2.4 and 2.8 TFT +// ST7789 TFT LCD +#define ST7789_CS 40 +#define ST7789_RS 41 // DC +#define ST7789_SDA 39 // MOSI +#define ST7789_SCK 42 +#define ST7789_RESET -1 +#define ST7789_MISO 38 +#define ST7789_BUSY -1 +#define ST7789_BL 38 +#define ST7789_SPI_HOST SPI2_HOST +#define TFT_BL 38 +#define SPI_FREQUENCY 60000000 +#define SPI_READ_FREQUENCY 16000000 +#define TFT_OFFSET_ROTATION 0 +#define SCREEN_ROTATE +#define TFT_DUMMY_READ_PIXELS 8 +#define SCREEN_TRANSITION_FRAMERATE 5 +#define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness + +#define HAS_TOUCHSCREEN 1 +#define SCREEN_TOUCH_INT 47 +#define SCREEN_TOUCH_RST 48 +#define TOUCH_I2C_PORT 0 +#define TOUCH_SLAVE_ADDRESS 0x38 // FT5x06 +#endif + +#if TFT_HEIGHT == 480 && not defined(HAS_TFT) // 3.5 TFT +// ILI9488 TFT LCD +#define ILI9488_CS 40 +#define ILI9488_RS 41 // DC +#define ILI9488_SDA 39 // MOSI +#define ILI9488_SCK 42 +#define ILI9488_RESET -1 +#define ILI9488_MISO 38 +#define ILI9488_BUSY -1 +#define ILI9488_BL 38 +#define ILI9488_SPI_HOST SPI2_HOST +#define TFT_BL 38 +#define SPI_FREQUENCY 40000000 +#define SPI_READ_FREQUENCY 16000000 +#define TFT_OFFSET_ROTATION 0 +#define SCREEN_ROTATE +#define TFT_DUMMY_READ_PIXELS 8 +#define SCREEN_TRANSITION_FRAMERATE 5 +#define BRIGHTNESS_DEFAULT 130 // Medium Low Brightness + +#define HAS_TOUCHSCREEN 1 +#define SCREEN_TOUCH_INT 47 +#define SCREEN_TOUCH_RST 48 +#define TOUCH_I2C_PORT 0 +#define TOUCH_SLAVE_ADDRESS 0x5D // GT911 +#endif + +#ifdef CROW_SELECT +#define ST72xx_DE 42 +#define ST72xx_VSYNC 41 +#define ST72xx_HSYNC 40 +#define ST72xx_PCLK 39 +#define ST72xx_R0 7 +#define ST72xx_R1 17 +#define ST72xx_R2 18 +#define ST72xx_R3 3 +#define ST72xx_R4 46 +#define ST72xx_G0 9 +#define ST72xx_G1 10 +#define ST72xx_G2 11 +#define ST72xx_G3 12 +#define ST72xx_G4 13 +#define ST72xx_G5 14 +#define ST72xx_B0 21 +#define ST72xx_B1 47 +#define ST72xx_B2 48 +#define ST72xx_B3 45 +#define ST72xx_B4 38 + +#define HAS_TOUCHSCREEN 1 +#define TOUCH_I2C_PORT 0 +#define TOUCH_SLAVE_ADDRESS 0x5D // GT911 +#endif + +#if defined(CROW_SELECT) && CROW_SELECT == 1 // 4.3 TFT 800x480 +#define ST7265_HSYNC_POLARITY 0 +#define ST7265_HSYNC_FRONT_PORCH 24 +#define ST7265_HSYNC_PULSE_WIDTH 8 +#define ST7265_HSYNC_BACK_PORCH 24 +#define ST7265_VSYNC_POLARITY 1 +#define ST7265_VSYNC_FRONT_PORCH 24 +#define ST7265_VSYNC_PULSE_WIDTH 8 +#define ST7265_VSYNC_BACK_PORCH 24 +#define ST7265_PCLK_ACTIVE_NEG 1 +#endif + +#if defined(CROW_SELECT) && CROW_SELECT == 2 // 5.0 TFT 800x480 +#define ST7262_HSYNC_POLARITY 0 +#define ST7262_HSYNC_FRONT_PORCH 8 +#define ST7262_HSYNC_PULSE_WIDTH 4 +#define ST7262_HSYNC_BACK_PORCH 8 +#define ST7262_VSYNC_POLARITY 0 +#define ST7262_VSYNC_FRONT_PORCH 8 +#define ST7262_VSYNC_PULSE_WIDTH 4 +#define ST7262_VSYNC_BACK_PORCH 8 +#define ST7262_PCLK_ACTIVE_NEG 0 +#endif + +#if defined(CROW_SELECT) && CROW_SELECT == 3 // 7.0 TFT 800x480 +#define SC7277_HSYNC_POLARITY 0 +#define SC7277_HSYNC_FRONT_PORCH 8 +#define SC7277_HSYNC_PULSE_WIDTH 4 +#define SC7277_HSYNC_BACK_PORCH 8 +#define SC7277_VSYNC_POLARITY 0 +#define SC7277_VSYNC_FRONT_PORCH 8 +#define SC7277_VSYNC_PULSE_WIDTH 4 +#define SC7277_VSYNC_BACK_PORCH 8 +#define SC7277_PCLK_ACTIVE_NEG 0 +#endif + +#if TFT_HEIGHT == 320 // 2.4-2.8 have I2S audio +// dac / amp +// #define HAS_I2S // didn't get I2S sound working +#define PIN_BUZZER 8 // using pwm buzzer instead (nobody will notice, lol) +#define DAC_I2S_BCK 13 +#define DAC_I2S_WS 11 +#define DAC_I2S_DOUT 12 +#define DAC_I2S_MCLK 8 // don't use GPIO0 because it's assigned to LoRa or button +#else +#define PIN_BUZZER 8 +#endif + +// GPS via UART1 connector +#define HAS_GPS 1 +#define GPS_DEFAULT_NOT_PRESENT 1 +#define GPS_RX_PIN 18 +#define GPS_TX_PIN 17 + +// Extension Slot Layout, viewed from above (2.4-3.5) +// DIO1/IO1 o o IO2/NRESET +// SCK/IO10 o o IO16/NC +// MISO/IO9 o o IO15/NC +// MOSI/IO3 o o NC/DIO2 +// 3V3 o o IO46/BUSY +// GND o o IO0/NSS +// 5V/NC o o NC/DIO3 +// J9 J8 + +// Extension Slot Layout, viewed from above (4.3-7.0) +// !! DIO1/IO20 o o IO19/NRESET !! +// !! SCK/IO5 o o IO16/NC +// !! MISO/IO4 o o IO15/NC +// !! MOSI/IO6 o o NC/DIO2 +// 3V3 o o IO2/BUSY !! +// GND o o IO0/NSS +// 5V/NC o o NC/DIO3 +// J9 J8 + +// LoRa +#define USE_SX1262 +#define LORA_CS 0 // GND + +#if TFT_HEIGHT == 320 || TFT_HEIGHT == 480 // 2.4 - 3.5 TFT +#define LORA_SCK 10 +#define LORA_MISO 9 +#define LORA_MOSI 3 + +#define LORA_RESET 2 +#define LORA_DIO1 1 // SX1262 IRQ +#define LORA_DIO2 46 // SX1262 BUSY + +// need to pull IO45 low to enable LORA and disable Microphone on 24 28 35 +#define SENSOR_POWER_CTRL_PIN 45 +#define SENSOR_POWER_ON LOW +#else +#define LORA_SCK 5 +#define LORA_MISO 4 +#define LORA_MOSI 6 + +#define LORA_RESET 19 +#define LORA_DIO1 20 // SX1262 IRQ +#define LORA_DIO2 2 // SX1262 BUSY +#endif + +#define HW_SPI1_DEVICE +#define SX126X_CS LORA_CS +#define SX126X_DIO1 LORA_DIO1 +#define SX126X_BUSY LORA_DIO2 +#define SX126X_RESET LORA_RESET +#define SX126X_DIO2_AS_RF_SWITCH + +#define SX126X_DIO3_TCXO_VOLTAGE 3.3 + +#define USE_VIRTUAL_KEYBOARD 1 +#define DISPLAY_CLOCK_FRAME 1 \ No newline at end of file From e2f6600cb955f8de86175a87fae36f49863ba72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Thu, 17 Apr 2025 22:58:28 +0200 Subject: [PATCH 096/100] Lib Update (#6510) * Lib Update Draft because PIN display doesn't work yet. * pin entry still no worky * Fix for missing PIN code issue (#6574) --------- Co-authored-by: Ben Meadors Co-authored-by: Alexander Begoon --- arch/esp32/esp32.ini | 2 +- src/nimble/NimbleBluetooth.cpp | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini index 5e15cb451..35f3a5a1c 100644 --- a/arch/esp32/esp32.ini +++ b/arch/esp32/esp32.ini @@ -50,7 +50,7 @@ lib_deps = # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master https://github.com/meshtastic/esp32_https_server/archive/896f1771ceb5979987a0b41028bf1b4e7aad419b.zip # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino - h2zero/NimBLE-Arduino@^1.4.3 + h2zero/NimBLE-Arduino@^2.2.3 # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp index 009439f25..208d8ae3c 100644 --- a/src/nimble/NimbleBluetooth.cpp +++ b/src/nimble/NimbleBluetooth.cpp @@ -49,7 +49,7 @@ static uint8_t lastToRadio[MAX_TO_FROM_RADIO_SIZE]; class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks { - virtual void onWrite(NimBLECharacteristic *pCharacteristic) + virtual void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo) { LOG_DEBUG("To Radio onwrite"); auto val = pCharacteristic->getValue(); @@ -66,7 +66,7 @@ class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks { - virtual void onRead(NimBLECharacteristic *pCharacteristic) + virtual void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo) { uint8_t fromRadioBytes[meshtastic_FromRadio_size]; size_t numBytes = bluetoothPhoneAPI->getFromRadio(fromRadioBytes); @@ -79,7 +79,7 @@ class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks class NimbleBluetoothServerCallback : public NimBLEServerCallbacks { - virtual uint32_t onPassKeyRequest() + virtual uint32_t onPassKeyDisplay() { uint32_t passkey = config.bluetooth.fixed_pin; @@ -125,7 +125,7 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks return passkey; } - virtual void onAuthenticationComplete(ble_gap_conn_desc *desc) + virtual void onAuthenticationComplete(NimBLEConnInfo &connInfo) { LOG_INFO("BLE authentication complete"); @@ -138,9 +138,9 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks } } - virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc) + virtual void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason) { - LOG_INFO("BLE disconnect"); + LOG_INFO("BLE disconnect. Reason %i", reason); bluetoothStatus->updateStatus( new meshtastic::BluetoothStatus(meshtastic::BluetoothStatus::ConnectionState::DISCONNECTED)); @@ -191,7 +191,7 @@ int NimbleBluetooth::getRssi() if (bleServer && isConnected()) { auto service = bleServer->getServiceByUUID(MESH_SERVICE_UUID); uint16_t handle = service->getHandle(); - return NimBLEDevice::getClientByID(handle)->getRssi(); + return NimBLEDevice::getClientByHandle(handle)->getRssi(); } return 0; // FIXME figure out where to source this } @@ -216,6 +216,7 @@ void NimbleBluetooth::setup() NimbleBluetoothServerCallback *serverCallbacks = new NimbleBluetoothServerCallback(); bleServer->setCallbacks(serverCallbacks, true); + bleServer->advertiseOnDisconnect(true); setupService(); startAdvertising(); } @@ -259,7 +260,7 @@ void NimbleBluetooth::setupService() BatteryCharacteristic = batteryService->createCharacteristic( // 0x2A19 is the Battery Level characteristic) (uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY, 1); - NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->createDescriptor((uint16_t)0x2904); + NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->create2904(); batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8); batteryLevelDescriptor->setNamespace(1); batteryLevelDescriptor->setUnit(0x27ad); From 74b3dc34e4e230193fa6e5bab9fd88fbce5d574b Mon Sep 17 00:00:00 2001 From: todd-herbert Date: Fri, 18 Apr 2025 10:11:42 +1200 Subject: [PATCH 097/100] Fix crash when clearing NRF52 BLE bonds (#6609) * Fix crash before clearing BLE bonds * Prevent clients re-pairing BLE during factory reset Clients seem able to re-pair BLE after clearing bonds during factory reset, even after advertising disabled. This seems to primarily occur on Android devices, which seem to more actively maintain the BLE connection. As a workaround, `NRF52Bluetooth::shutdown` swaps the BLE pairing callback to one which actively rejects new connections. --------- Co-authored-by: Ben Meadors --- src/mesh/NodeDB.cpp | 1 - src/platform/nrf52/NRF52Bluetooth.cpp | 40 +++++++++++++++++++-------- src/platform/nrf52/NRF52Bluetooth.h | 3 ++ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 90a90e89f..67f0da600 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -450,7 +450,6 @@ bool NodeDB::factoryReset(bool eraseBleBonds) nvs_flash_erase(); #endif #ifdef ARCH_NRF52 - Bluefruit.begin(); LOG_INFO("Clear bluetooth bonds!"); bond_print_list(BLE_GAP_ROLE_PERIPH); bond_print_list(BLE_GAP_ROLE_CENTRAL); diff --git a/src/platform/nrf52/NRF52Bluetooth.cpp b/src/platform/nrf52/NRF52Bluetooth.cpp index 87d8adfa9..4f6fe7c6b 100644 --- a/src/platform/nrf52/NRF52Bluetooth.cpp +++ b/src/platform/nrf52/NRF52Bluetooth.cpp @@ -210,17 +210,8 @@ void NRF52Bluetooth::shutdown() { // Shutdown bluetooth for minimum power draw LOG_INFO("Disable NRF52 bluetooth"); - uint8_t connection_num = Bluefruit.connected(); - if (connection_num) { - for (uint8_t i = 0; i < connection_num; i++) { - LOG_INFO("NRF52 bluetooth disconnecting handle %d", i); - Bluefruit.disconnect(i); - } - // Wait for disconnection - while (Bluefruit.connected()) - yield(); - LOG_INFO("All bluetooth connections ended"); - } + Bluefruit.Security.setPairPasskeyCallback(NRF52Bluetooth::onUnwantedPairing); // Actively refuse (during factory reset) + disconnect(); Bluefruit.Advertising.stop(); } void NRF52Bluetooth::startDisabled() @@ -372,6 +363,33 @@ bool NRF52Bluetooth::onPairingPasskey(uint16_t conn_handle, uint8_t const passke LOG_INFO("BLE passkey pair: match_request=%i", match_request); return true; } + +// Actively refuse new BLE pairings +// After clearing bonds (at factory reset), clients seem initially able to attempt to re-pair, even with advertising disabled. +// On NRF52Bluetooth::shutdown, we change the pairing callback to this method, to aggressively refuse any connection attempts. +bool NRF52Bluetooth::onUnwantedPairing(uint16_t conn_handle, uint8_t const passkey[6], bool match_request) +{ + NRF52Bluetooth::disconnect(); + return false; +} + +// Disconnect any BLE connections +void NRF52Bluetooth::disconnect() +{ + uint8_t connection_num = Bluefruit.connected(); + if (connection_num) { + // Close all connections. We're only expecting one. + for (uint8_t i = 0; i < connection_num; i++) + Bluefruit.disconnect(i); + + // Wait for disconnection + while (Bluefruit.connected()) + yield(); + + LOG_INFO("Ended BLE connection"); + } +} + void NRF52Bluetooth::onPairingCompleted(uint16_t conn_handle, uint8_t auth_status) { if (auth_status == BLE_GAP_SEC_STATUS_SUCCESS) { diff --git a/src/platform/nrf52/NRF52Bluetooth.h b/src/platform/nrf52/NRF52Bluetooth.h index 2229163f8..630ab05bc 100644 --- a/src/platform/nrf52/NRF52Bluetooth.h +++ b/src/platform/nrf52/NRF52Bluetooth.h @@ -19,4 +19,7 @@ class NRF52Bluetooth : BluetoothApi static void onConnectionSecured(uint16_t conn_handle); static bool onPairingPasskey(uint16_t conn_handle, uint8_t const passkey[6], bool match_request); static void onPairingCompleted(uint16_t conn_handle, uint8_t auth_status); + + static bool onUnwantedPairing(uint16_t conn_handle, uint8_t const passkey[6], bool match_request); + static void disconnect(); }; \ No newline at end of file From 9da141aa8c062bfb3664214d0945fb95b6a44e8a Mon Sep 17 00:00:00 2001 From: Austin Date: Fri, 18 Apr 2025 08:27:38 -0400 Subject: [PATCH 098/100] Add TFT docker builds (for CI) (#6614) --- .github/workflows/docker_build.yml | 7 +++++++ .github/workflows/main_matrix.yml | 26 ++++++++++++++++++++++---- Dockerfile | 13 ++++++++----- alpine.Dockerfile | 6 ++++-- bin/build-native.sh | 7 ++++--- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index eec0785c0..cde7fd274 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -26,6 +26,11 @@ on: required: false type: boolean default: false + pio_env: + description: PlatformIO environment to build + required: false + type: string + default: native outputs: digest: description: Digest of built image @@ -90,3 +95,5 @@ jobs: push: ${{ inputs.push }} tags: ${{ steps.meta.outputs.tags }} # Tag is only meant to be consumed by the "manifest" job platforms: ${{ inputs.platform }} + build-args: | + PIO_ENV=${{ inputs.pio_env }} diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index 5b11926f2..0889ce22e 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -145,7 +145,7 @@ jobs: test-native: uses: ./.github/workflows/test_native.yml - docker-debian-amd64: + docker-deb-amd64: uses: ./.github/workflows/docker_build.yml with: distro: debian @@ -153,7 +153,16 @@ jobs: runs-on: ubuntu-24.04 push: false - docker-alpine-amd64: + docker-deb-amd64-tft: + uses: ./.github/workflows/docker_build.yml + with: + distro: debian + platform: linux/amd64 + runs-on: ubuntu-24.04 + push: false + pio_env: native-tft + + docker-alp-amd64: uses: ./.github/workflows/docker_build.yml with: distro: alpine @@ -161,7 +170,16 @@ jobs: runs-on: ubuntu-24.04 push: false - docker-debian-arm64: + docker-alp-amd64-tft: + uses: ./.github/workflows/docker_build.yml + with: + distro: alpine + platform: linux/amd64 + runs-on: ubuntu-24.04 + push: false + pio_env: native-tft + + docker-deb-arm64: uses: ./.github/workflows/docker_build.yml with: distro: debian @@ -169,7 +187,7 @@ jobs: runs-on: ubuntu-24.04-arm push: false - docker-debian-armv7: + docker-deb-armv7: uses: ./.github/workflows/docker_build.yml with: distro: debian diff --git a/Dockerfile b/Dockerfile index 55580c579..be192f216 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue # trunk-ignore-all(trivy/DS002): We must run as root for this container -# trunk-ignore-all(checkov/CKV_DOCKER_8): We must run as root for this container # trunk-ignore-all(hadolint/DL3002): We must run as root for this container # trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions +ARG PIO_ENV=native FROM python:3.13-bookworm AS builder ENV DEBIAN_FRONTEND=noninteractive @@ -12,9 +12,10 @@ ENV TZ=Etc/UTC # Install Dependencies ENV PIP_ROOT_USER_ACTION=ignore RUN apt-get update && apt-get install --no-install-recommends -y \ - curl wget g++ zip git ca-certificates \ + curl wget g++ zip git ca-certificates pkg-config \ libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \ - libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \ + libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \ + libx11-dev libinput-dev libxkbcommon-x11-dev \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ && pip install --no-cache-dir -U platformio \ && mkdir /tmp/firmware @@ -24,7 +25,7 @@ WORKDIR /tmp/firmware COPY . /tmp/firmware # Build -RUN bash ./bin/build-native.sh && \ +RUN bash ./bin/build-native.sh "$PIO_ENV" && \ cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd" # Fetch web assets @@ -44,7 +45,9 @@ ENV TZ=Etc/UTC USER root RUN apt-get update && apt-get --no-install-recommends -y install \ - libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev liborcania2.3 libulfius2.7 libssl3 \ + libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev \ + liborcania2.3 libulfius2.7 libssl3 \ + libx11-6 libinput10 libxkbcommon-x11-0 \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ && mkdir -p /var/lib/meshtasticd \ && mkdir -p /etc/meshtasticd/config.d \ diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 17afc2964..f85c147da 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -1,8 +1,8 @@ # trunk-ignore-all(trivy/DS002): We must run as root for this container -# trunk-ignore-all(checkov/CKV_DOCKER_8): We must run as root for this container # trunk-ignore-all(hadolint/DL3002): We must run as root for this container # trunk-ignore-all(hadolint/DL3018): Do not pin apk package versions # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions +ARG PIO_ENV=native FROM python:3.13-alpine3.21 AS builder @@ -10,6 +10,7 @@ ENV PIP_ROOT_USER_ACTION=ignore RUN apk --no-cache add \ bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \ libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \ + libx11-dev libinput-dev libxkbcommon-dev \ && rm -rf /var/cache/apk/* \ && pip install --no-cache-dir -U platformio \ && mkdir /tmp/firmware @@ -21,7 +22,7 @@ COPY . /tmp/firmware # Add `argp` for musl ENV PLATFORMIO_BUILD_FLAGS="-Os -ffunction-sections -fdata-sections -Wl,--gc-sections -largp" -RUN bash ./bin/build-native.sh && \ +RUN bash ./bin/build-native.sh "$PIO_ENV" && \ cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd" # ##### PRODUCTION BUILD ############# @@ -33,6 +34,7 @@ USER root RUN apk --no-cache add \ libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \ + libx11 libinput libxkbcommon \ && rm -rf /var/cache/apk/* \ && mkdir -p /var/lib/meshtasticd \ && mkdir -p /etc/meshtasticd/config.d \ diff --git a/bin/build-native.sh b/bin/build-native.sh index c6b1434dd..51379ad76 100755 --- a/bin/build-native.sh +++ b/bin/build-native.sh @@ -15,6 +15,7 @@ platformioFailed() { VERSION=$(bin/buildinfo.py long) SHORT_VERSION=$(bin/buildinfo.py short) +PIO_ENV=${1:-native} OUTDIR=release/ @@ -24,7 +25,7 @@ mkdir -p $OUTDIR/ rm -r $OUTDIR/* || true # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale -pio pkg update --environment native || platformioFailed -pio run --environment native || platformioFailed -cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)" +pio pkg update --environment "$PIO_ENV" || platformioFailed +pio run --environment "$PIO_ENV" || platformioFailed +cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)" cp bin/native-install.* $OUTDIR From 64a1cd3f99ca39f08f302b0cecd6b6aa0fdf4231 Mon Sep 17 00:00:00 2001 From: Austin Date: Fri, 18 Apr 2025 10:29:39 -0400 Subject: [PATCH 099/100] Docker is fun (#6623) --- Dockerfile | 2 +- alpine.Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index be192f216..6c1b83653 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ # trunk-ignore-all(hadolint/DL3002): We must run as root for this container # trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions -ARG PIO_ENV=native FROM python:3.13-bookworm AS builder +ARG PIO_ENV=native ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Etc/UTC diff --git a/alpine.Dockerfile b/alpine.Dockerfile index f85c147da..f4a95095d 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -2,11 +2,11 @@ # trunk-ignore-all(hadolint/DL3002): We must run as root for this container # trunk-ignore-all(hadolint/DL3018): Do not pin apk package versions # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions -ARG PIO_ENV=native FROM python:3.13-alpine3.21 AS builder - +ARG PIO_ENV=native ENV PIP_ROOT_USER_ACTION=ignore + RUN apk --no-cache add \ bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \ libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \ From 5ab1db01420210896082eb4fcc2be741a23b1d70 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 09:36:23 -0500 Subject: [PATCH 100/100] chore(deps): update meshtastic-device-ui digest to 65eb74f (#6624) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 85505d63a..f0756cb89 100644 --- a/platformio.ini +++ b/platformio.ini @@ -108,7 +108,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/da8fb5eaac7874c31508fad5252999ec82c02498.zip + https://github.com/meshtastic/device-ui/archive/65eb74fadf373e3ceec0bddb95a7cb978e2acd81.zip ; Common libs for environmental measurements in telemetry module ; (not included in native / portduino)