Skip to content

Commit 3a3cc81

Browse files
brentrubrentru
committed
Fix assignments after declaration causing compile-time error
1 parent 9d91263 commit 3a3cc81

File tree

10 files changed

+79
-68
lines changed

10 files changed

+79
-68
lines changed

‎src/Wippersnapper_V2.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
#endif
130130

131131
#define WS_VERSION \
132-
"1.0.0-offline-beta.1" ///< WipperSnapper app. version (semver-formatted)
132+
"1.0.0-beta.1" ///< WipperSnapper app. version (semver-formatted)
133133

134134
#define WS_WDT_TIMEOUT 60000 ///< WDT timeout
135135
#define WS_MAX_ALT_WIFI_NETWORKS 3 ///< Maximum number of alternative networks

‎src/adapters/wifi/ws_wifi_esp8266.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* please support Adafruit and open-source hardware by purchasing
99
* products from Adafruit!
1010
*
11-
* Copyright (c) Brent Rubell 2020-2021 for Adafruit Industries.
11+
* Copyright (c) Brent Rubell 2020-2025 for Adafruit Industries.
1212
*
1313
* MIT license, all text here must be included in any redistribution.
1414
*
@@ -77,8 +77,8 @@ class ws_wifi_esp8266 : public Wippersnapper_V2 {
7777
~ws_wifi_esp8266() {
7878
if (_wifi_client)
7979
delete _wifi_client;
80-
if (_mqtt)
81-
delete _mqtt;
80+
if (_mqttV2)
81+
delete _mqttV2;
8282
}
8383

8484
/**********************************************************/
@@ -109,8 +109,8 @@ class ws_wifi_esp8266 : public Wippersnapper_V2 {
109109
*/
110110
/**********************************************************/
111111
void set_ssid_pass() {
112-
_ssid = WS._config.network.ssid;
113-
_pass = WS._config.network.pass;
112+
_ssid = WsV2._configV2.network.ssid;
113+
_pass = WsV2._configV2.network.pass;
114114
}
115115

116116
/***********************************************************/
@@ -142,7 +142,7 @@ class ws_wifi_esp8266 : public Wippersnapper_V2 {
142142
WS_DEBUG_PRINTLN(WiFi.RSSI(i));
143143
return true;
144144
}
145-
if (WS._isWiFiMultiV2) {
145+
if (WsV2._isWiFiMultiV2) {
146146
// multi network mode
147147
for (int j = 0; j < WS_MAX_ALT_WIFI_NETWORKS; j++) {
148148
if (strcmp(WsV2._multiNetworksV2[j].ssid, WiFi.SSID(i).c_str()) ==
@@ -199,9 +199,9 @@ class ws_wifi_esp8266 : public Wippersnapper_V2 {
199199
/*******************************************************************/
200200
void setupMQTTClient(const char *clientID) {
201201
// Uncomment the following lines to use MQTT/SSL. You will need to
202-
// re-compile after. _wifi_client->setFingerprint(fingerprint); WS._mqtt =
203-
// new Adafruit_MQTT_Client(_wifi_client, WS._config.aio_url,
204-
// WS._config.io_port, clientID, WS._config.aio_user, WS._config.aio_key);
202+
// re-compile after. _wifi_client->setFingerprint(fingerprint); WsV2._mqttV2 =
203+
// new Adafruit_MQTT_Client(_wifi_client, WsV2._configV2.aio_url,
204+
// WsV2._configV2.io_port, clientID, WsV2._configV2.aio_user, WsV2._configV2.aio_key);
205205
if (WsV2._configV2.io_port == 8883)
206206
WsV2._configV2.io_port = 1883;
207207
WsV2._mqttV2 = new Adafruit_MQTT_Client(
@@ -247,7 +247,7 @@ class ws_wifi_esp8266 : public Wippersnapper_V2 {
247247
@brief Establishes a connection with the wireless network.
248248
*/
249249
/**************************************************************************/
250-
void _connect()() {
250+
void _connect() {
251251

252252
if (WiFi.status() == WL_CONNECTED)
253253
return;
@@ -265,7 +265,7 @@ class ws_wifi_esp8266 : public Wippersnapper_V2 {
265265
_statusV2 = WS_NET_DISCONNECTED;
266266
delay(100);
267267

268-
if (WS._isWiFiMultiV2) {
268+
if (WsV2._isWiFiMultiV2) {
269269
// multi network mode
270270
for (int i = 0; i < WS_MAX_ALT_WIFI_NETWORKS; i++) {
271271
if (strlen(WsV2._multiNetworksV2[i].ssid) > 0 &&
@@ -307,7 +307,7 @@ class ws_wifi_esp8266 : public Wippersnapper_V2 {
307307
_statusV2 = WS_NET_DISCONNECTED;
308308
}
309309
}
310-
WsV2.feedWDT();
310+
WsV2.feedWDTV2();
311311
}
312312
}
313313

‎src/components/analogIO/model.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
@brief AnalogIOModel constructor
2020
*/
2121
/***********************************************************************/
22-
AnalogIOModel::AnalogIOModel() {
23-
_msg_AnalogioAdd = wippersnapper_analogio_AnalogIOAdd_init_default;
22+
AnalogIOModel::AnalogIOModel()
23+
: _msg_AnalogioAdd(wippersnapper_analogio_AnalogIOAdd_init_default)
24+
{
25+
// no-op
2426
}
2527

2628
/***********************************************************************/
@@ -42,7 +44,7 @@ AnalogIOModel::~AnalogIOModel() {}
4244
bool AnalogIOModel::DecodeAnalogIOAdd(pb_istream_t *stream) {
4345
// Zero-out the AnalogIOAdd message struct. to ensure we don't have any old
4446
// data
45-
_msg_AnalogioAdd = wippersnapper_analogio_AnalogIOAdd_init_default;
47+
memset(&_msg_AnalogioAdd, 0, sizeof(_msg_AnalogioAdd));
4648
// Decode the stream into a AnalogIOAdd message
4749
return pb_decode(stream, wippersnapper_analogio_AnalogIOAdd_fields,
4850
&_msg_AnalogioAdd);
@@ -70,7 +72,7 @@ wippersnapper_analogio_AnalogIOAdd *AnalogIOModel::GetAnalogIOAddMsg() {
7072
bool AnalogIOModel::DecodeAnalogIORemove(pb_istream_t *stream) {
7173
// Zero-out the AnalogIORemove message struct. to ensure we don't have any old
7274
// data
73-
_msg_AnalogioRemove = wippersnapper_analogio_AnalogIORemove_init_default;
75+
memset(&_msg_AnalogioRemove, 0, sizeof(_msg_AnalogioRemove));
7476
// Decode the stream into a AnalogIORemove message
7577
return pb_decode(stream, wippersnapper_analogio_AnalogIORemove_fields,
7678
&_msg_AnalogioRemove);
@@ -112,7 +114,7 @@ bool AnalogIOModel::EncodeAnalogIOEvent(
112114
char *pin_name, float pin_value,
113115
wippersnapper_sensor_SensorType read_type) {
114116
// Initialize the AnalogIOEvent message to default values
115-
_msg_AnalogioEvent = wippersnapper_analogio_AnalogIOEvent_init_zero;
117+
memset(&_msg_AnalogioEvent, 0, sizeof(_msg_AnalogioEvent));
116118
// Fill the AnalogIOEvent message's fields
117119
strncpy(_msg_AnalogioEvent.pin_name, pin_name,
118120
sizeof(_msg_AnalogioEvent.pin_name));

‎src/components/checkin/model.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
@brief CheckinModel constructor
2020
*/
2121
/***********************************************************************/
22-
CheckinModel::CheckinModel() {
23-
_CheckinRequest = wippersnapper_checkin_CheckinRequest_init_default;
24-
_CheckinResponse = wippersnapper_checkin_CheckinResponse_init_default;
22+
CheckinModel::CheckinModel()
23+
: _CheckinRequest(wippersnapper_checkin_CheckinRequest_init_default),
24+
_CheckinResponse(wippersnapper_checkin_CheckinResponse_init_default)
25+
{
26+
// no-op
2527
}
2628

2729
/***********************************************************************/
@@ -83,6 +85,7 @@ bool CheckinModel::EncodeCheckinRequest() {
8385
*/
8486
/***********************************************************************/
8587
bool CheckinModel::DecodeCheckinResponse(pb_istream_t *stream) {
88+
memset(&_CheckinResponse, 0, sizeof(_CheckinResponse));
8689
return pb_decode(stream, wippersnapper_checkin_CheckinResponse_fields,
8790
&_CheckinResponse);
8891
}

‎src/components/digitalIO/model.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
@brief DigitalIOModel constructor
2020
*/
2121
/***********************************************************************/
22-
DigitalIOModel::DigitalIOModel() {
23-
_msg_dio_add = wippersnapper_digitalio_DigitalIOAdd_init_default;
24-
_msg_dio_remove = wippersnapper_digitalio_DigitalIORemove_init_default;
25-
_msg_dio_event = wippersnapper_digitalio_DigitalIOEvent_init_default;
26-
_msg_dio_write = wippersnapper_digitalio_DigitalIOWrite_init_default;
22+
DigitalIOModel::DigitalIOModel()
23+
: _msg_dio_add(wippersnapper_digitalio_DigitalIOAdd_init_default),
24+
_msg_dio_remove(wippersnapper_digitalio_DigitalIORemove_init_default),
25+
_msg_dio_event(wippersnapper_digitalio_DigitalIOEvent_init_default),
26+
_msg_dio_write(wippersnapper_digitalio_DigitalIOWrite_init_default)
27+
{
28+
// no-op
2729
}
2830

2931
/***********************************************************************/
@@ -54,7 +56,7 @@ wippersnapper_digitalio_DigitalIOAdd *DigitalIOModel::GetDigitalIOAddMsg() {
5456
bool DigitalIOModel::DecodeDigitalIORemove(pb_istream_t *stream) {
5557
// Zero-out the DigitalIORemove message struct. to ensure we don't have any
5658
// old data
57-
_msg_dio_remove = wippersnapper_digitalio_DigitalIORemove_init_default;
59+
memset(&_msg_dio_remove, 0, sizeof(_msg_dio_remove));
5860

5961
// Decode the stream into a DigitalIORemove message
6062
return pb_decode(stream, wippersnapper_digitalio_DigitalIORemove_fields,
@@ -93,7 +95,7 @@ wippersnapper_digitalio_DigitalIOEvent *DigitalIOModel::GetDigitalIOEventMsg() {
9395
bool DigitalIOModel::DecodeDigitalIOAdd(pb_istream_t *stream) {
9496
// Zero-out the DigitalIOAdd message struct. to ensure we don't have any old
9597
// data
96-
_msg_dio_add = wippersnapper_digitalio_DigitalIOAdd_init_default;
98+
memset(&_msg_dio_add, 0, sizeof(_msg_dio_add));
9799

98100
// Decode the stream into a DigitalIOAdd message
99101
return pb_decode(stream, wippersnapper_digitalio_DigitalIOAdd_fields,
@@ -112,7 +114,7 @@ bool DigitalIOModel::DecodeDigitalIOAdd(pb_istream_t *stream) {
112114
bool DigitalIOModel::DecodeDigitalIOWrite(pb_istream_t *stream) {
113115
// Zero-out the DigitalIOWrite message struct. to ensure we don't have any old
114116
// data
115-
_msg_dio_write = wippersnapper_digitalio_DigitalIOWrite_init_default;
117+
memset(&_msg_dio_write, 0, sizeof(_msg_dio_write));
116118
// Decode the stream into a DigitalIOWrite message
117119
return pb_decode(stream, wippersnapper_digitalio_DigitalIOWrite_fields,
118120
&_msg_dio_write);
@@ -132,7 +134,7 @@ bool DigitalIOModel::DecodeDigitalIOWrite(pb_istream_t *stream) {
132134
/***********************************************************************/
133135
bool DigitalIOModel::EncodeDigitalIOEvent(char *pin_name, bool value) {
134136
// Initialize the DigitalIOEvent
135-
_msg_dio_event = wippersnapper_digitalio_DigitalIOEvent_init_default;
137+
memset(&_msg_dio_event, 0, sizeof(_msg_dio_event));
136138
// Fill the DigitalIOEvent
137139
strncpy(_msg_dio_event.pin_name, pin_name, sizeof(_msg_dio_event.pin_name));
138140
_msg_dio_event.has_value = true;

‎src/components/ds18x20/model.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
@brief DS18X20Model constructor
2020
*/
2121
/***********************************************************************/
22-
DS18X20Model::DS18X20Model() {
23-
// Initialize the DS18X20 messages
24-
_msg_DS18x20Add = wippersnapper_ds18x20_Ds18x20Add_init_zero;
25-
_msg_DS18x20Added = wippersnapper_ds18x20_Ds18x20Added_init_zero;
26-
_msg_DS18x20Remove = wippersnapper_ds18x20_Ds18x20Remove_init_zero;
22+
DS18X20Model::DS18X20Model()
23+
: _msg_DS18x20Add(wippersnapper_ds18x20_Ds18x20Add_init_zero),
24+
_msg_DS18x20Added(wippersnapper_ds18x20_Ds18x20Added_init_zero),
25+
_msg_DS18x20Remove(wippersnapper_ds18x20_Ds18x20Remove_init_zero),
26+
_msg_DS18x20Event(wippersnapper_ds18x20_Ds18x20Event_init_zero)
27+
{
28+
// no-op
2729
}
2830

2931
/***********************************************************************/
@@ -42,7 +44,7 @@ DS18X20Model::~DS18X20Model() {}
4244
*/
4345
/***********************************************************************/
4446
bool DS18X20Model::DecodeDS18x20Add(pb_istream_t *stream) {
45-
_msg_DS18x20Add = wippersnapper_ds18x20_Ds18x20Add_init_zero;
47+
memset(&_msg_DS18x20Add, 0, sizeof(_msg_DS18x20Add));
4648
// Attempt to decode the stream into a Ds18x20Add message
4749
return pb_decode(stream, wippersnapper_ds18x20_Ds18x20Add_fields,
4850
&_msg_DS18x20Add);
@@ -82,7 +84,7 @@ wippersnapper_ds18x20_Ds18x20Added *DS18X20Model::GetDS18x20AddedMsg() {
8284
/***********************************************************************/
8385
bool DS18X20Model::EncodeDS18x20Added(char *onewire_pin, bool is_init) {
8486
// Fill the Ds18x20Added message
85-
_msg_DS18x20Added = wippersnapper_ds18x20_Ds18x20Added_init_zero;
87+
memset(&_msg_DS18x20Added, 0, sizeof(_msg_DS18x20Added));
8688
_msg_DS18x20Added.is_initialized = is_init;
8789
strcpy(_msg_DS18x20Added.onewire_pin, onewire_pin);
8890

@@ -107,7 +109,7 @@ bool DS18X20Model::EncodeDS18x20Added(char *onewire_pin, bool is_init) {
107109
*/
108110
/*************************************************************************/
109111
bool DS18X20Model::DecodeDS18x20Remove(pb_istream_t *stream) {
110-
_msg_DS18x20Remove = wippersnapper_ds18x20_Ds18x20Remove_init_zero;
112+
memset(&_msg_DS18x20Remove, 0, sizeof(_msg_DS18x20Remove));
111113
return pb_decode(stream, wippersnapper_ds18x20_Ds18x20Remove_fields,
112114
&_msg_DS18x20Remove);
113115
}
@@ -159,7 +161,7 @@ bool DS18X20Model::EncodeDs18x20Event() {
159161
*/
160162
/*************************************************************************/
161163
void DS18X20Model::InitDS18x20EventMsg(const char *ow_pin_name) {
162-
_msg_DS18x20Event = wippersnapper_ds18x20_Ds18x20Event_init_zero;
164+
memset(&_msg_DS18x20Event, 0, sizeof(_msg_DS18x20Event));
163165
_msg_DS18x20Event.sensor_events_count = 0;
164166
strcpy(_msg_DS18x20Event.onewire_pin, ow_pin_name);
165167
}

‎src/components/i2c/model.cpp‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
@brief I2C constructor
2020
*/
2121
/***********************************************************************/
22-
I2cModel::I2cModel() {
23-
_msg_i2c_bus_scan = wippersnapper_i2c_I2cBusScan_init_default;
24-
_msg_i2c_bus_scanned = wippersnapper_i2c_I2cBusScanned_init_default;
25-
_msg_i2c_device_add_replace =
26-
wippersnapper_i2c_I2cDeviceAddOrReplace_init_default;
27-
_msg_i2c_device_added_replaced =
28-
wippersnapper_i2c_I2cDeviceAddedOrReplaced_init_default;
29-
_msg_i2c_device_remove = wippersnapper_i2c_I2cDeviceRemove_init_default;
30-
_msg_i2c_device_removed = wippersnapper_i2c_I2cDeviceRemoved_init_default;
31-
_msg_i2c_device_event = wippersnapper_i2c_I2cDeviceEvent_init_default;
22+
I2cModel::I2cModel()
23+
: _msg_i2c_bus_scan(wippersnapper_i2c_I2cBusScan_init_default),
24+
_msg_i2c_bus_scanned(wippersnapper_i2c_I2cBusScanned_init_default),
25+
_msg_i2c_device_add_replace(wippersnapper_i2c_I2cDeviceAddOrReplace_init_default),
26+
_msg_i2c_device_added_replaced(wippersnapper_i2c_I2cDeviceAddedOrReplaced_init_default),
27+
_msg_i2c_device_remove(wippersnapper_i2c_I2cDeviceRemove_init_default),
28+
_msg_i2c_device_removed(wippersnapper_i2c_I2cDeviceRemoved_init_default),
29+
_msg_i2c_device_event(wippersnapper_i2c_I2cDeviceEvent_init_default)
30+
{
31+
// no-op
3232
}
3333

3434
/***********************************************************************/
@@ -135,7 +135,7 @@ float GetValueFromSensorsEvent(wippersnapper_sensor_SensorType sensor_type,
135135
/****************************************************************************/
136136
bool I2cModel::DecodeI2cDeviceRemove(pb_istream_t *stream) {
137137
WS_DEBUG_PRINTLN("[i2c] Set _msg_i2c_device_remove...");
138-
_msg_i2c_device_remove = wippersnapper_i2c_I2cDeviceRemove_init_default;
138+
memset(&_msg_i2c_device_remove, 0, sizeof(_msg_i2c_device_remove));
139139
bool is_success = false;
140140
is_success = pb_decode(stream, wippersnapper_i2c_I2cDeviceRemove_fields, &_msg_i2c_device_remove);
141141
WS_DEBUG_PRINT("is_success: "); WS_DEBUG_PRINTLN(is_success);
@@ -162,7 +162,7 @@ wippersnapper_i2c_I2cDeviceRemove *I2cModel::GetI2cDeviceRemoveMsg() {
162162
*/
163163
/***************************************************************************/
164164
bool I2cModel::DecodeI2cBusScan(pb_istream_t *stream) {
165-
_msg_i2c_bus_scan = wippersnapper_i2c_I2cBusScan_init_default;
165+
memset(&_msg_i2c_bus_scan, 0, sizeof(_msg_i2c_bus_scan));
166166
return pb_decode(stream, wippersnapper_i2c_I2cBusScan_fields,
167167
&_msg_i2c_bus_scan);
168168
}
@@ -193,7 +193,7 @@ wippersnapper_i2c_I2cBusScanned *I2cModel::GetI2cBusScannedMsg() {
193193
*/
194194
/**********************************************************************/
195195
void I2cModel::ClearI2cBusScanned() {
196-
_msg_i2c_bus_scanned = wippersnapper_i2c_I2cBusScanned_init_zero;
196+
memset(&_msg_i2c_bus_scanned, 0, sizeof(_msg_i2c_bus_scanned));
197197
_msg_i2c_bus_scanned.i2c_bus_found_devices_count = 0; // zero-out the count
198198
}
199199

@@ -247,8 +247,7 @@ bool I2cModel::AddDeviceToBusScan(const char *bus_scl, const char *bus_sda,
247247
*/
248248
/***************************************************************************/
249249
bool I2cModel::DecodeI2cDeviceAddReplace(pb_istream_t *stream) {
250-
_msg_i2c_device_add_replace =
251-
wippersnapper_i2c_I2cDeviceAddOrReplace_init_default;
250+
memset(&_msg_i2c_device_add_replace, 0, sizeof(_msg_i2c_device_add_replace));
252251
return pb_decode(stream, wippersnapper_i2c_I2cDeviceAddOrReplace_fields,
253252
&_msg_i2c_device_add_replace);
254253
}
@@ -283,8 +282,7 @@ bool I2cModel::encodeMsgI2cDeviceAddedorReplaced(
283282
size_t sz_msg;
284283

285284
// Fill I2cDeviceAddedOrReplaced message
286-
_msg_i2c_device_added_replaced =
287-
wippersnapper_i2c_I2cDeviceAddedOrReplaced_init_zero;
285+
memset(&_msg_i2c_device_added_replaced, 0, sizeof(_msg_i2c_device_added_replaced));
288286
_msg_i2c_device_added_replaced.has_i2c_device_description = true;
289287
_msg_i2c_device_added_replaced.i2c_device_description = device_descriptor;
290288
_msg_i2c_device_added_replaced.i2c_bus_status = bus_status;
@@ -320,7 +318,7 @@ I2cModel::GetMsgI2cDeviceAddedOrReplaced() {
320318
*/
321319
/**********************************************************************/
322320
void I2cModel::ClearI2cDeviceEvent() {
323-
_msg_i2c_device_event = wippersnapper_i2c_I2cDeviceEvent_init_zero;
321+
memset(&_msg_i2c_device_event, 0, sizeof(_msg_i2c_device_event));
324322
_msg_i2c_device_event.i2c_device_events_count = 0;
325323
}
326324

‎src/components/pixels/model.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
@brief Constructs a new PixelsModel object
2222
*/
2323
/**************************************************************************/
24-
PixelsModel::PixelsModel() {
25-
_msg_pixels_add = wippersnapper_pixels_PixelsAdd_init_zero;
26-
_msg_pixels_remove = wippersnapper_pixels_PixelsRemove_init_zero;
27-
_msg_pixels_write = wippersnapper_pixels_PixelsWrite_init_zero;
28-
_msg_pixels_added = wippersnapper_pixels_PixelsAdded_init_zero;
24+
PixelsModel::PixelsModel()
25+
: _msg_pixels_add(wippersnapper_pixels_PixelsAdd_init_zero),
26+
_msg_pixels_remove(wippersnapper_pixels_PixelsRemove_init_zero),
27+
_msg_pixels_write(wippersnapper_pixels_PixelsWrite_init_zero),
28+
_msg_pixels_added(wippersnapper_pixels_PixelsAdded_init_zero)
29+
{
30+
// no-op
2931
}
3032

3133
/**************************************************************************/
@@ -44,7 +46,7 @@ PixelsModel::~PixelsModel() {}
4446
*/
4547
/**************************************************************************/
4648
bool PixelsModel::DecodePixelsAdd(pb_istream_t *stream) {
47-
_msg_pixels_add = wippersnapper_pixels_PixelsAdd_init_zero;
49+
memset(&_msg_pixels_add, 0, sizeof(_msg_pixels_add));
4850
return pb_decode(stream, wippersnapper_pixels_PixelsAdd_fields,
4951
&_msg_pixels_add);
5052
}
@@ -68,7 +70,7 @@ wippersnapper_pixels_PixelsAdd *PixelsModel::GetPixelsAddMsg() {
6870
*/
6971
/**************************************************************************/
7072
bool PixelsModel::DecodePixelsRemove(pb_istream_t *stream) {
71-
_msg_pixels_remove = wippersnapper_pixels_PixelsRemove_init_zero;
73+
memset(&_msg_pixels_remove, 0, sizeof(_msg_pixels_remove));
7274
return pb_decode(stream, wippersnapper_pixels_PixelsRemove_fields,
7375
&_msg_pixels_remove);
7476
}
@@ -92,7 +94,7 @@ wippersnapper_pixels_PixelsRemove *PixelsModel::GetPixelsRemoveMsg() {
9294
*/
9395
/**************************************************************************/
9496
bool PixelsModel::DecodePixelsWrite(pb_istream_t *stream) {
95-
_msg_pixels_write = wippersnapper_pixels_PixelsWrite_init_zero;
97+
memset(&_msg_pixels_write, 0, sizeof(_msg_pixels_write));
9698
WS_DEBUG_PRINTLN("Decoding PixelsWrite message...");
9799
return pb_decode(stream, wippersnapper_pixels_PixelsWrite_fields,
98100
&_msg_pixels_write);
@@ -120,7 +122,7 @@ wippersnapper_pixels_PixelsWrite *PixelsModel::GetPixelsWriteMsg() {
120122
/**************************************************************************/
121123
bool PixelsModel::EncodePixelsAdded(char *pin_data, bool success) {
122124
// Fill the message
123-
_msg_pixels_added = wippersnapper_pixels_PixelsAdded_init_zero;
125+
memset(&_msg_pixels_added, 0, sizeof(_msg_pixels_added));
124126
_msg_pixels_added.is_success = success;
125127
strncpy(_msg_pixels_added.pixels_pin_data, pin_data,
126128
sizeof(_msg_pixels_added.pixels_pin_data));

0 commit comments

Comments
 (0)