kopia lustrzana https://github.com/meshtastic/firmware
Update max channels in protos & remove batt_lvl from position flags
rodzic
3b4c8ad0e2
commit
3ed9a05ac6
|
@ -1 +1 @@
|
||||||
Subproject commit 88ad1b2e34286a6a6f71bc62b1ea24e82ca513e4
|
Subproject commit 92fa1ac991d8424fba3b23196a4f8ef8e355e20f
|
|
@ -19,7 +19,7 @@
|
||||||
typedef struct _ChannelSet {
|
typedef struct _ChannelSet {
|
||||||
/* TODO: REPLACE */
|
/* TODO: REPLACE */
|
||||||
pb_size_t settings_count;
|
pb_size_t settings_count;
|
||||||
ChannelSettings settings[10];
|
ChannelSettings settings[8];
|
||||||
} ChannelSet;
|
} ChannelSet;
|
||||||
|
|
||||||
|
|
||||||
|
@ -28,8 +28,8 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Initializer values for message structs */
|
/* Initializer values for message structs */
|
||||||
#define ChannelSet_init_default {0, {ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default}}
|
#define ChannelSet_init_default {0, {ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default}}
|
||||||
#define ChannelSet_init_zero {0, {ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero}}
|
#define ChannelSet_init_zero {0, {ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero}}
|
||||||
|
|
||||||
/* Field tags (for use in manual encoding/decoding) */
|
/* Field tags (for use in manual encoding/decoding) */
|
||||||
#define ChannelSet_settings_tag 1
|
#define ChannelSet_settings_tag 1
|
||||||
|
@ -47,7 +47,7 @@ extern const pb_msgdesc_t ChannelSet_msg;
|
||||||
#define ChannelSet_fields &ChannelSet_msg
|
#define ChannelSet_fields &ChannelSet_msg
|
||||||
|
|
||||||
/* Maximum encoded size of messages (where known) */
|
/* Maximum encoded size of messages (where known) */
|
||||||
#define ChannelSet_size 630
|
#define ChannelSet_size 504
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
|
|
|
@ -25,10 +25,9 @@ typedef enum _Config_PositionConfig_PositionFlags {
|
||||||
Config_PositionConfig_PositionFlags_POS_GEO_SEP = 4,
|
Config_PositionConfig_PositionFlags_POS_GEO_SEP = 4,
|
||||||
Config_PositionConfig_PositionFlags_POS_DOP = 8,
|
Config_PositionConfig_PositionFlags_POS_DOP = 8,
|
||||||
Config_PositionConfig_PositionFlags_POS_HVDOP = 16,
|
Config_PositionConfig_PositionFlags_POS_HVDOP = 16,
|
||||||
Config_PositionConfig_PositionFlags_POS_BATTERY = 32,
|
Config_PositionConfig_PositionFlags_POS_SATINVIEW = 32,
|
||||||
Config_PositionConfig_PositionFlags_POS_SATINVIEW = 64,
|
Config_PositionConfig_PositionFlags_POS_SEQ_NOS = 64,
|
||||||
Config_PositionConfig_PositionFlags_POS_SEQ_NOS = 128,
|
Config_PositionConfig_PositionFlags_POS_TIMESTAMP = 128
|
||||||
Config_PositionConfig_PositionFlags_POS_TIMESTAMP = 256
|
|
||||||
} Config_PositionConfig_PositionFlags;
|
} Config_PositionConfig_PositionFlags;
|
||||||
|
|
||||||
typedef enum _Config_PowerConfig_ChargeCurrent {
|
typedef enum _Config_PowerConfig_ChargeCurrent {
|
||||||
|
|
Ładowanie…
Reference in New Issue