fix: useLightMapping

reactive_home/src/composeables/useLightMapping.ts

@@ -93,8 +93,11 @@ export function useLightMapping({
     if (isDisabled?.value) {
       return -1;
     }
-    if (entity.value !== unref(expectedValue)) {
-      return now.value.getTime() - entity.lastChanged.getTime();
+    if (
+      entity.value !== unref(expectedValue) &&
+      /** Just use this as clock source, not for the actual calculation, because it might be behind */ now.value
+    ) {
+      return new Date().getTime() - entity.lastChanged.getTime();
     }
     return -1;
   });
@@ -106,9 +109,11 @@ export function useLightMapping({
     if (
       entity.value &&
       expectedBrightness &&
-      entity.brightness !== unref(expectedBrightness)
+      entity.brightness !== unref(expectedBrightness) &&
+      /** Just use this as clock source, not for the actual calculation, because it might be behind */
+      now.value
     ) {
-      return now.value.getTime() - entity.lastChanged.getTime();
+      return new Date().getTime() - entity.lastChanged.getTime();
     }
     return -1;
   });
@@ -139,7 +144,8 @@ export function useLightMapping({
         }
         entity.brightness = expectedBrightnessValue;
       }
-    }
+    },
+    { immediate: true }
   );
 }
 
@@ -172,7 +178,6 @@ export function parseAutoEnableTimeFactory(
     if (typeof value === "object") {
       value = value.state;
     }
-    console.log({ value, input });
     return parse(value, "ms");
   });
 }
@@ -194,13 +199,17 @@ export function shouldReEnableSinceFactory(
       return -1;
     }
 
+    /** Just use this as clock source, not for the actual calculation, because it might be behind */
     const now = unref(nowSource);
+    if (!now) {
+      return -1;
+    }
 
     const resetTime = unref(resetTimeSource);
 
     const lastChanged = entity.lastChanged;
 
-    const diffDate = subMilliseconds(now, resetTime);
+    const diffDate = subMilliseconds(new Date(), resetTime);
 
     if (lastChanged < diffDate) {
       return diffDate.getTime() - lastChanged.getTime();

test-modules/script.arbeitszimmer.ts

@@ -0,0 +1,89 @@
+import {
+  computed,
+  useLightMapping,
+  useNewLight,
+  useAsyncState,
+  useNewBoolean,
+  useNewStateForDuration,
+} from "../mod.ts";
+
+const sunState = await useAsyncState("sun.sun");
+
+const epo = useNewBoolean(await useAsyncState("binary_sensor.occupancy_2"));
+
+const motionEntrenceState = await useAsyncState(
+  "binary_sensor.arbeitszimmer_eingang_bewegungsmelder_occupancy"
+);
+
+const motionEntrence = useNewBoolean(motionEntrenceState);
+
+const motionTableState = await useAsyncState(
+  "binary_sensor.arbeitszimmer_schreibtisch_bewegungsmelder_occupancy"
+);
+
+const motionTable = useNewBoolean(motionTableState);
+
+const motionEntrenceOnFor40Sec = useNewStateForDuration(
+  motionEntrenceState,
+  "on",
+  40,
+  "off"
+);
+
+const motionTableOnFor40Sec = useNewStateForDuration(
+  motionTableState,
+  "on",
+  40,
+  "off"
+);
+
+const lightShouldBeOn = computed(() => {
+  // Sun is above horizon, no light needed
+  if (sunState.value?.state === "above_horizon") {
+    return false;
+  }
+
+  // EP1 detects something, there is definitely someone
+  if (epo.value) {
+    return true;
+  }
+
+  const pirDetected = motionEntrence.value || motionTable.value;
+
+  const pir40s = motionEntrenceOnFor40Sec.value || motionTableOnFor40Sec.value;
+
+  // If the motion sensor is on for over 20s, but the EP1 not, then turn the lights off
+  if (pirDetected && !(pir40s && !epo.value)) {
+    return false;
+  }
+
+  return pirDetected;
+});
+
+const isDisabled = useNewBoolean(
+  await useAsyncState("input_boolean.arbeitszimmer_disableauto_state")
+);
+
+const autoEnableTime = await useAsyncState(
+  "input_text.arbeitszimmer_disableauto_state_time"
+);
+
+const kugel1 = useNewLight(await useAsyncState("light.0x2c1165fffed484a7"));
+
+console.log({ ss: lightShouldBeOn.value, kugel1: kugel1.value });
+
+useLightMapping({
+  entity: kugel1,
+  expectedValue: lightShouldBeOn,
+  isDisabled,
+  autoEnableTime,
+  debug: true,
+});
+
+useLightMapping({
+  entity: useNewLight(await useAsyncState("light.0xdc8e95fffee16f80")),
+  expectedValue: lightShouldBeOn,
+  isDisabled,
+  autoEnableTime,
+  debug: true,
+});