Skip to content

Commit 786854d

Browse files
pennamandreagilardoni
authored andcommitted
ArduinoIoTCloudDevice: switch to messages
1 parent 078fc1a commit 786854d

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/ArduinoIoTCloudDevice.cpp

+6-11
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void ArduinoIoTCloudDevice::handleMessage(Message* m)
7272
switch (m->id)
7373
{
7474
/* We have received a new thing id message */
75-
case AttachThing:
75+
case ThingGetIdCmdDownId:
7676
{
7777
Serial.println(((ThingGetIdCmdDown*)m)->params.thing_id);
7878
String thing_id_msg = String(((ThingGetIdCmdDown*)m)->params.thing_id);
@@ -88,11 +88,6 @@ void ArduinoIoTCloudDevice::handleMessage(Message* m)
8888
_state = State::Init;
8989
break;
9090

91-
case SendCapabilities:
92-
case GetThingId:
93-
case GetLastValues:
94-
case LastValues:
95-
case SendProperties:
9691
default:
9792
break;
9893
}
@@ -113,12 +108,13 @@ ArduinoIoTCloudDevice::State ArduinoIoTCloudDevice::handle_Init()
113108
ArduinoIoTCloudDevice::State ArduinoIoTCloudDevice::handle_SendCapabilities()
114109
{
115110
/* Now: Sends message into device topic Will: LIB_VERSION? */
116-
_message.id = SendCapabilities;
117-
deliver(&_message);
111+
DeviceBeginCmdUp deviceBegin = { DeviceBeginCmdUpId, AIOT_CONFIG_LIB_VERSION };
112+
deliver(reinterpret_cast<Message*>(&deviceBegin));
118113

119114
/* Now: Subscribe to device topic. Will: send Thing.begin() */
120-
_message.id = GetThingId;
121-
deliver(&_message);
115+
ThingGetIdCmdUp thingBegin = { ThingGetIdCmdUpId };
116+
strcpy(thingBegin.params.thing_id, _thing_id.begin());
117+
deliver(reinterpret_cast<Message*>(&thingBegin));
122118

123119
/* No device configuration received. Wait: 4s -> 8s -> 16s -> 32s -> 32s ...*/
124120
_connection_attempt.retry();
@@ -182,5 +178,4 @@ ArduinoIoTCloudDevice::State ArduinoIoTCloudDevice::handle_Disconnected()
182178
{
183179
return State::Disconnected;
184180
}
185-
186181
#endif

0 commit comments

Comments
 (0)