From d170c0256153550b02fabbfd6c468625dbb23499 Mon Sep 17 00:00:00 2001 From: jgromes Date: Sat, 26 Aug 2023 20:34:37 +0200 Subject: [PATCH] [LoRaWAN] Fixed initialization warnings --- src/protocols/LoRaWAN/LoRaWAN.cpp | 3 ++- src/protocols/LoRaWAN/LoRaWAN.h | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/protocols/LoRaWAN/LoRaWAN.cpp b/src/protocols/LoRaWAN/LoRaWAN.cpp index 8445c465..fc2b2275 100644 --- a/src/protocols/LoRaWAN/LoRaWAN.cpp +++ b/src/protocols/LoRaWAN/LoRaWAN.cpp @@ -372,7 +372,7 @@ int16_t LoRaWANNode::uplink(uint8_t* data, size_t len, uint8_t port) { // check if we have some MAC command to append // TODO implement appending multiple MAC commands - LoRaWANMacCommand_t cmd = { 0 }; + LoRaWANMacCommand_t cmd = { .cid = 0, .len = 0, .payload = { 0 }, .repeat = 0, }; if(popMacCommand(&cmd, &this->commandsUp) == RADIOLIB_ERR_NONE) { // we do, add it to fopts uint8_t foptsBuff[RADIOLIB_AES128_BLOCK_SIZE]; @@ -678,6 +678,7 @@ int16_t LoRaWANNode::downlink(uint8_t* data, size_t* len) { .cid = *foptsPtr, .len = (uint8_t)(remLen - 1), .payload = { 0 }, + .repeat = 0, }; memcpy(cmd.payload, foptsPtr + 1, cmd.len); diff --git a/src/protocols/LoRaWAN/LoRaWAN.h b/src/protocols/LoRaWAN/LoRaWAN.h index 73ebbf35..7086b8aa 100644 --- a/src/protocols/LoRaWAN/LoRaWAN.h +++ b/src/protocols/LoRaWAN/LoRaWAN.h @@ -370,8 +370,14 @@ class LoRaWANNode { PhysicalLayer* phyLayer = NULL; const LoRaWANBand_t* band = NULL; - LoRaWANMacCommandQueue_t commandsUp = { .commands = { 0 }, .numCommands = 0 }; - LoRaWANMacCommandQueue_t commandsDown = { .commands = { 0 }, .numCommands = 0 }; + LoRaWANMacCommandQueue_t commandsUp = { + .commands = { { .cid = 0, .len = 0, .payload = { 0 }, .repeat = 0, } }, + .numCommands = 0, + }; + LoRaWANMacCommandQueue_t commandsDown = { + .commands = { { .cid = 0, .len = 0, .payload = { 0 }, .repeat = 0, } }, + .numCommands = 0, + }; // the following is either provided by the network server (OTAA) // or directly entered by the user (ABP)