Skip to content

Commit 0a1ed79

Browse files
andreagilardoniandreagilardoni
committed
fixup! implementing cbor message encoder following cloud utils definition
1 parent 8bb5f4a commit 0a1ed79

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

‎src/cbor/MessageEncoder.cpp renamed to ‎src/cbor/IoTCloudMessageEncoder.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "CBOREncoder.h"
1616

17-
#include "MessageEncoder.h"
17+
#include "IoTCloudMessageEncoder.h"
1818

1919
/******************************************************************************
2020
* PUBLIC MEMBER FUNCTIONS
@@ -25,45 +25,45 @@
2525
PRIVATE MEMBER FUNCTIONS
2626
******************************************************************************/
2727

28-
Encoder::Status OtaBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
28+
MessageEncoder::Status OtaBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
2929
OtaBeginUp * otaBeginUp = (OtaBeginUp*) msg;
3030
CborEncoder array_encoder;
3131

3232
if(cbor_encoder_create_array(encoder, &array_encoder, 1) != CborNoError) {
33-
return Encoder::Status::Error;
33+
return MessageEncoder::Status::Error;
3434
}
3535

3636
if(cbor_encode_byte_string(&array_encoder, otaBeginUp->params.sha, SHA256_SIZE) != CborNoError) {
37-
return Encoder::Status::Error;
37+
return MessageEncoder::Status::Error;
3838
}
3939

4040
if(cbor_encoder_close_container(encoder, &array_encoder) != CborNoError) {
41-
return Encoder::Status::Error;
41+
return MessageEncoder::Status::Error;
4242
}
4343

44-
return Encoder::Status::Complete;
44+
return MessageEncoder::Status::Complete;
4545
}
4646

47-
Encoder::Status ThingBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
47+
MessageEncoder::Status ThingBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
4848
ThingBeginCmd * thingBeginCmd = (ThingBeginCmd*) msg;
4949
CborEncoder array_encoder;
5050

5151
if(cbor_encoder_create_array(encoder, &array_encoder, 1) != CborNoError) {
52-
return Encoder::Status::Error;
52+
return MessageEncoder::Status::Error;
5353
}
5454

5555
if(cbor_encode_text_stringz(&array_encoder, thingBeginCmd->params.thing_id) != CborNoError) {
56-
return Encoder::Status::Error;
56+
return MessageEncoder::Status::Error;
5757
}
5858

5959
if(cbor_encoder_close_container(encoder, &array_encoder) != CborNoError) {
60-
return Encoder::Status::Error;
60+
return MessageEncoder::Status::Error;
6161
}
6262

63-
return Encoder::Status::Complete;
63+
return MessageEncoder::Status::Complete;
6464
}
6565

66-
Encoder::Status LastValuesBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
66+
MessageEncoder::Status LastValuesBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
6767
// This command contains no parameters, it contains just the id of the message
6868
// nothing to perform here
6969
// (void)(encoder);
@@ -72,67 +72,67 @@ Encoder::Status LastValuesBeginCommandEncoder::encode(CborEncoder* encoder, Mess
7272

7373
// FIXME we are encoiding an empty array, this could be avoided
7474
if (cbor_encoder_create_array(encoder, &array_encoder, 0) != CborNoError){
75-
return Encoder::Status::Error;
75+
return MessageEncoder::Status::Error;
7676
}
7777

7878
if(cbor_encoder_close_container(encoder, &array_encoder) != CborNoError) {
79-
return Encoder::Status::Error;
79+
return MessageEncoder::Status::Error;
8080
}
8181

82-
return Encoder::Status::Complete;
82+
return MessageEncoder::Status::Complete;
8383
}
8484

85-
Encoder::Status DeviceBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
85+
MessageEncoder::Status DeviceBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) {
8686
DeviceBeginCmd * deviceBeginCmd = (DeviceBeginCmd*) msg;
8787
CborEncoder array_encoder;
8888

8989
if(cbor_encoder_create_array(encoder, &array_encoder, 1) != CborNoError) {
90-
return Encoder::Status::Error;
90+
return MessageEncoder::Status::Error;
9191
}
9292

9393
if(cbor_encode_text_stringz(&array_encoder, deviceBeginCmd->params.lib_version) != CborNoError) {
94-
return Encoder::Status::Error;
94+
return MessageEncoder::Status::Error;
9595
}
9696

9797
if(cbor_encoder_close_container(encoder, &array_encoder) != CborNoError) {
98-
return Encoder::Status::Error;
98+
return MessageEncoder::Status::Error;
9999
}
100100

101-
return Encoder::Status::Complete;
101+
return MessageEncoder::Status::Complete;
102102
}
103103

