Skip to content

Commit

Permalink
Merge pull request #490 from pennam/dev-thi-loop-fix
Browse files Browse the repository at this point in the history
Improve device and thing state machine message handling and fix infinite disconnetct loop
  • Loading branch information
pennam authored Jul 22, 2024
2 parents 8b6ff40 + 8196fbc commit 4c0d20e
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 26 deletions.
24 changes: 13 additions & 11 deletions src/ArduinoIoTCloudDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,19 @@ void ArduinoCloudDevice::begin() {
}

void ArduinoCloudDevice::update() {
handleMessage(nullptr);
}

int ArduinoCloudDevice::connected() {
return _state != State::Disconnected ? 1 : 0;
}

void ArduinoCloudDevice::handleMessage(Message *m) {
_command = UnknownCmdId;
if (m != nullptr) {
_command = m->id;
}

/* Run through the state machine. */
State nextState = _state;
switch (_state) {
Expand Down Expand Up @@ -80,17 +93,6 @@ void ArduinoCloudDevice::update() {
_state = nextState;
}

int ArduinoCloudDevice::connected() {
return _state != State::Disconnected ? 1 : 0;
}

void ArduinoCloudDevice::handleMessage(Message *m) {
_command = UnknownCmdId;
if (m != nullptr) {
_command = m->id;
}
}

ArduinoCloudDevice::State ArduinoCloudDevice::handleInit() {
/* Reset attempt struct for the nex retry after disconnection */
_attachAttempt.begin(AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms,
Expand Down
32 changes: 17 additions & 15 deletions src/ArduinoIoTCloudThing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,23 @@ void ArduinoCloudThing::begin() {
}

void ArduinoCloudThing::update() {
handleMessage(nullptr);
}

int ArduinoCloudThing::connected() {
return _state > State::Disconnect ? 1 : 0;
}

void ArduinoCloudThing::handleMessage(Message* m) {
_command = UnknownCmdId;
if (m != nullptr) {
_command = m->id;
if (_command == TimezoneCommandDownId) {
_utcOffset = reinterpret_cast<TimezoneCommandDown*>(m)->params.offset;
_utcOffsetExpireTime = reinterpret_cast<TimezoneCommandDown*>(m)->params.until;
}
}

/* Run through the state machine. */
State nextState = _state;
switch (_state) {
Expand Down Expand Up @@ -95,21 +112,6 @@ void ArduinoCloudThing::update() {
_state = nextState;
}

int ArduinoCloudThing::connected() {
return _state > State::Disconnect ? 1 : 0;
}

void ArduinoCloudThing::handleMessage(Message* m) {
_command = UnknownCmdId;
if (m != nullptr) {
_command = m->id;
if (_command == TimezoneCommandDownId) {
_utcOffset = reinterpret_cast<TimezoneCommandDown*>(m)->params.offset;
_utcOffsetExpireTime = reinterpret_cast<TimezoneCommandDown*>(m)->params.until;
}
}
}

ArduinoCloudThing::State ArduinoCloudThing::handleInit() {
_syncAttempt.begin(AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms);
return State::RequestLastValues;
Expand Down

0 comments on commit 4c0d20e

Please sign in to comment.