mirror of
https://github.com/meshtastic/firmware.git
synced 2025-07-30 02:15:41 +00:00
Update protobufs
This commit is contained in:
caveman99
github-actions[bot]
parent
b3525c2569
commit
f4fdeb6d22
@ -1 +1 @@
|
||||
Subproject commit 15c1fbde882de953dec279160fa984d0e00569d0
|
||||
Subproject commit fa02e14d8d01850336eaea0e9552aef4f08f0a40
|
||||
@ -293,7 +293,11 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode {
|
||||
/* Kazakhstan 433MHz */
|
||||
meshtastic_Config_LoRaConfig_RegionCode_KZ_433 = 23,
|
||||
/* Kazakhstan 863MHz */
|
||||
meshtastic_Config_LoRaConfig_RegionCode_KZ_863 = 24
|
||||
meshtastic_Config_LoRaConfig_RegionCode_KZ_863 = 24,
|
||||
/* Nepal 865MHz */
|
||||
meshtastic_Config_LoRaConfig_RegionCode_NP_865 = 25,
|
||||
/* Brazil 902MHz */
|
||||
meshtastic_Config_LoRaConfig_RegionCode_BR_902 = 26
|
||||
} meshtastic_Config_LoRaConfig_RegionCode;
|
||||
|
||||
/* Standard predefined channel settings
|
||||
@ -690,8 +694,8 @@ extern "C" {
|
||||
#define _meshtastic_Config_DisplayConfig_CompassOrientation_ARRAYSIZE ((meshtastic_Config_DisplayConfig_CompassOrientation)(meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270_INVERTED+1))
|
||||
|
||||
#define _meshtastic_Config_LoRaConfig_RegionCode_MIN meshtastic_Config_LoRaConfig_RegionCode_UNSET
|
||||
#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_KZ_863
|
||||
#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_KZ_863+1))
|
||||
#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_BR_902
|
||||
#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_BR_902+1))
|
||||
|
||||
#define _meshtastic_Config_LoRaConfig_ModemPreset_MIN meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST
|
||||
#define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO
|
||||
|
||||
@ -97,7 +97,9 @@ typedef enum _meshtastic_TelemetrySensorType {
|
||||
/* ADS1X15 ADC_ALT */
|
||||
meshtastic_TelemetrySensorType_ADS1X15_ALT = 41,
|
||||
/* Sensirion SFA30 Formaldehyde sensor */
|
||||
meshtastic_TelemetrySensorType_SFA30 = 42
|
||||
meshtastic_TelemetrySensorType_SFA30 = 42,
|
||||
/* SEN5X PM SENSORS */
|
||||
meshtastic_TelemetrySensorType_SEN5X = 43
|
||||
} meshtastic_TelemetrySensorType;
|
||||
|
||||
/* Struct definitions */
|
||||
@ -246,40 +248,40 @@ typedef struct _meshtastic_PowerMetrics {
|
||||
|
||||
/* Air quality metrics */
|
||||
typedef struct _meshtastic_AirQualityMetrics {
|
||||
/* Concentration Units Standard PM1.0 */
|
||||
/* Concentration Units Standard PM1.0 in ug/m3 */
|
||||
bool has_pm10_standard;
|
||||
uint32_t pm10_standard;
|
||||
/* Concentration Units Standard PM2.5 */
|
||||
/* Concentration Units Standard PM2.5 in ug/m3 */
|
||||
bool has_pm25_standard;
|
||||
uint32_t pm25_standard;
|
||||
/* Concentration Units Standard PM10.0 */
|
||||
/* Concentration Units Standard PM10.0 in ug/m3 */
|
||||
bool has_pm100_standard;
|
||||
uint32_t pm100_standard;
|
||||
/* Concentration Units Environmental PM1.0 */
|
||||
/* Concentration Units Environmental PM1.0 in ug/m3 */
|
||||
bool has_pm10_environmental;
|
||||
uint32_t pm10_environmental;
|
||||
/* Concentration Units Environmental PM2.5 */
|
||||
/* Concentration Units Environmental PM2.5 in ug/m3 */
|
||||
bool has_pm25_environmental;
|
||||
uint32_t pm25_environmental;
|
||||
/* Concentration Units Environmental PM10.0 */
|
||||
/* Concentration Units Environmental PM10.0 in ug/m3 */
|
||||
bool has_pm100_environmental;
|
||||
uint32_t pm100_environmental;
|
||||
/* 0.3um Particle Count */
|
||||
/* 0.3um Particle Count in #/0.1l */
|
||||
bool has_particles_03um;
|
||||
uint32_t particles_03um;
|
||||
/* 0.5um Particle Count */
|
||||
/* 0.5um Particle Count in #/0.1l */
|
||||
bool has_particles_05um;
|
||||
uint32_t particles_05um;
|
||||
/* 1.0um Particle Count */
|
||||
/* 1.0um Particle Count in #/0.1l */
|
||||
bool has_particles_10um;
|
||||
uint32_t particles_10um;
|
||||
/* 2.5um Particle Count */
|
||||
/* 2.5um Particle Count in #/0.1l */
|
||||
bool has_particles_25um;
|
||||
uint32_t particles_25um;
|
||||
/* 5.0um Particle Count */
|
||||
/* 5.0um Particle Count in #/0.1l */
|
||||
bool has_particles_50um;
|
||||
uint32_t particles_50um;
|
||||
/* 10.0um Particle Count */
|
||||
/* 10.0um Particle Count in #/0.1l */
|
||||
bool has_particles_100um;
|
||||
uint32_t particles_100um;
|
||||
/* CO2 concentration in ppm */
|
||||
@ -300,6 +302,27 @@ typedef struct _meshtastic_AirQualityMetrics {
|
||||
/* Formaldehyde sensor temperature in degrees Celsius */
|
||||
bool has_form_temperature;
|
||||
float form_temperature;
|
||||
/* Concentration Units Standard PM4.0 in ug/m3 */
|
||||
bool has_pm40_standard;
|
||||
uint32_t pm40_standard;
|
||||
/* 4.0um Particle Count in #/0.1l */
|
||||
bool has_particles_40um;
|
||||
uint32_t particles_40um;
|
||||
/* PM Sensor Temperature */
|
||||
bool has_pm_temperature;
|
||||
float pm_temperature;
|
||||
/* PM Sensor humidity */
|
||||
bool has_pm_humidity;
|
||||
float pm_humidity;
|
||||
/* PM Sensor VOC Index */
|
||||
bool has_pm_voc_idx;
|
||||
float pm_voc_idx;
|
||||
/* PM Sensor NOx Index */
|
||||
bool has_pm_nox_idx;
|
||||
float pm_nox_idx;
|
||||
/* Typical Particle Size in um */
|
||||
bool has_particles_tps;
|
||||
float particles_tps;
|
||||
} meshtastic_AirQualityMetrics;
|
||||
|
||||
/* Local device mesh statistics */
|
||||
@ -411,8 +434,8 @@ extern "C" {
|
||||
|
||||
/* Helper constants for enums */
|
||||
#define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
|
||||
#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_SFA30
|
||||
#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_SFA30+1))
|
||||
#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_SEN5X
|
||||
#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_SEN5X+1))
|
||||
|
||||
|
||||
|
||||
@ -428,7 +451,7 @@ extern "C" {
|
||||
#define meshtastic_DeviceMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_PowerMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_LocalStats_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
||||
#define meshtastic_HealthMetrics_init_default {false, 0, false, 0, false, 0}
|
||||
#define meshtastic_HostMetrics_init_default {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
|
||||
@ -437,7 +460,7 @@ extern "C" {
|
||||
#define meshtastic_DeviceMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_EnvironmentMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_PowerMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_AirQualityMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_AirQualityMetrics_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
|
||||
#define meshtastic_LocalStats_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
|
||||
#define meshtastic_HealthMetrics_init_zero {false, 0, false, 0, false, 0}
|
||||
#define meshtastic_HostMetrics_init_zero {0, 0, 0, false, 0, false, 0, 0, 0, 0, false, ""}
|
||||
@ -506,6 +529,13 @@ extern "C" {
|
||||
#define meshtastic_AirQualityMetrics_form_formaldehyde_tag 16
|
||||
#define meshtastic_AirQualityMetrics_form_humidity_tag 17
|
||||
#define meshtastic_AirQualityMetrics_form_temperature_tag 18
|
||||
#define meshtastic_AirQualityMetrics_pm40_standard_tag 19
|
||||
#define meshtastic_AirQualityMetrics_particles_40um_tag 20
|
||||
#define meshtastic_AirQualityMetrics_pm_temperature_tag 21
|
||||
#define meshtastic_AirQualityMetrics_pm_humidity_tag 22
|
||||
#define meshtastic_AirQualityMetrics_pm_voc_idx_tag 23
|
||||
#define meshtastic_AirQualityMetrics_pm_nox_idx_tag 24
|
||||
#define meshtastic_AirQualityMetrics_particles_tps_tag 25
|
||||
#define meshtastic_LocalStats_uptime_seconds_tag 1
|
||||
#define meshtastic_LocalStats_channel_utilization_tag 2
|
||||
#define meshtastic_LocalStats_air_util_tx_tag 3
|
||||
@ -616,7 +646,14 @@ X(a, STATIC, OPTIONAL, FLOAT, co2_temperature, 14) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, co2_humidity, 15) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, form_formaldehyde, 16) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, form_humidity, 17) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, form_temperature, 18)
|
||||
X(a, STATIC, OPTIONAL, FLOAT, form_temperature, 18) \
|
||||
X(a, STATIC, OPTIONAL, UINT32, pm40_standard, 19) \
|
||||
X(a, STATIC, OPTIONAL, UINT32, particles_40um, 20) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, pm_temperature, 21) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, pm_humidity, 22) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, pm_voc_idx, 23) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, pm_nox_idx, 24) \
|
||||
X(a, STATIC, OPTIONAL, FLOAT, particles_tps, 25)
|
||||
#define meshtastic_AirQualityMetrics_CALLBACK NULL
|
||||
#define meshtastic_AirQualityMetrics_DEFAULT NULL
|
||||
|
||||
@ -705,7 +742,7 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
|
||||
|
||||
/* Maximum encoded size of messages (where known) */
|
||||
#define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
|
||||
#define meshtastic_AirQualityMetrics_size 106
|
||||
#define meshtastic_AirQualityMetrics_size 150
|
||||
#define meshtastic_DeviceMetrics_size 27
|
||||
#define meshtastic_EnvironmentMetrics_size 113
|
||||
#define meshtastic_HealthMetrics_size 11
|
||||
|
||||
Loading…
Reference in New Issue
Block a user