Skip to content

Commit eb663fc

Browse files
committed
new cbor encoder/decoder for provisioning
1 parent da09e55 commit eb663fc

File tree

7 files changed

+620
-12
lines changed

7 files changed

+620
-12
lines changed

src/cbor/CBOR.cpp

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,32 @@ CommandId toCommandId(CBORCommandTag tag) {
4242
return CommandId::LastValuesUpdateCmdId;
4343
case CBORCommandTag::CBORTimezoneCommandDown:
4444
return CommandId::TimezoneCommandDownId;
45+
case CBORCommandTag::CBORProvisioningStatus:
46+
return CommandId::ProvisioningStatus;
47+
case CBORCommandTag::CBORProvisioningListWifiNetworks:
48+
return CommandId::ProvisioningListWifiNetworks;
49+
case CBORCommandTag::CBORProvisioningUniqueId:
50+
return CommandId::ProvisioningUniqueId;
51+
case CBORCommandTag::CBORProvisioningSignature:
52+
return CommandId::ProvisioningSignature;
53+
case CBORCommandTag::CBORProvisioningTimestamp:
54+
return CommandId::ProvisioningTimestamp;
55+
case CBORCommandTag::CBORProvisioningCommands:
56+
return CommandId::ProvisioningCommands;
57+
case CBORCommandTag::CBORProvisioningWifiConfig:
58+
return CommandId::ProvisioningWifiConfig;
59+
case CBORCommandTag::CBORProvisioningLoRaConfig:
60+
return CommandId::ProvisioningLoRaConfig;
61+
case CBORCommandTag::CBORProvisioningGSMConfig:
62+
return CommandId::ProvisioningGSMConfig;
63+
case CBORCommandTag::CBORProvisioningNBIOTConfig:
64+
return CommandId::ProvisioningNBIOTConfig;
65+
case CBORCommandTag::CBORProvisioningCATM1Config:
66+
return CommandId::ProvisioningCATM1Config;
67+
case CBORCommandTag::CBORProvisioningEthernetConfig:
68+
return CommandId::ProvisioningEthernetConfig;
69+
case CBORCommandTag::CBORProvisioningCellularConfig:
70+
return CommandId::ProvisioningCellularConfig;
4571
default:
4672
return CommandId::UnknownCmdId;
4773
}
@@ -71,6 +97,32 @@ CBORCommandTag toCBORCommandTag(CommandId id) {
7197
return CBORCommandTag::CBORLastValuesUpdate;
7298
case CommandId::TimezoneCommandDownId:
7399
return CBORCommandTag::CBORTimezoneCommandDown;
100+
case CommandId::ProvisioningStatus:
101+
return CBORCommandTag::CBORProvisioningStatus;
102+
case CommandId::ProvisioningListWifiNetworks:
103+
return CBORCommandTag::CBORProvisioningListWifiNetworks;
104+
case CommandId::ProvisioningUniqueId:
105+
return CBORCommandTag::CBORProvisioningUniqueId;
106+
case CommandId::ProvisioningSignature:
107+
return CBORCommandTag::CBORProvisioningSignature;
108+
case CommandId::ProvisioningTimestamp:
109+
return CBORCommandTag::CBORProvisioningTimestamp;
110+
case CommandId::ProvisioningCommands:
111+
return CBORCommandTag::CBORProvisioningCommands;
112+
case CommandId::ProvisioningWifiConfig:
113+
return CBORCommandTag::CBORProvisioningWifiConfig;
114+
case CommandId::ProvisioningLoRaConfig:
115+
return CBORCommandTag::CBORProvisioningLoRaConfig;
116+
case CommandId::ProvisioningGSMConfig:
117+
return CBORCommandTag::CBORProvisioningGSMConfig;
118+
case CommandId::ProvisioningNBIOTConfig:
119+
return CBORCommandTag::CBORProvisioningNBIOTConfig;
120+
case CommandId::ProvisioningCATM1Config:
121+
return CBORCommandTag::CBORProvisioningCATM1Config;
122+
case CommandId::ProvisioningEthernetConfig:
123+
return CBORCommandTag::CBORProvisioningEthernetConfig;
124+
case CommandId::ProvisioningCellularConfig:
125+
return CBORCommandTag::CBORProvisioningCellularConfig;
74126
default:
75127
return CBORCommandTag::CBORUnknownCmdTag;
76128
}

src/cbor/CBOR.h

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,35 @@
2121

2222
enum CBORCommandTag: uint64_t {
2323
// Commands UP
24-
CBOROtaBeginUp = 0x010000,
25-
CBORThingBeginCmd = 0x010300,
26-
CBORLastValuesBeginCmd = 0x010500,
27-
CBORDeviceBeginCmd = 0x010700,
28-
CBOROtaProgressCmdUp = 0x010200,
29-
CBORTimezoneCommandUp = 0x010800,
24+
CBOROtaBeginUp = 0x010000,
25+
CBORThingBeginCmd = 0x010300,
26+
CBORLastValuesBeginCmd = 0x010500,
27+
CBORDeviceBeginCmd = 0x010700,
28+
CBOROtaProgressCmdUp = 0x010200,
29+
CBORTimezoneCommandUp = 0x010800,
3030

3131
// Commands DOWN
32-
CBOROtaUpdateCmdDown = 0x010100,
33-
CBORThingUpdateCmd = 0x010400,
34-
CBORThingDetachCmd = 0x011000,
35-
CBORLastValuesUpdate = 0x010600,
36-
CBORTimezoneCommandDown = 0x010900,
32+
CBOROtaUpdateCmdDown = 0x010100,
33+
CBORThingUpdateCmd = 0x010400,
34+
CBORThingDetachCmd = 0x011000,
35+
CBORLastValuesUpdate = 0x010600,
36+
CBORTimezoneCommandDown = 0x010900,
37+
38+
// Provisioning Commands
39+
CBORProvisioningStatus = 0x012000,
40+
CBORProvisioningListWifiNetworks = 0x012001,
41+
CBORProvisioningUniqueId = 0x012010,
42+
CBORProvisioningSignature = 0x012011,
43+
CBORProvisioningTimestamp = 0x012002,
44+
CBORProvisioningCommands = 0x012003,
45+
CBORProvisioningWifiConfig = 0x012004,
46+
CBORProvisioningLoRaConfig = 0x012005,
47+
CBORProvisioningGSMConfig = 0x012006,
48+
CBORProvisioningNBIOTConfig = 0x012007,
49+
CBORProvisioningCATM1Config = 0x012008,
50+
CBORProvisioningEthernetConfig = 0x012009,
51+
CBORProvisioningCellularConfig = 0x012012,
52+
3753

3854
// Unknown Command Tag https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml
3955
CBORUnknownCmdTag16b = 0xffff, // invalid tag

0 commit comments

Comments
 (0)