Skip to content

Commit 5faf031

Browse files
committed
add standard encoder for version message
1 parent 4e40624 commit 5faf031

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

extras/test/src/cbor/test_cbor_standard_enc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ SCENARIO("Test the encoding of command messages") {
2020

2121
WHEN("Encode a message with provisioning wifi fw version ")
2222
{
23-
WiFiFWVersionMessage command;
23+
VersionMessage command;
2424
command.c.id = StandardMessageId::WiFiFWVersionMessageId;
25-
command.params.wiFiFWVersion = "1.6.0";
25+
command.params.version = "1.6.0";
2626
uint8_t buffer[512];
2727
size_t bytes_encoded = sizeof(buffer);
2828

src/cbor/standards/StandardEncoders.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
#include "StandardEncoders.h"
1212

13-
MessageEncoder::Status WiFiFWVersionMessageEncoder::encode(CborEncoder* encoder, Message *msg) {
14-
WiFiFWVersionMessage * wiFiFWVersionMsg = (WiFiFWVersionMessage*) msg;
13+
MessageEncoder::Status VersionMessageEncoder::encode(CborEncoder* encoder, Message *msg) {
14+
VersionMessage * versionMsg = (VersionMessage*) msg;
1515
CborEncoder array_encoder;
1616

1717
if(cbor_encoder_create_array(encoder, &array_encoder, 1) != CborNoError) {
1818
return MessageEncoder::Status::Error;
1919
}
2020

21-
if(cbor_encode_text_stringz(&array_encoder, wiFiFWVersionMsg->params.wiFiFWVersion) != CborNoError) {
21+
if(cbor_encode_text_stringz(&array_encoder, versionMsg->params.version) != CborNoError) {
2222
return MessageEncoder::Status::Error;
2323
}
2424

@@ -29,4 +29,4 @@ MessageEncoder::Status WiFiFWVersionMessageEncoder::encode(CborEncoder* encoder,
2929
return MessageEncoder::Status::Complete;
3030
}
3131

32-
static WiFiFWVersionMessageEncoder wifiFWVersionMessageEncoderCbor;
32+
static VersionMessageEncoder wifiFWVersionMessageEncoderCbor(CBORWiFiFWVersionMessage, WiFiFWVersionMessageId);

src/cbor/standards/StandardEncoders.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
#include "StandardMessages.h"
1414

15-
class WiFiFWVersionMessageEncoder: public CBORMessageEncoderInterface {
15+
class VersionMessageEncoder: public CBORMessageEncoderInterface {
1616
public:
17-
WiFiFWVersionMessageEncoder()
18-
: CBORMessageEncoderInterface(CBORWiFiFWVersionMessage, WiFiFWVersionMessageId) {}
17+
VersionMessageEncoder(CBORStandardMessageTag tag, StandardMessageId id)
18+
: CBORMessageEncoderInterface(tag, id) {}
1919
protected:
2020
MessageEncoder::Status encode(CborEncoder* encoder, Message *msg) override;
2121
};

src/cbor/standards/StandardMessages.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ enum StandardMessageId: MessageId {
2121
WiFiFWVersionMessageId = ArduinoStandardMessageStartId,
2222
};
2323

24-
struct WiFiFWVersionMessage {
24+
struct VersionMessage {
2525
Message c;
2626
struct {
27-
const char *wiFiFWVersion; //The payload is a string.
27+
const char *version; //The payload is a string.
2828
} params;
2929
};

0 commit comments

Comments
 (0)