From d54dad42254303a838fa7fd59a297b5a6b9cb6f2 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 15 Oct 2021 10:07:51 -0700 Subject: [PATCH] update protobufs --- src/mesh/generated/admin.pb.h | 2 +- src/mesh/generated/deviceonly.pb.c | 2 +- src/mesh/generated/deviceonly.pb.h | 2 +- src/mesh/generated/mesh.pb.c | 2 + src/mesh/generated/mesh.pb.h | 102 ++++++++++++++++++++++++++-- src/mesh/generated/radioconfig.pb.c | 1 + src/mesh/generated/radioconfig.pb.h | 30 ++++++-- 7 files changed, 128 insertions(+), 13 deletions(-) diff --git a/src/mesh/generated/admin.pb.h b/src/mesh/generated/admin.pb.h index fe2fc0c2..c6c30969 100644 --- a/src/mesh/generated/admin.pb.h +++ b/src/mesh/generated/admin.pb.h @@ -79,7 +79,7 @@ extern const pb_msgdesc_t AdminMessage_msg; #define AdminMessage_fields &AdminMessage_msg /* Maximum encoded size of messages (where known) */ -#define AdminMessage_size 400 +#define AdminMessage_size 407 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/mesh/generated/deviceonly.pb.c b/src/mesh/generated/deviceonly.pb.c index dd2bb751..764c54fd 100644 --- a/src/mesh/generated/deviceonly.pb.c +++ b/src/mesh/generated/deviceonly.pb.c @@ -12,7 +12,7 @@ PB_BIND(LegacyRadioConfig, LegacyRadioConfig, AUTO) PB_BIND(LegacyRadioConfig_LegacyPreferences, LegacyRadioConfig_LegacyPreferences, AUTO) -PB_BIND(DeviceState, DeviceState, 2) +PB_BIND(DeviceState, DeviceState, 4) PB_BIND(ChannelFile, ChannelFile, 2) diff --git a/src/mesh/generated/deviceonly.pb.h b/src/mesh/generated/deviceonly.pb.h index 76ab8d6a..6c97720b 100644 --- a/src/mesh/generated/deviceonly.pb.h +++ b/src/mesh/generated/deviceonly.pb.h @@ -125,7 +125,7 @@ extern const pb_msgdesc_t ChannelFile_msg; /* Maximum encoded size of messages (where known) */ #define LegacyRadioConfig_size 4 #define LegacyRadioConfig_LegacyPreferences_size 2 -#define DeviceState_size 5190 +#define DeviceState_size 10054 #define ChannelFile_size 832 #ifdef __cplusplus diff --git a/src/mesh/generated/mesh.pb.c b/src/mesh/generated/mesh.pb.c index 8a4a1d0a..1e900039 100644 --- a/src/mesh/generated/mesh.pb.c +++ b/src/mesh/generated/mesh.pb.c @@ -49,3 +49,5 @@ PB_BIND(ToRadio_PeerInfo, ToRadio_PeerInfo, AUTO) + + diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h index 27eef01f..e464cf61 100644 --- a/src/mesh/generated/mesh.pb.h +++ b/src/mesh/generated/mesh.pb.h @@ -53,6 +53,21 @@ typedef enum _CriticalErrorCode { CriticalErrorCode_RadioSpiBug = 11 } CriticalErrorCode; +typedef enum _Position_LocSource { + Position_LocSource_LOCSRC_UNSPECIFIED = 0, + Position_LocSource_LOCSRC_MANUAL_ENTRY = 1, + Position_LocSource_LOCSRC_GPS_INTERNAL = 2, + Position_LocSource_LOCSRC_GPS_EXTERNAL = 3 +} Position_LocSource; + +typedef enum _Position_AltSource { + Position_AltSource_ALTSRC_UNSPECIFIED = 0, + Position_AltSource_ALTSRC_MANUAL_ENTRY = 1, + Position_AltSource_ALTSRC_GPS_INTERNAL = 2, + Position_AltSource_ALTSRC_GPS_EXTERNAL = 3, + Position_AltSource_ALTSRC_BAROMETRIC = 4 +} Position_AltSource; + typedef enum _Routing_Error { Routing_Error_NONE = 0, Routing_Error_NO_ROUTE = 1, @@ -127,6 +142,29 @@ typedef struct _Position { int32_t altitude; int32_t battery_level; uint32_t time; + Position_LocSource location_source; + Position_AltSource altitude_source; + uint32_t pos_timestamp; + int32_t pos_time_millis; + int32_t altitude_hae; + int32_t alt_geoid_sep; + uint32_t PDOP; + uint32_t HDOP; + uint32_t VDOP; + uint32_t gps_accuracy; + uint32_t ground_speed; + uint32_t ground_track; + uint32_t fix_quality; + uint32_t fix_type; + uint32_t sats_in_view; + uint32_t sensor_id; + uint32_t heading; + int32_t roll; + int32_t pitch; + uint32_t air_speed; + uint32_t ground_distance_cm; + uint32_t pos_next_update; + uint32_t pos_seq_number; } Position; typedef struct _RouteDiscovery { @@ -223,6 +261,14 @@ typedef struct _ToRadio { #define _CriticalErrorCode_MAX CriticalErrorCode_RadioSpiBug #define _CriticalErrorCode_ARRAYSIZE ((CriticalErrorCode)(CriticalErrorCode_RadioSpiBug+1)) +#define _Position_LocSource_MIN Position_LocSource_LOCSRC_UNSPECIFIED +#define _Position_LocSource_MAX Position_LocSource_LOCSRC_GPS_EXTERNAL +#define _Position_LocSource_ARRAYSIZE ((Position_LocSource)(Position_LocSource_LOCSRC_GPS_EXTERNAL+1)) + +#define _Position_AltSource_MIN Position_AltSource_ALTSRC_UNSPECIFIED +#define _Position_AltSource_MAX Position_AltSource_ALTSRC_BAROMETRIC +#define _Position_AltSource_ARRAYSIZE ((Position_AltSource)(Position_AltSource_ALTSRC_BAROMETRIC+1)) + #define _Routing_Error_MIN Routing_Error_NONE #define _Routing_Error_MAX Routing_Error_NOT_AUTHORIZED #define _Routing_Error_ARRAYSIZE ((Routing_Error)(Routing_Error_NOT_AUTHORIZED+1)) @@ -241,7 +287,7 @@ extern "C" { #endif /* Initializer values for message structs */ -#define Position_init_default {0, 0, 0, 0, 0} +#define Position_init_default {0, 0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #define User_init_default {"", "", "", {0}, _HardwareModel_MIN, 0} #define RouteDiscovery_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}} #define Routing_init_default {0, {RouteDiscovery_init_default}} @@ -253,7 +299,7 @@ extern "C" { #define FromRadio_init_default {0, 0, {MyNodeInfo_init_default}} #define ToRadio_init_default {0, {MeshPacket_init_default}} #define ToRadio_PeerInfo_init_default {0, 0} -#define Position_init_zero {0, 0, 0, 0, 0} +#define Position_init_zero {0, 0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #define User_init_zero {"", "", "", {0}, _HardwareModel_MIN, 0} #define RouteDiscovery_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}} #define Routing_init_zero {0, {RouteDiscovery_init_zero}} @@ -295,6 +341,29 @@ extern "C" { #define Position_altitude_tag 3 #define Position_battery_level_tag 4 #define Position_time_tag 9 +#define Position_location_source_tag 10 +#define Position_altitude_source_tag 11 +#define Position_pos_timestamp_tag 12 +#define Position_pos_time_millis_tag 13 +#define Position_altitude_hae_tag 14 +#define Position_alt_geoid_sep_tag 15 +#define Position_PDOP_tag 16 +#define Position_HDOP_tag 17 +#define Position_VDOP_tag 18 +#define Position_gps_accuracy_tag 19 +#define Position_ground_speed_tag 20 +#define Position_ground_track_tag 21 +#define Position_fix_quality_tag 22 +#define Position_fix_type_tag 23 +#define Position_sats_in_view_tag 24 +#define Position_sensor_id_tag 25 +#define Position_heading_tag 30 +#define Position_roll_tag 31 +#define Position_pitch_tag 32 +#define Position_air_speed_tag 33 +#define Position_ground_distance_cm_tag 34 +#define Position_pos_next_update_tag 40 +#define Position_pos_seq_number_tag 41 #define RouteDiscovery_route_tag 2 #define ToRadio_PeerInfo_app_version_tag 1 #define ToRadio_PeerInfo_mqtt_gateway_tag 2 @@ -342,7 +411,30 @@ X(a, STATIC, SINGULAR, SFIXED32, latitude_i, 1) \ X(a, STATIC, SINGULAR, SFIXED32, longitude_i, 2) \ X(a, STATIC, SINGULAR, INT32, altitude, 3) \ X(a, STATIC, SINGULAR, INT32, battery_level, 4) \ -X(a, STATIC, SINGULAR, FIXED32, time, 9) +X(a, STATIC, SINGULAR, FIXED32, time, 9) \ +X(a, STATIC, SINGULAR, UENUM, location_source, 10) \ +X(a, STATIC, SINGULAR, UENUM, altitude_source, 11) \ +X(a, STATIC, SINGULAR, FIXED32, pos_timestamp, 12) \ +X(a, STATIC, SINGULAR, INT32, pos_time_millis, 13) \ +X(a, STATIC, SINGULAR, SINT32, altitude_hae, 14) \ +X(a, STATIC, SINGULAR, SINT32, alt_geoid_sep, 15) \ +X(a, STATIC, SINGULAR, UINT32, PDOP, 16) \ +X(a, STATIC, SINGULAR, UINT32, HDOP, 17) \ +X(a, STATIC, SINGULAR, UINT32, VDOP, 18) \ +X(a, STATIC, SINGULAR, UINT32, gps_accuracy, 19) \ +X(a, STATIC, SINGULAR, UINT32, ground_speed, 20) \ +X(a, STATIC, SINGULAR, UINT32, ground_track, 21) \ +X(a, STATIC, SINGULAR, UINT32, fix_quality, 22) \ +X(a, STATIC, SINGULAR, UINT32, fix_type, 23) \ +X(a, STATIC, SINGULAR, UINT32, sats_in_view, 24) \ +X(a, STATIC, SINGULAR, UINT32, sensor_id, 25) \ +X(a, STATIC, SINGULAR, UINT32, heading, 30) \ +X(a, STATIC, SINGULAR, SINT32, roll, 31) \ +X(a, STATIC, SINGULAR, SINT32, pitch, 32) \ +X(a, STATIC, SINGULAR, UINT32, air_speed, 33) \ +X(a, STATIC, SINGULAR, UINT32, ground_distance_cm, 34) \ +X(a, STATIC, SINGULAR, UINT32, pos_next_update, 40) \ +X(a, STATIC, SINGULAR, UINT32, pos_seq_number, 41) #define Position_CALLBACK NULL #define Position_DEFAULT NULL @@ -492,13 +584,13 @@ extern const pb_msgdesc_t ToRadio_PeerInfo_msg; #define ToRadio_PeerInfo_fields &ToRadio_PeerInfo_msg /* Maximum encoded size of messages (where known) */ -#define Position_size 37 +#define Position_size 188 #define User_size 76 #define RouteDiscovery_size 40 #define Routing_size 42 #define Data_size 260 #define MeshPacket_size 309 -#define NodeInfo_size 133 +#define NodeInfo_size 285 #define MyNodeInfo_size 101 #define LogRecord_size 81 #define FromRadio_size 318 diff --git a/src/mesh/generated/radioconfig.pb.c b/src/mesh/generated/radioconfig.pb.c index 62e08dac..26930ae3 100644 --- a/src/mesh/generated/radioconfig.pb.c +++ b/src/mesh/generated/radioconfig.pb.c @@ -19,3 +19,4 @@ PB_BIND(RadioConfig_UserPreferences, RadioConfig_UserPreferences, 2) + diff --git a/src/mesh/generated/radioconfig.pb.h b/src/mesh/generated/radioconfig.pb.h index 91eb29a3..0593bdcc 100644 --- a/src/mesh/generated/radioconfig.pb.h +++ b/src/mesh/generated/radioconfig.pb.h @@ -66,6 +66,19 @@ typedef enum _LocationSharing { LocationSharing_LocDisabled = 2 } LocationSharing; +typedef enum _PositionFlags { + PositionFlags_POS_UNDEFINED = 0, + PositionFlags_POS_ALTITUDE = 1, + PositionFlags_POS_ALT_MSL = 2, + PositionFlags_POS_GEO_SEP = 4, + PositionFlags_POS_DOP = 8, + PositionFlags_POS_HVDOP = 16, + PositionFlags_POS_BATTERY = 32, + PositionFlags_POS_SATINVIEW = 64, + PositionFlags_POS_SEQ_NOS = 128, + PositionFlags_POS_TIMESTAMP = 256 +} PositionFlags; + typedef enum _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType { RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11 = 0 } RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType; @@ -128,6 +141,7 @@ typedef struct _RadioConfig_UserPreferences { RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType environmental_measurement_plugin_sensor_type; uint32_t environmental_measurement_plugin_sensor_pin; bool store_forward_plugin_enabled; + uint32_t position_flags; } RadioConfig_UserPreferences; typedef struct _RadioConfig { @@ -157,6 +171,10 @@ typedef struct _RadioConfig { #define _LocationSharing_MAX LocationSharing_LocDisabled #define _LocationSharing_ARRAYSIZE ((LocationSharing)(LocationSharing_LocDisabled+1)) +#define _PositionFlags_MIN PositionFlags_POS_UNDEFINED +#define _PositionFlags_MAX PositionFlags_POS_TIMESTAMP +#define _PositionFlags_ARRAYSIZE ((PositionFlags)(PositionFlags_POS_TIMESTAMP+1)) + #define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11 #define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MAX RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11 #define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_ARRAYSIZE ((RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType)(RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11+1)) @@ -168,9 +186,9 @@ extern "C" { /* Initializer values for message structs */ #define RadioConfig_init_default {false, RadioConfig_UserPreferences_init_default} -#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0} +#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0} #define RadioConfig_init_zero {false, RadioConfig_UserPreferences_init_zero} -#define RadioConfig_UserPreferences_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0} +#define RadioConfig_UserPreferences_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0} /* Field tags (for use in manual encoding/decoding) */ #define RadioConfig_UserPreferences_position_broadcast_secs_tag 1 @@ -228,6 +246,7 @@ extern "C" { #define RadioConfig_UserPreferences_environmental_measurement_plugin_sensor_type_tag 146 #define RadioConfig_UserPreferences_environmental_measurement_plugin_sensor_pin_tag 147 #define RadioConfig_UserPreferences_store_forward_plugin_enabled_tag 148 +#define RadioConfig_UserPreferences_position_flags_tag 150 #define RadioConfig_preferences_tag 1 /* Struct field encoding specification for nanopb */ @@ -292,7 +311,8 @@ X(a, STATIC, SINGULAR, UINT32, environmental_measurement_plugin_recovery_int X(a, STATIC, SINGULAR, BOOL, environmental_measurement_plugin_display_farenheit, 145) \ X(a, STATIC, SINGULAR, UENUM, environmental_measurement_plugin_sensor_type, 146) \ X(a, STATIC, SINGULAR, UINT32, environmental_measurement_plugin_sensor_pin, 147) \ -X(a, STATIC, SINGULAR, BOOL, store_forward_plugin_enabled, 148) +X(a, STATIC, SINGULAR, BOOL, store_forward_plugin_enabled, 148) \ +X(a, STATIC, SINGULAR, UINT32, position_flags, 150) #define RadioConfig_UserPreferences_CALLBACK NULL #define RadioConfig_UserPreferences_DEFAULT NULL @@ -304,8 +324,8 @@ extern const pb_msgdesc_t RadioConfig_UserPreferences_msg; #define RadioConfig_UserPreferences_fields &RadioConfig_UserPreferences_msg /* Maximum encoded size of messages (where known) */ -#define RadioConfig_size 397 -#define RadioConfig_UserPreferences_size 394 +#define RadioConfig_size 404 +#define RadioConfig_UserPreferences_size 401 #ifdef __cplusplus } /* extern "C" */