mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-08 14:12:05 +00:00
[create-pull-request] automated change (#6323)
Co-authored-by: caveman99 <25002+caveman99@users.noreply.github.com>
This commit is contained in:
parent
79233fe99d
commit
99e42b4d22
@ -1 +1 @@
|
||||
Subproject commit 035a8017b87379f17624f7bba9b6a5b127bc026c
|
||||
Subproject commit 14ec205865592fcfa798065bb001a549fc77b438
|
@ -34,7 +34,7 @@ typedef enum _meshtastic_AdminMessage_ConfigType {
|
||||
meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6,
|
||||
/* TODO: REPLACE */
|
||||
meshtastic_AdminMessage_ConfigType_SECURITY_CONFIG = 7,
|
||||
/* */
|
||||
/* Session key config */
|
||||
meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG = 8,
|
||||
/* device-ui config */
|
||||
meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG = 9
|
||||
|
@ -374,7 +374,7 @@ typedef struct _meshtastic_Config_PositionConfig {
|
||||
/* Power Config\
|
||||
See [Power Config](/docs/settings/config/power) for additional power config details. */
|
||||
typedef struct _meshtastic_Config_PowerConfig {
|
||||
/* Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio.
|
||||
/* Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio.
|
||||
Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.
|
||||
Technical Details: Works for ESP32 devices and NRF52 devices in the Sensor or Tracker roles */
|
||||
bool is_power_saving;
|
||||
@ -426,7 +426,7 @@ typedef struct _meshtastic_Config_NetworkConfig {
|
||||
char wifi_ssid[33];
|
||||
/* If set, will be use to authenticate to the named wifi */
|
||||
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];
|
||||
/* Enable Ethernet */
|
||||
bool eth_enabled;
|
||||
|
@ -53,6 +53,8 @@ typedef enum _meshtastic_Language {
|
||||
meshtastic_Language_NORWEGIAN = 14,
|
||||
/* Slovenian */
|
||||
meshtastic_Language_SLOVENIAN = 15,
|
||||
/* Ukrainian */
|
||||
meshtastic_Language_UKRAINIAN = 16,
|
||||
/* Simplified Chinese (experimental) */
|
||||
meshtastic_Language_SIMPLIFIED_CHINESE = 30,
|
||||
/* Traditional Chinese (experimental) */
|
||||
|
@ -159,7 +159,7 @@ typedef enum _meshtastic_HardwareModel {
|
||||
meshtastic_HardwareModel_TD_LORAC = 60,
|
||||
/* CDEBYTE EoRa-S3 board using their own MM modules, clone of LILYGO T3S3 */
|
||||
meshtastic_HardwareModel_CDEBYTE_EORA_S3 = 61,
|
||||
/* TWC_MESH_V4
|
||||
/* TWC_MESH_V4
|
||||
Adafruit NRF52840 feather express with SX1262, SSD1306 OLED and NEO6M GPS */
|
||||
meshtastic_HardwareModel_TWC_MESH_V4 = 62,
|
||||
/* NRF52_PROMICRO_DIY
|
||||
@ -228,6 +228,13 @@ typedef enum _meshtastic_HardwareModel {
|
||||
meshtastic_HardwareModel_MESHLINK = 87,
|
||||
/* Seeed XIAO nRF52840 + Wio SX1262 kit */
|
||||
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.
|
||||
------------------------------------------------------------------------------------------------------------------------------------------ */
|
||||
@ -769,7 +776,7 @@ typedef struct _meshtastic_MeshPacket {
|
||||
meshtastic_MeshPacket_public_key_t public_key;
|
||||
/* Indicates whether the packet was en/decrypted using PKI */
|
||||
bool pki_encrypted;
|
||||
/* Last byte of the node number of the node that should be used as the next hop in routing.
|
||||
/* Last byte of the node number of the node that should be used as the next hop in routing.
|
||||
Set by the firmware internally, clients are not supposed to set this. */
|
||||
uint8_t next_hop;
|
||||
/* Last byte of the node number of the node that will relay/relayed this packet.
|
||||
|
Loading…
Reference in New Issue
Block a user