Fix: If no sunset/sunrise calculation is possible a wrong value is shown

This is catched now and a proper message is shown in the web UI. Also the mode is set to day.

include/SunPosition.h

@@ -12,6 +12,7 @@ public:
     void loop();
 
     bool isDayPeriod();
+    bool isSunsetAvailable();
     bool sunsetTime(struct tm* info);
     bool sunriseTime(struct tm* info);
 
@@ -20,6 +21,7 @@ private:
 
     SunSet _sun;
     bool _isDayPeriod = true;
+    bool _isSunsetAvailable = true;
     uint _sunriseMinutes = 0;
     uint _sunsetMinutes = 0;
 

src/SunPosition.cpp

@@ -29,6 +29,11 @@ bool SunPositionClass::isDayPeriod()
     return _isDayPeriod;
 }
 
+bool SunPositionClass::isSunsetAvailable()
+{
+    return _isSunsetAvailable;
+}
+
 void SunPositionClass::updateSunData()
 {
     CONFIG_T const& config = Configuration.get();
@@ -37,7 +42,7 @@ void SunPositionClass::updateSunData()
 
     struct tm timeinfo;
     if (!getLocalTime(&timeinfo, 5)) {
-        _isDayPeriod = false;
+        _isDayPeriod = true;
         _sunriseMinutes = 0;
         _sunsetMinutes = 0;
         _isValidInfo = false;
@@ -62,11 +67,26 @@ void SunPositionClass::updateSunData()
         break;
     }
 
-    _sunriseMinutes = static_cast<int>(_sun.calcCustomSunrise(sunset_type));
-    _sunsetMinutes = static_cast<int>(_sun.calcCustomSunset(sunset_type));
+    double sunriseRaw = _sun.calcCustomSunrise(sunset_type);
+    double sunsetRaw = _sun.calcCustomSunset(sunset_type);
+
+    // If no sunset/sunrise exists (e.g. astronomical calculation in summer)
+    // assume it's day period
+    if (std::isnan(sunriseRaw) || std::isnan(sunsetRaw)) {
+        _isDayPeriod = true;
+        _isSunsetAvailable = false;
+        _sunriseMinutes = 0;
+        _sunsetMinutes = 0;
+        _isValidInfo = false;
+        return;
+    }
+
+    _sunriseMinutes = static_cast<int>(sunriseRaw);
+    _sunsetMinutes = static_cast<int>(sunsetRaw);
     uint minutesPastMidnight = timeinfo.tm_hour * 60 + timeinfo.tm_min;
 
     _isDayPeriod = (minutesPastMidnight >= _sunriseMinutes) && (minutesPastMidnight < _sunsetMinutes);
+    _isSunsetAvailable = true;
     _isValidInfo = true;
 }
 

src/WebApi_ntp.cpp

@@ -52,14 +52,21 @@ void WebApiNtpClass::onNtpStatus(AsyncWebServerRequest* request)
     strftime(timeStringBuff, sizeof(timeStringBuff), "%A, %B %d %Y %H:%M:%S", &timeinfo);
     root["ntp_localtime"] = timeStringBuff;
 
-    SunPosition.sunriseTime(&timeinfo);
+    if (SunPosition.sunriseTime(&timeinfo)) {
         strftime(timeStringBuff, sizeof(timeStringBuff), "%A, %B %d %Y %H:%M:%S", &timeinfo);
+    } else {
+        strcpy(timeStringBuff, "--");
+    }
     root["sun_risetime"] = timeStringBuff;
 
-    SunPosition.sunsetTime(&timeinfo);
+    if (SunPosition.sunsetTime(&timeinfo)) {
         strftime(timeStringBuff, sizeof(timeStringBuff), "%A, %B %d %Y %H:%M:%S", &timeinfo);
+    } else {
+        strcpy(timeStringBuff, "--");
+    }
     root["sun_settime"] = timeStringBuff;
 
+    root["sun_isSunsetAvailable"] = SunPosition.isSunsetAvailable();
     root["sun_isDayPeriod"] = SunPosition.isDayPeriod();
 
     response->setLength();

webapp/src/locales/de.json

@@ -246,6 +246,7 @@
         "LocalTime": "Lokale Uhrzeit",
         "Sunrise": "Morgendämmerung",
         "Sunset": "Abenddämmerung",
+        "NotAvailable": "Nicht verfügbar",
         "Mode": "Modus",
         "Day": "Tag",
         "Night": "Nacht"

webapp/src/locales/en.json

@@ -246,6 +246,7 @@
         "LocalTime": "Local Time",
         "Sunrise": "Sunrise",
         "Sunset": "Sunset",
+        "NotAvailable": "Not Available",
         "Mode": "Mode",
         "Day": "Day",
         "Night": "Night"

webapp/src/locales/fr.json

@@ -246,6 +246,7 @@
         "LocalTime": "Heure locale",
         "Sunrise": "Sunrise",
         "Sunset": "Sunset",
+        "NotAvailable": "Not Available",
         "Mode": "Mode",
         "Day": "Day",
         "Night": "Night"

webapp/src/types/NtpStatus.ts

@@ -7,4 +7,5 @@ export interface NtpStatus {
     sun_risetime: string;
     sun_settime: string;
     sun_isDayPeriod: boolean;
+    sun_isSunsetAvailable: boolean;
 }

webapp/src/views/NtpInfoView.vue

@@ -38,11 +38,13 @@
 
                         <tr>
                             <th>{{ $t('ntpinfo.Sunrise') }}</th>
-                            <td>{{ ntpDataList.sun_risetime }}</td>
+                            <td v-if="ntpDataList.sun_isSunsetAvailable">{{ ntpDataList.sun_risetime }}</td>
+                            <td v-else>{{ $t('ntpinfo.NotAvailable') }}</td>
                         </tr>
                         <tr>
                             <th>{{ $t('ntpinfo.Sunset') }}</th>
-                            <td>{{ ntpDataList.sun_settime }}</td>
+                            <td v-if="ntpDataList.sun_isSunsetAvailable">{{ ntpDataList.sun_settime }}</td>
+                            <td v-else>{{ $t('ntpinfo.NotAvailable') }}</td>
                         </tr>
                         <tr>
                             <th>{{ $t('ntpinfo.Mode') }}</th>