Cleanup in case of null

steadramon · Sep 1, 2024 · 897543d · 897543d
1 parent c986af4
commit 897543d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ESPGeiger/src/Radmon/Radmon.cpp b/ESPGeiger/src/Radmon/Radmon.cpp
@@ -36,13 +36,20 @@ void Radmon::setInterval(int interval) {
   pingInterval = interval*1000;
 }
 
+int Radmon::getInterval() {
+  return pingInterval / 1000;
+}
+
 void Radmon::s_tick(unsigned long stick_now)
 {
   if (stick_now - lastPing >= pingInterval)
   {
     if (lastPing == 0) {
       ConfigManager &configManager = ConfigManager::getInstance();
       int rtimer = atoi(configManager.getParamValueFromID("radmonTime"));
+      if (rtimer == NULL) {
+        rtimer = RADMON_INTERVAL;
+      }
       setInterval(rtimer);
       lastPing = random(rtimer / 2) * 1000;
       return;
@@ -90,6 +97,9 @@ void Radmon::postMeasurement() {
   const char* _api_user = configManager.getParamValueFromID("radmonUser");
   const char* _api_key = configManager.getParamValueFromID("radmonKey");
   int rtimer = atoi(configManager.getParamValueFromID("radmonTime"));
+  if (rtimer == NULL) {
+    rtimer = RADMON_INTERVAL;
+  }
   setInterval(rtimer);
 
   if ((_api_user == NULL) && (_api_key == NULL)) {

diff --git a/ESPGeiger/src/Radmon/Radmon.h b/ESPGeiger/src/Radmon/Radmon.h
@@ -50,6 +50,7 @@ class Radmon {
     void s_tick(unsigned long stick_now);
     void postMeasurement();
     void setInterval(int interval);
+    int getInterval();
     AsyncHTTPRequest request;
   private:
     unsigned long lastPing = 0;
@@ -58,4 +59,4 @@ class Radmon {
 };
 
 #endif
-#endif
+#endif