Skip to content

Commit 30d301d

Browse files
committed
GPS - match 6811f7b..3a7d109
1 parent 7d22453 commit 30d301d

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

src/protos/gps.pb.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +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)
22+
23+
2124

src/protos/gps.pb.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ typedef struct _wippersnapper_gps_GPGGAResponse {
6060
char geoid_height[10]; /* * Diff between geoid height and WGS84 height * */
6161
} wippersnapper_gps_GPGGAResponse;
6262

63+
/* * GPSEvent represents a collection of GPS event responses, including RMC and GGA data. * */
64+
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 * */
67+
} wippersnapper_gps_GPSEvent;
68+
6369

6470
#ifdef __cplusplus
6571
extern "C" {
@@ -70,10 +76,12 @@ extern "C" {
7076
#define wippersnapper_gps_GPSDateTime_init_default {0, 0, 0, 0, 0, 0, 0}
7177
#define wippersnapper_gps_GPSRMCResponse_init_default {false, wippersnapper_gps_GPSDateTime_init_default, "", "", "", "", "", "", ""}
7278
#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}}
7380
#define wippersnapper_gps_GPSConfig_init_zero {0, {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""}, 0}
7481
#define wippersnapper_gps_GPSDateTime_init_zero {0, 0, 0, 0, 0, 0, 0}
7582
#define wippersnapper_gps_GPSRMCResponse_init_zero {false, wippersnapper_gps_GPSDateTime_init_zero, "", "", "", "", "", "", ""}
7683
#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}}
7785

7886
/* Field tags (for use in manual encoding/decoding) */
7987
#define wippersnapper_gps_GPSConfig_commands_tag 1
@@ -103,6 +111,8 @@ extern "C" {
103111
#define wippersnapper_gps_GPGGAResponse_hdop_tag 10
104112
#define wippersnapper_gps_GPGGAResponse_altitude_tag 11
105113
#define wippersnapper_gps_GPGGAResponse_geoid_height_tag 12
114+
#define wippersnapper_gps_GPSEvent_rmc_responses_tag 1
115+
#define wippersnapper_gps_GPSEvent_gga_responses_tag 2
106116

107117
/* Struct field encoding specification for nanopb */
108118
#define wippersnapper_gps_GPSConfig_FIELDLIST(X, a) \
@@ -150,18 +160,29 @@ X(a, STATIC, SINGULAR, STRING, geoid_height, 12)
150160
#define wippersnapper_gps_GPGGAResponse_DEFAULT NULL
151161
#define wippersnapper_gps_GPGGAResponse_datetime_MSGTYPE wippersnapper_gps_GPSDateTime
152162

163+
#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
167+
#define wippersnapper_gps_GPSEvent_DEFAULT NULL
168+
#define wippersnapper_gps_GPSEvent_rmc_responses_MSGTYPE wippersnapper_gps_GPSRMCResponse
169+
#define wippersnapper_gps_GPSEvent_gga_responses_MSGTYPE wippersnapper_gps_GPGGAResponse
170+
153171
extern const pb_msgdesc_t wippersnapper_gps_GPSConfig_msg;
154172
extern const pb_msgdesc_t wippersnapper_gps_GPSDateTime_msg;
155173
extern const pb_msgdesc_t wippersnapper_gps_GPSRMCResponse_msg;
156174
extern const pb_msgdesc_t wippersnapper_gps_GPGGAResponse_msg;
175+
extern const pb_msgdesc_t wippersnapper_gps_GPSEvent_msg;
157176

158177
/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
159178
#define wippersnapper_gps_GPSConfig_fields &wippersnapper_gps_GPSConfig_msg
160179
#define wippersnapper_gps_GPSDateTime_fields &wippersnapper_gps_GPSDateTime_msg
161180
#define wippersnapper_gps_GPSRMCResponse_fields &wippersnapper_gps_GPSRMCResponse_msg
162181
#define wippersnapper_gps_GPGGAResponse_fields &wippersnapper_gps_GPGGAResponse_msg
182+
#define wippersnapper_gps_GPSEvent_fields &wippersnapper_gps_GPSEvent_msg
163183

164184
/* Maximum encoded size of messages (where known) */
185+
/* wippersnapper_gps_GPSEvent_size depends on runtime parameters */
165186
#define WIPPERSNAPPER_GPS_GPS_PB_H_MAX_SIZE wippersnapper_gps_GPSConfig_size
166187
#define wippersnapper_gps_GPGGAResponse_size 168
167188
#define wippersnapper_gps_GPSConfig_size 1467

0 commit comments

Comments
 (0)