pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-24 05:50:16 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into StoreAndForwardAllowed

Browse Source
This commit is contained in:
Ben Meadors 2025-03-15 08:13:16 -05:00 committed by GitHub
commit 29959d0694
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.trunk/trunk.yaml
View File

@ -1,6 +1,6 @@
version: 0.1 version: 0.1
cli: cli:
version: 1.22.10 version: 1.22.11
plugins: plugins:
sources: sources:
- id: trunk - id: trunk
@ -12,7 +12,7 @@ lint:
- trufflehog@3.88.16 - trufflehog@3.88.16
- yamllint@1.36.0 - yamllint@1.36.0
- bandit@1.8.3 - bandit@1.8.3
- checkov@3.2.382 - checkov@3.2.384
- terrascan@1.19.9 - terrascan@1.19.9
- trivy@0.60.0 - trivy@0.60.0
- taplo@0.9.3 - taplo@0.9.3

2
protobufs

@ -1 +1 @@
Subproject commit 035a8017b87379f17624f7bba9b6a5b127bc026c Subproject commit 14ec205865592fcfa798065bb001a549fc77b438

2
src/mesh/generated/meshtastic/admin.pb.h
View File

@ -34,7 +34,7 @@ typedef enum _meshtastic_AdminMessage_ConfigType {
meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6, meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6,
/* TODO: REPLACE */ /* TODO: REPLACE */
meshtastic_AdminMessage_ConfigType_SECURITY_CONFIG = 7, meshtastic_AdminMessage_ConfigType_SECURITY_CONFIG = 7,
/* */ /* Session key config */
meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG = 8, meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG = 8,
/* device-ui config */ /* device-ui config */
meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG = 9 meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG = 9

2
src/mesh/generated/meshtastic/config.pb.h
View File

@ -426,7 +426,7 @@ typedef struct _meshtastic_Config_NetworkConfig {
char wifi_ssid[33]; char wifi_ssid[33];
/* If set, will be use to authenticate to the named wifi */ /* If set, will be use to authenticate to the named wifi */
char wifi_psk[65]; char wifi_psk[65];
/* NTP server to use if WiFi is conneced, defaults to `0.pool.ntp.org` */ /* NTP server to use if WiFi is conneced, defaults to `meshtastic.pool.ntp.org` */
char ntp_server[33]; char ntp_server[33];
/* Enable Ethernet */ /* Enable Ethernet */
bool eth_enabled; bool eth_enabled;

2
src/mesh/generated/meshtastic/device_ui.pb.h
View File

@ -53,6 +53,8 @@ typedef enum _meshtastic_Language {
meshtastic_Language_NORWEGIAN = 14, meshtastic_Language_NORWEGIAN = 14,
/* Slovenian */ /* Slovenian */
meshtastic_Language_SLOVENIAN = 15, meshtastic_Language_SLOVENIAN = 15,
/* Ukrainian */
meshtastic_Language_UKRAINIAN = 16,
/* Simplified Chinese (experimental) */ /* Simplified Chinese (experimental) */
meshtastic_Language_SIMPLIFIED_CHINESE = 30, meshtastic_Language_SIMPLIFIED_CHINESE = 30,
/* Traditional Chinese (experimental) */ /* Traditional Chinese (experimental) */

7
src/mesh/generated/meshtastic/mesh.pb.h
View File

@ -228,6 +228,13 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_MESHLINK = 87, meshtastic_HardwareModel_MESHLINK = 87,
/* Seeed XIAO nRF52840 + Wio SX1262 kit */ /* Seeed XIAO nRF52840 + Wio SX1262 kit */
meshtastic_HardwareModel_XIAO_NRF52_KIT = 88, meshtastic_HardwareModel_XIAO_NRF52_KIT = 88,
/* Elecrow ThinkNode M1 & M2
https://www.elecrow.com/wiki/ThinkNode-M1_Transceiver_Device(Meshtastic)_Power_By_nRF52840.html
https://www.elecrow.com/wiki/ThinkNode-M2_Transceiver_Device(Meshtastic)_Power_By_NRF52840.html (this actually uses ESP32-S3) */
meshtastic_HardwareModel_THINKNODE_M1 = 89,
meshtastic_HardwareModel_THINKNODE_M2 = 90,
/* Lilygo T-ETH-Elite */
meshtastic_HardwareModel_T_ETH_ELITE = 91,
/* ------------------------------------------------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------------------------------------------------
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. 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.
------------------------------------------------------------------------------------------------------------------------------------------ */ ------------------------------------------------------------------------------------------------------------------------------------------ */

8
src/modules/AdminModule.cpp
View File

@ -637,6 +637,14 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
#if !MESHTASTIC_EXCLUDE_PKI #if !MESHTASTIC_EXCLUDE_PKI
crypto->setDHPrivateKey(config.security.private_key.bytes); crypto->setDHPrivateKey(config.security.private_key.bytes);
#endif #endif
if (config.security.is_managed && !(config.security.admin_key[0].size == 32 || config.security.admin_key[1].size == 32 ||
config.security.admin_key[2].size == 32)) {
config.security.is_managed = false;
const char *warning = "You must provide at least one admin public key to enable managed mode";
LOG_WARN(warning);
sendWarning(warning);
}
if (config.security.debug_log_api_enabled == c.payload_variant.security.debug_log_api_enabled && if (config.security.debug_log_api_enabled == c.payload_variant.security.debug_log_api_enabled &&
config.security.serial_enabled == c.payload_variant.security.serial_enabled) config.security.serial_enabled == c.payload_variant.security.serial_enabled)
requiresReboot = false; requiresReboot = false;

1
variants/tlora_v3_3_0_tcxo/platformio.ini
View File

@ -1,7 +1,6 @@
[env:tlora-v3-3-0-tcxo] [env:tlora-v3-3-0-tcxo]
extends = esp32_base extends = esp32_base
board = ttgo-lora32-v21 board = ttgo-lora32-v21
board_level = extra
build_flags = build_flags =
${esp32_base.build_flags} ${esp32_base.build_flags}
-D TLORA_V2_1_16 -D TLORA_V2_1_16