104-
Encoder::Status OtaProgressCommandUpEncoder::encode(CborEncoder* encoder, Message *msg) {
104+
MessageEncoder::Status OtaProgressCommandUpEncoder::encode(CborEncoder* encoder, Message *msg) {
105105
OtaProgressCmdUp * ota = (OtaProgressCmdUp*) msg;
106106
CborEncoder array_encoder;
107107

108108
if(cbor_encoder_create_array(encoder, &array_encoder, 4) != CborNoError) {
109-
return Encoder::Status::Error;
109+
return MessageEncoder::Status::Error;
110110
}
111111

112112
if(cbor_encode_byte_string(&array_encoder, ota->params.id, ID_SIZE) != CborNoError) {
113-
return Encoder::Status::Error;
113+
return MessageEncoder::Status::Error;
114114
}
115115

116116
if(cbor_encode_simple_value(&array_encoder, ota->params.state) != CborNoError) {
117-
return Encoder::Status::Error;
117+
return MessageEncoder::Status::Error;
118118
}
119119

120120
if(cbor_encode_int(&array_encoder, ota->params.state_data) != CborNoError) {
121-
return Encoder::Status::Error;
121+
return MessageEncoder::Status::Error;
122122
}
123123

124124
if(cbor_encode_uint(&array_encoder, ota->params.time) != CborNoError) {
125-
return Encoder::Status::Error;
125+
return MessageEncoder::Status::Error;
126126
}
127127

128128
if(cbor_encoder_close_container(encoder, &array_encoder) != CborNoError) {
129-
return Encoder::Status::Error;
129+
return MessageEncoder::Status::Error;
130130
}
131131

132-
return Encoder::Status::Complete;
132+
return MessageEncoder::Status::Complete;
133133
}
134134

135-
Encoder::Status TimezoneCommandUpEncoder::encode(CborEncoder* encoder, Message *msg) {
135+
MessageEncoder::Status TimezoneCommandUpEncoder::encode(CborEncoder* encoder, Message *msg) {
136136
// This command contains no parameters, it contains just the id of the message
137137
// nothing to perform here
138138
// (void)(encoder);
@@ -141,14 +141,14 @@ Encoder::Status TimezoneCommandUpEncoder::encode(CborEncoder* encoder, Message *
141141

142142
// FIXME we are encoiding an empty array, this could be avoided
143143
if (cbor_encoder_create_array(encoder, &array_encoder, 0) != CborNoError){
144-
return Encoder::Status::Error;
144+
return MessageEncoder::Status::Error;
145145
}
146146

147147
if(cbor_encoder_close_container(encoder, &array_encoder) != CborNoError) {
148-
return Encoder::Status::Error;
148+
return MessageEncoder::Status::Error;
149149
}
150150

151-
return Encoder::Status::Complete;
151+
return MessageEncoder::Status::Complete;
152152
}
153153

154154
static OtaBeginCommandEncoder otaBeginCommandEncoder;

‎src/cbor/MessageEncoder.h renamed to ‎src/cbor/IoTCloudMessageEncoder.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
******************************************************************************/
1717

1818
#include "./CBOR.h"
19-
#include <cbor/CborEncoder.h>
19+
#include <cbor/MessageEncoder.h>
2020
#include "message/Commands.h"
2121

2222
/******************************************************************************
@@ -28,47 +28,47 @@ class OtaBeginCommandEncoder: public CBORMessageEncoderInterface {
2828
OtaBeginCommandEncoder()
2929
: CBORMessageEncoderInterface(CBOROtaBeginUp, OtaBeginUpId) {}
3030
protected:
31-
Encoder::Status encode(CborEncoder* encoder, Message *msg) override;
31+
MessageEncoder::Status encode(CborEncoder* encoder, Message *msg) override;
3232
};
3333

3434
class ThingBeginCommandEncoder: public CBORMessageEncoderInterface {
3535
public:
3636
ThingBeginCommandEncoder()
3737
: CBORMessageEncoderInterface(CBORThingBeginCmd, ThingBeginCmdId) {}
3838
protected:
39-
Encoder::Status encode(CborEncoder* encoder, Message *msg) override;
39+
MessageEncoder::Status encode(CborEncoder* encoder, Message *msg) override;
4040
};
4141

4242
class LastValuesBeginCommandEncoder: public CBORMessageEncoderInterface {
4343
public:
4444
LastValuesBeginCommandEncoder()
4545
: CBORMessageEncoderInterface(CBORLastValuesBeginCmd, LastValuesBeginCmdId) {}
4646
protected:
47-
Encoder::Status encode(CborEncoder* encoder, Message *msg) override;
47+
MessageEncoder::Status encode(CborEncoder* encoder, Message *msg) override;
4848
};
4949

5050
class DeviceBeginCommandEncoder: public CBORMessageEncoderInterface {
5151
public:
5252
DeviceBeginCommandEncoder()
5353
: CBORMessageEncoderInterface(CBORDeviceBeginCmd, DeviceBeginCmdId) {}
5454
protected:
55-
Encoder::Status encode(CborEncoder* encoder, Message *msg) override;
55+
MessageEncoder::Status encode(CborEncoder* encoder, Message *msg) override;
5656
};
5757

5858
class OtaProgressCommandUpEncoder: public CBORMessageEncoderInterface {
5959
public:
6060
OtaProgressCommandUpEncoder()
6161
: CBORMessageEncoderInterface(CBOROtaProgressCmdUp, OtaProgressCmdUpId) {}
6262
protected:
63-
Encoder::Status encode(CborEncoder* encoder, Message *msg) override;
63+
MessageEncoder::Status encode(CborEncoder* encoder, Message *msg) override;
6464
};
6565

6666
class TimezoneCommandUpEncoder: public CBORMessageEncoderInterface {
6767
public:
6868
TimezoneCommandUpEncoder()
6969
: CBORMessageEncoderInterface(CBORTimezoneCommandUp, TimezoneCommandUpId) {}
7070
protected:
71-
Encoder::Status encode(CborEncoder* encoder, Message *msg) override;
71+
MessageEncoder::Status encode(CborEncoder* encoder, Message *msg) override;
7272
};
7373

7474

0 commit comments

Comments
 (0)