Merge pull request #428 from zfields/zak-lpwan

pennam · web-flow · commit 756c5f765d9f · 2024-05-06T16:39:23.000+02:00
chore: Switch LPWAN off deprecated method
diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h
@@ -137,6 +137,7 @@
  * CONSTANTS
  ******************************************************************************/
 
+#define AIOT_CONFIG_INTERVAL_RETRY_DELAY_ms                       (10000UL)
 #define AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms                    (1000UL)
 #define AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms               (32000UL)
 #define AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms        (5*1000UL)
diff --git a/src/ArduinoIoTCloudLPWAN.cpp b/src/ArduinoIoTCloudLPWAN.cpp
@@ -50,7 +50,7 @@ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN()
 : _state{State::ConnectPhy}
 , _retryEnable{false}
 , _maxNumRetry{5}
-, _intervalRetry{1000}
+, _intervalRetry{AIOT_CONFIG_INTERVAL_RETRY_DELAY_ms}
 {
 
 }
@@ -61,7 +61,7 @@ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN()
 
 int ArduinoIoTCloudLPWAN::connected()
 {
-  return (_connection->getStatus() == NetworkConnectionState::CONNECTED) ? 1 : 0;
+  return (_connection->check() == NetworkConnectionState::CONNECTED) ? 1 : 0;
 }
 
 int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry)
@@ -105,8 +105,7 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_ConnectPhy()
 
 ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_SyncTime()
 {
-  unsigned long const internal_posix_time = _time_service.getTime();
-  DEBUG_VERBOSE("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %d", __FUNCTION__, internal_posix_time);
+  DEBUG_VERBOSE("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %lu", __FUNCTION__, _time_service.getTime());
   DEBUG_INFO("Connected to Arduino IoT Cloud");
   return State::Connected;
 }
diff --git a/src/property/PropertyContainer.cpp b/src/property/PropertyContainer.cpp
@@ -95,7 +95,7 @@ void requestUpdateForAllProperties(PropertyContainer & prop_cont)
 
 void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont)
 {
-  /* This function updates the timestamps on the primitive properties 
+  /* This function updates the timestamps on the primitive properties
    * that have been modified locally since last cloud synchronization
    */
   std::for_each(prop_cont.begin(),

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN()`
`50`	`50`	`: _state{State::ConnectPhy}`
`51`	`51`	`, _retryEnable{false}`
`52`	`52`	`, _maxNumRetry{5}`
`53`		`-, _intervalRetry{1000}`
	`53`	`+, _intervalRetry{AIOT_CONFIG_INTERVAL_RETRY_DELAY_ms}`
`54`	`54`	`{`
`55`	`55`
`56`	`56`	`}`
`@@ -61,7 +61,7 @@ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN()`
`61`	`61`
`62`	`62`	`int ArduinoIoTCloudLPWAN::connected()`
`63`	`63`	`{`
`64`		`- return (_connection->getStatus() == NetworkConnectionState::CONNECTED) ? 1 : 0;`
	`64`	`+ return (_connection->check() == NetworkConnectionState::CONNECTED) ? 1 : 0;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry)`
`@@ -105,8 +105,7 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_ConnectPhy()`
`105`	`105`
`106`	`106`	`ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_SyncTime()`
`107`	`107`	`{`
`108`		`- unsigned long const internal_posix_time = _time_service.getTime();`
`109`		`- DEBUG_VERBOSE("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %d", __FUNCTION__, internal_posix_time);`
	`108`	`+ DEBUG_VERBOSE("ArduinoIoTCloudLPWAN::%s internal clock configured to posix timestamp %lu", __FUNCTION__, _time_service.getTime());`
`110`	`109`	`DEBUG_INFO("Connected to Arduino IoT Cloud");`
`111`	`110`	`return State::Connected;`
`112`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void requestUpdateForAllProperties(PropertyContainer & prop_cont)`
`95`	`95`
`96`	`96`	`void updateTimestampOnLocallyChangedProperties(PropertyContainer & prop_cont)`
`97`	`97`	`{`
`98`		`- /* This function updates the timestamps on the primitive properties`
	`98`	`+ /* This function updates the timestamps on the primitive properties`
`99`	`99`	`* that have been modified locally since last cloud synchronization`
`100`	`100`	`*/`
`101`	`101`	`std::for_each(prop_cont.begin(),`