Skip to content

Commit 89f2ddc

Browse files
committed
GPS - match 3a7d109..2aad669
1 parent 30d301d commit 89f2ddc

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/protos/gps.pb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PB_BIND(wippersnapper_gps_GPSRMCResponse, wippersnapper_gps_GPSRMCResponse, AUTO
1818
PB_BIND(wippersnapper_gps_GPGGAResponse, wippersnapper_gps_GPGGAResponse, AUTO)
1919

2020

21-
PB_BIND(wippersnapper_gps_GPSEvent, wippersnapper_gps_GPSEvent, AUTO)
21+
PB_BIND(wippersnapper_gps_GPSEvent, wippersnapper_gps_GPSEvent, 2)
2222

2323

2424

src/protos/gps.pb.h

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ typedef struct _wippersnapper_gps_GPGGAResponse {
6262

6363
/* * GPSEvent represents a collection of GPS event responses, including RMC and GGA data. * */
6464
typedef struct _wippersnapper_gps_GPSEvent {
65-
pb_callback_t rmc_responses; /* * List of RMC responses * */
66-
pb_callback_t gga_responses; /* * List of GGA responses * */
65+
pb_size_t rmc_responses_count;
66+
wippersnapper_gps_GPSRMCResponse rmc_responses[10]; /* * List of RMC responses * */
67+
pb_size_t gga_responses_count;
68+
wippersnapper_gps_GPGGAResponse gga_responses[10]; /* * List of GGA responses * */
6769
} wippersnapper_gps_GPSEvent;
6870

6971

@@ -76,12 +78,12 @@ extern "C" {
7678
#define wippersnapper_gps_GPSDateTime_init_default {0, 0, 0, 0, 0, 0, 0}
7779
#define wippersnapper_gps_GPSRMCResponse_init_default {false, wippersnapper_gps_GPSDateTime_init_default, "", "", "", "", "", "", ""}
7880
#define wippersnapper_gps_GPGGAResponse_init_default {false, wippersnapper_gps_GPSDateTime_init_default, "", "", "", "", 0, 0, "", "", ""}
79-
#define wippersnapper_gps_GPSEvent_init_default {{{NULL}, NULL}, {{NULL}, NULL}}
81+
#define wippersnapper_gps_GPSEvent_init_default {0, {wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default, wippersnapper_gps_GPSRMCResponse_init_default}, 0, {wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default, wippersnapper_gps_GPGGAResponse_init_default}}
8082
#define wippersnapper_gps_GPSConfig_init_zero {0, {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""}, 0}
8183
#define wippersnapper_gps_GPSDateTime_init_zero {0, 0, 0, 0, 0, 0, 0}
8284
#define wippersnapper_gps_GPSRMCResponse_init_zero {false, wippersnapper_gps_GPSDateTime_init_zero, "", "", "", "", "", "", ""}
8385
#define wippersnapper_gps_GPGGAResponse_init_zero {false, wippersnapper_gps_GPSDateTime_init_zero, "", "", "", "", 0, 0, "", "", ""}
84-
#define wippersnapper_gps_GPSEvent_init_zero {{{NULL}, NULL}, {{NULL}, NULL}}
86+
#define wippersnapper_gps_GPSEvent_init_zero {0, {wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero, wippersnapper_gps_GPSRMCResponse_init_zero}, 0, {wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero, wippersnapper_gps_GPGGAResponse_init_zero}}
8587

8688
/* Field tags (for use in manual encoding/decoding) */
8789
#define wippersnapper_gps_GPSConfig_commands_tag 1
@@ -161,9 +163,9 @@ X(a, STATIC, SINGULAR, STRING, geoid_height, 12)
161163
#define wippersnapper_gps_GPGGAResponse_datetime_MSGTYPE wippersnapper_gps_GPSDateTime
162164

163165
#define wippersnapper_gps_GPSEvent_FIELDLIST(X, a) \
164-
X(a, CALLBACK, REPEATED, MESSAGE, rmc_responses, 1) \
165-
X(a, CALLBACK, REPEATED, MESSAGE, gga_responses, 2)
166-
#define wippersnapper_gps_GPSEvent_CALLBACK pb_default_field_callback
166+
X(a, STATIC, REPEATED, MESSAGE, rmc_responses, 1) \
167+
X(a, STATIC, REPEATED, MESSAGE, gga_responses, 2)
168+
#define wippersnapper_gps_GPSEvent_CALLBACK NULL
167169
#define wippersnapper_gps_GPSEvent_DEFAULT NULL
168170
#define wippersnapper_gps_GPSEvent_rmc_responses_MSGTYPE wippersnapper_gps_GPSRMCResponse
169171
#define wippersnapper_gps_GPSEvent_gga_responses_MSGTYPE wippersnapper_gps_GPGGAResponse
@@ -182,11 +184,11 @@ extern const pb_msgdesc_t wippersnapper_gps_GPSEvent_msg;
182184
#define wippersnapper_gps_GPSEvent_fields &wippersnapper_gps_GPSEvent_msg
183185

184186
/* Maximum encoded size of messages (where known) */
185-
/* wippersnapper_gps_GPSEvent_size depends on runtime parameters */
186-
#define WIPPERSNAPPER_GPS_GPS_PB_H_MAX_SIZE wippersnapper_gps_GPSConfig_size
187+
#define WIPPERSNAPPER_GPS_GPS_PB_H_MAX_SIZE wippersnapper_gps_GPSEvent_size
187188
#define wippersnapper_gps_GPGGAResponse_size 168
188189
#define wippersnapper_gps_GPSConfig_size 1467
189190
#define wippersnapper_gps_GPSDateTime_size 77
191+
#define wippersnapper_gps_GPSEvent_size 3130
190192
#define wippersnapper_gps_GPSRMCResponse_size 139
191193

192194
#ifdef __cplusplus

0 commit comments

Comments
 (0)