Return remaining nightlight time in json API

This returns the number of seconds remaining in the nightlight in the
"rem" field of the nightlight ("nl") state. If there is no nightlight
active, it returns -1.
This commit is contained in:
Chris AtLee 2020-10-30 15:18:27 -04:00
parent b8fcab29ac
commit 8d318e7206

View File

@ -318,7 +318,12 @@ void serializeState(JsonObject root)
nl[F("fade")] = (nightlightMode > NL_MODE_SET); //deprecated nl[F("fade")] = (nightlightMode > NL_MODE_SET); //deprecated
nl[F("mode")] = nightlightMode; nl[F("mode")] = nightlightMode;
nl[F("tbri")] = nightlightTargetBri; nl[F("tbri")] = nightlightTargetBri;
if (nightlightActive) {
nl[F("rem")] = (nightlightDelayMs - (millis() - nightlightStartTime)) / 1000; // seconds remaining
} else {
nl[F("rem")] = -1;
}
JsonObject udpn = root.createNestedObject("udpn"); JsonObject udpn = root.createNestedObject("udpn");
udpn[F("send")] = notifyDirect; udpn[F("send")] = notifyDirect;
udpn[F("recv")] = receiveNotifications; udpn[F("recv")] = receiveNotifications;
@ -326,7 +331,7 @@ void serializeState(JsonObject root)
root[F("lor")] = realtimeOverride; root[F("lor")] = realtimeOverride;
root[F("mainseg")] = strip.getMainSegmentId(); root[F("mainseg")] = strip.getMainSegmentId();
JsonArray seg = root.createNestedArray("seg"); JsonArray seg = root.createNestedArray("seg");
for (byte s = 0; s < strip.getMaxSegments(); s++) for (byte s = 0; s < strip.getMaxSegments(); s++)
{ {