Skip to content

Commit

Permalink
Message type enumeration
Browse files Browse the repository at this point in the history
  • Loading branch information
Tanner Ryan committed Feb 8, 2020
1 parent 94763ac commit 9578946
Show file tree
Hide file tree
Showing 4 changed files with 198 additions and 142 deletions.
18 changes: 10 additions & 8 deletions protocol/cc/Telemetry.pb.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automatically generated nanopb constant definitions */
/* Generated by nanopb-0.3.9.5 at Fri Feb 7 20:51:37 2020. */
/* Generated by nanopb-0.3.9.5 at Fri Feb 7 21:07:24 2020. */

#include "telemetry.pb.h"

Expand All @@ -10,11 +10,12 @@



const pb_field_t Telemetry_fields[5] = {
PB_ONEOF_FIELD(message, 1, MESSAGE , ONEOF, STATIC , FIRST, Telemetry, registration, registration, &Registration_fields),
PB_ONEOF_FIELD(message, 2, MESSAGE , ONEOF, STATIC , UNION, Telemetry, provisioning, provisioning, &Provisioning_fields),
PB_ONEOF_FIELD(message, 3, MESSAGE , ONEOF, STATIC , UNION, Telemetry, payload, payload, &Payload_fields),
PB_ONEOF_FIELD(message, 4, MESSAGE , ONEOF, STATIC , UNION, Telemetry, request, request, &Request_fields),
const pb_field_t Telemetry_fields[6] = {
PB_FIELD( 1, UENUM , SINGULAR, STATIC , FIRST, Telemetry, message, message, 0),
PB_FIELD( 2, MESSAGE , SINGULAR, STATIC , OTHER, Telemetry, registration, message, &Registration_fields),
PB_FIELD( 3, MESSAGE , SINGULAR, STATIC , OTHER, Telemetry, provisioning, registration, &Provisioning_fields),
PB_FIELD( 4, MESSAGE , SINGULAR, STATIC , OTHER, Telemetry, payload, provisioning, &Payload_fields),
PB_FIELD( 5, MESSAGE , SINGULAR, STATIC , OTHER, Telemetry, request, payload, &Request_fields),
PB_LAST_FIELD
};

Expand Down Expand Up @@ -67,6 +68,7 @@ const pb_field_t Request_fields[2] = {




/* Check that field information fits in pb_field_t */
#if !defined(PB_FIELD_32BIT)
/* If you get an error here, it means that you need to define PB_FIELD_32BIT
Expand All @@ -76,7 +78,7 @@ const pb_field_t Request_fields[2] = {
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
* field descriptors.
*/
PB_STATIC_ASSERT((pb_membersize(Telemetry, message.registration) < 65536 && pb_membersize(Telemetry, message.provisioning) < 65536 && pb_membersize(Telemetry, message.payload) < 65536 && pb_membersize(Telemetry, message.request) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_Telemetry_Registration_Registration_Peripheral_Provisioning_Provisioning_ReadDef_Payload_Request)
PB_STATIC_ASSERT((pb_membersize(Telemetry, registration) < 65536 && pb_membersize(Telemetry, provisioning) < 65536 && pb_membersize(Telemetry, payload) < 65536 && pb_membersize(Telemetry, request) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_Telemetry_Registration_Registration_Peripheral_Provisioning_Provisioning_ReadDef_Payload_Request)
#endif

#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
Expand All @@ -87,7 +89,7 @@ PB_STATIC_ASSERT((pb_membersize(Telemetry, message.registration) < 65536 && pb_m
* numbers or field sizes that are larger than what can fit in the default
* 8 bit descriptors.
*/
PB_STATIC_ASSERT((pb_membersize(Telemetry, message.registration) < 256 && pb_membersize(Telemetry, message.provisioning) < 256 && pb_membersize(Telemetry, message.payload) < 256 && pb_membersize(Telemetry, message.request) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_Telemetry_Registration_Registration_Peripheral_Provisioning_Provisioning_ReadDef_Payload_Request)
PB_STATIC_ASSERT((pb_membersize(Telemetry, registration) < 256 && pb_membersize(Telemetry, provisioning) < 256 && pb_membersize(Telemetry, payload) < 256 && pb_membersize(Telemetry, request) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_Telemetry_Registration_Registration_Peripheral_Provisioning_Provisioning_ReadDef_Payload_Request)
#endif


Expand Down
48 changes: 30 additions & 18 deletions protocol/cc/Telemetry.pb.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automatically generated nanopb header */
/* Generated by nanopb-0.3.9.5 at Fri Feb 7 20:51:37 2020. */
/* Generated by nanopb-0.3.9.5 at Fri Feb 7 21:07:24 2020. */

#ifndef PB_TELEMETRY_PB_H_INCLUDED
#define PB_TELEMETRY_PB_H_INCLUDED
Expand All @@ -15,6 +15,17 @@ extern "C" {
#endif

/* Enum definitions */
typedef enum _Telemetry_Message {
Telemetry_Message_ZERO = 0,
Telemetry_Message_REGISTRATION = 1,
Telemetry_Message_PROVISIONING = 2,
Telemetry_Message_PAYLOAD = 3,
Telemetry_Message_REQUEST = 4
} Telemetry_Message;
#define _Telemetry_Message_MIN Telemetry_Message_ZERO
#define _Telemetry_Message_MAX Telemetry_Message_REQUEST
#define _Telemetry_Message_ARRAYSIZE ((Telemetry_Message)(Telemetry_Message_REQUEST+1))

typedef enum _Provisioning_ReadDef_RegLength {
Provisioning_ReadDef_RegLength_RL16 = 0,
Provisioning_ReadDef_RegLength_RL8 = 1
Expand All @@ -26,11 +37,13 @@ typedef enum _Provisioning_ReadDef_RegLength {
typedef enum _Request_Action {
Request_Action_REBOOT = 0,
Request_Action_FORCE_READS = 1,
Request_Action_REQUEST_REGISTRATION = 2
Request_Action_FORCE_SCAN = 2,
Request_Action_REQUEST_REGISTRATION = 3,
Request_Action_CLEAR_PREFERENCES = 4
} Request_Action;
#define _Request_Action_MIN Request_Action_REBOOT
#define _Request_Action_MAX Request_Action_REQUEST_REGISTRATION
#define _Request_Action_ARRAYSIZE ((Request_Action)(Request_Action_REQUEST_REGISTRATION+1))
#define _Request_Action_MAX Request_Action_CLEAR_PREFERENCES
#define _Request_Action_ARRAYSIZE ((Request_Action)(Request_Action_CLEAR_PREFERENCES+1))

/* Struct definitions */
typedef struct _Provisioning {
Expand Down Expand Up @@ -80,27 +93,25 @@ typedef struct _Request {
} Request;

typedef struct _Telemetry {
pb_size_t which_message;
union {
Registration registration;
Provisioning provisioning;
Payload payload;
Request request;
} message;
Telemetry_Message message;
Registration registration;
Provisioning provisioning;
Payload payload;
Request request;
/* @@protoc_insertion_point(struct:Telemetry) */
} Telemetry;

/* Default values for struct fields */

/* Initializer values for message structs */
#define Telemetry_init_default {0, {Registration_init_default}}
#define Telemetry_init_default {_Telemetry_Message_MIN, Registration_init_default, Provisioning_init_default, Payload_init_default, Request_init_default}
#define Registration_init_default {0, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
#define Registration_Peripheral_init_default {0, 0, {{NULL}, NULL}}
#define Provisioning_init_default {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
#define Provisioning_ReadDef_init_default {0, _Provisioning_ReadDef_RegLength_MIN, 0, 0, 0, 0}
#define Payload_init_default {0, 0, 0, {{NULL}, NULL}}
#define Request_init_default {_Request_Action_MIN}
#define Telemetry_init_zero {0, {Registration_init_zero}}
#define Telemetry_init_zero {_Telemetry_Message_MIN, Registration_init_zero, Provisioning_init_zero, Payload_init_zero, Request_init_zero}
#define Registration_init_zero {0, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
#define Registration_Peripheral_init_zero {0, 0, {{NULL}, NULL}}
#define Provisioning_init_zero {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
Expand Down Expand Up @@ -131,13 +142,14 @@ typedef struct _Telemetry {
#define Registration_Peripheral_busAddr_tag 2
#define Registration_Peripheral_generalCallResp_tag 3
#define Request_action_tag 1
#define Telemetry_registration_tag 1
#define Telemetry_provisioning_tag 2
#define Telemetry_payload_tag 3
#define Telemetry_request_tag 4
#define Telemetry_message_tag 1
#define Telemetry_registration_tag 2
#define Telemetry_provisioning_tag 3
#define Telemetry_payload_tag 4
#define Telemetry_request_tag 5

/* Struct field encoding specification for nanopb */
extern const pb_field_t Telemetry_fields[5];
extern const pb_field_t Telemetry_fields[6];
extern const pb_field_t Registration_fields[6];
extern const pb_field_t Registration_Peripheral_fields[4];
extern const pb_field_t Provisioning_fields[4];
Expand Down
Loading

0 comments on commit 9578946

Please sign in to comment.