Skip to content

Commit f667707

Browse files
committed
fix catm1 config
1 parent 9e7501c commit f667707

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

command/device/configurationstates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (cs *ConfigurationStates) ConfigureNetwork(ctx context.Context, c *NetConfi
194194
Apn: c.CATM1.APN,
195195
Login: c.CATM1.Login,
196196
Pass: c.CATM1.Pass,
197-
Band: c.CATM1.Band,
197+
Band: nil,
198198
})
199199
} else if c.Type == 7 { // Cellular
200200
cmd = cborcoders.From(cborcoders.ProvisioningCellularConfigMessage{

internal/board-protocols/configuration-protocol/cborcoders/enc_dec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func init() {
7979
panic(err)
8080
}
8181

82-
_em, err = cbor.EncOptions{IndefLength: 1}.EncModeWithTags(tags)
82+
_em, err = cbor.EncOptions{IndefLength: 1, NilContainers: cbor.NilContainerAsEmpty}.EncModeWithTags(tags)
8383

8484
if err != nil {
8585
panic(err)

internal/board-protocols/configuration-protocol/cborcoders/enc_dec_test.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,24 @@ func TestEncodeDecode(t *testing.T) {
185185
name: "provisioning catm1 config",
186186
in: From(ProvisioningCATM1ConfigMessage{
187187
PIN: "12345678",
188-
Band: [4]uint32{1, 2, 524288, 134217728},
188+
Band: []uint32{1, 2, 524288, 134217728},
189189
Apn: "apn.arduino.cc",
190190
Login: "TESTUSER",
191191
Pass: "TESTPASSWORD",
192192
}),
193193
want: "DA00012008856831323334353637388401021A000800001A080000006E61706E2E61726475696E6F2E63636854455354555345526C5445535450415353574F5244",
194194
},
195+
{
196+
name: "provisioning catm1 config no band",
197+
in: From(ProvisioningCATM1ConfigMessage{
198+
PIN: "12345678",
199+
Band: []uint32{},
200+
Apn: "apn.arduino.cc",
201+
Login: "TESTUSER",
202+
Pass: "TESTPASSWORD",
203+
}),
204+
want: "DA0001200885683132333435363738806E61706E2E61726475696E6F2E63636854455354555345526C5445535450415353574F5244",
205+
},
195206
{
196207
name: "provisioning ethernet config ipv4",
197208
in: From(ProvisioningEthernetConfigMessage{

internal/board-protocols/configuration-protocol/cborcoders/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func (t ProvisioningLoRaConfigMessage) String() string {
133133
type ProvisioningCATM1ConfigMessage struct {
134134
_ struct{} `cbor:",toarray"`
135135
PIN string
136-
Band [4]uint32
136+
Band []uint32
137137
Apn string
138138
Login string
139139
Pass string

0 commit comments

Comments
 (0)