From 8196fbc634f4fd2bca0c0c92d312be3c010639fa Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 18 Jul 2024 10:45:55 +0200 Subject: [PATCH] CloudThing: unify update and handleMessage --- src/ArduinoIoTCloudThing.cpp | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/ArduinoIoTCloudThing.cpp b/src/ArduinoIoTCloudThing.cpp index 9b3656b0..98ebb0fb 100644 --- a/src/ArduinoIoTCloudThing.cpp +++ b/src/ArduinoIoTCloudThing.cpp @@ -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(m)->params.offset; + _utcOffsetExpireTime = reinterpret_cast(m)->params.until; + } + } + /* Run through the state machine. */ State nextState = _state; switch (_state) { @@ -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(m)->params.offset; - _utcOffsetExpireTime = reinterpret_cast(m)->params.until; - } - } -} - ArduinoCloudThing::State ArduinoCloudThing::handleInit() { _syncAttempt.begin(AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms); return State::RequestLastValues;