Skip to content

Commit 8196fbc

Browse files
committed
CloudThing: unify update and handleMessage
1 parent 12beae5 commit 8196fbc

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

Diff for: src/ArduinoIoTCloudThing.cpp

+17-15
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,23 @@ void ArduinoCloudThing::begin() {
5959
}
6060

6161
void ArduinoCloudThing::update() {
62+
handleMessage(nullptr);
63+
}
64+
65+
int ArduinoCloudThing::connected() {
66+
return _state > State::Disconnect ? 1 : 0;
67+
}
68+
69+
void ArduinoCloudThing::handleMessage(Message* m) {
70+
_command = UnknownCmdId;
71+
if (m != nullptr) {
72+
_command = m->id;
73+
if (_command == TimezoneCommandDownId) {
74+
_utcOffset = reinterpret_cast<TimezoneCommandDown*>(m)->params.offset;
75+
_utcOffsetExpireTime = reinterpret_cast<TimezoneCommandDown*>(m)->params.until;
76+
}
77+
}
78+
6279
/* Run through the state machine. */
6380
State nextState = _state;
6481
switch (_state) {
@@ -95,21 +112,6 @@ void ArduinoCloudThing::update() {
95112
_state = nextState;
96113
}
97114

98-
int ArduinoCloudThing::connected() {
99-
return _state > State::Disconnect ? 1 : 0;
100-
}
101-
102-
void ArduinoCloudThing::handleMessage(Message* m) {
103-
_command = UnknownCmdId;
104-
if (m != nullptr) {
105-
_command = m->id;
106-
if (_command == TimezoneCommandDownId) {
107-
_utcOffset = reinterpret_cast<TimezoneCommandDown*>(m)->params.offset;
108-
_utcOffsetExpireTime = reinterpret_cast<TimezoneCommandDown*>(m)->params.until;
109-
}
110-
}
111-
}
112-
113115
ArduinoCloudThing::State ArduinoCloudThing::handleInit() {
114116
_syncAttempt.begin(AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms);
115117
return State::RequestLastValues;

0 commit comments

Comments
 (0)