add min notification brightness

Author: haschtl

custom_components/quarzlampe/status_store.py

@@ -142,6 +142,7 @@ def float_or_none(key: str) -> float | None:
                     "music_mode": kv.get("music_mode"),
                     "music_mod": float_or_none("music_mod"),
                     "music_kick_ms": float_or_none("music_kick_ms"),
+                    "notif_min": float_or_none("notif_min"),
                     "music_env": float_or_none("music_env"),
                     "music_level": float_or_none("music_level"),
                     "music_smooth": float_or_none("music_smooth"),

frontend/src/cards/NotifyCard.tsx

@@ -12,11 +12,13 @@ type Props = {
   setNotifyFade: (v: number) => void;
   notifyRepeat: number;
   setNotifyRepeat: (v: number) => void;
+  notifyMin: number;
+  setNotifyMin: (v: number) => void;
   handleNotify: (seq: string, fade?: number, repeat?: number) => void;
   sendCmd: (cmd: string) => void;
 };
 
-export function NotifyCard({ notifySeq, setNotifySeq, notifyFade, setNotifyFade, notifyRepeat, setNotifyRepeat, handleNotify, sendCmd }: Props) {
+export function NotifyCard({ notifySeq, setNotifySeq, notifyFade, setNotifyFade, notifyRepeat, setNotifyRepeat, notifyMin, setNotifyMin, handleNotify, sendCmd }: Props) {
   return (
     <Card>
       <CardHeader>
@@ -77,6 +79,26 @@ export function NotifyCard({ notifySeq, setNotifySeq, notifyFade, setNotifyFade,
                   className="w-20"
                 />
               </div>
+              <div>
+                <Label className="m-0 text-muted">
+                  <Trans k="label.notifyMin">Notify min (%)</Trans>
+                </Label>
+                <Input
+                  type="number"
+                  min={0}
+                  max={100}
+                  step={1}
+                  value={notifyMin}
+                  onChange={(e) => setNotifyMin(Number(e.target.value))}
+                  onBlur={(e) => {
+                    const v = Math.min(100, Math.max(0, Number(e.target.value)));
+                    setNotifyMin(v);
+                    sendCmd(`notify min ${v.toFixed(1)}`);
+                  }}
+                  className="w-24"
+                  suffix="%"
+                />
+              </div>
             </div>
           </div>
           <div className="flex items-end gap-2">

frontend/src/hooks/status.ts

@@ -95,6 +95,7 @@ export type DeviceStatus = {
   musicEnv?: number;
   musicLevel?: number;
   musicKickMs?: number;
+  notifyMin?: number;
   clapEnabled?: boolean;
   clapThreshold?: number;
   clapCooldownMs?: number;
@@ -148,6 +149,16 @@ export function parseStatusLine(line: string, setStatus: Dispatch<SetStateAction
     }));
     return true;
   }
+  if (line.startsWith('[Brightness]')) {
+    const match = line.match(/Brightness\]\s*([0-9.]+)/i);
+    const val = match ? parseFloat(match[1]) : undefined;
+    setStatus((s) => ({
+      ...s,
+      brightness: Number.isFinite(val ?? NaN) ? val : s.brightness,
+      lastStatusAt: Date.now(),
+    }));
+    return true;
+  }
   if (line.startsWith('STATUS')) {
     const parts = line.split('|').slice(1);
     const kv: Record<string, string> = {};
@@ -176,6 +187,7 @@ export function parseStatusLine(line: string, setStatus: Dispatch<SetStateAction
       const outputMode = kv.out ? (kv.out.toLowerCase().startsWith('ana') ? 'analog' : 'pwm') : undefined;
       const hasMusic = kv.music ? isAvailable('music') : s.hasMusic;
       const hasPoti = kv.poti ? isAvailable('poti') : s.hasPoti;
+      const notifyMin = kv.notif_min ? asNum('notif_min') : s.notifyMin;
       const potiVal = Object.prototype.hasOwnProperty.call(kv, 'poti_val') ? asNum('poti_val') : undefined;
       const potiRaw = Object.prototype.hasOwnProperty.call(kv, 'poti_raw') ? asInt('poti_raw') : undefined;
       const potiMin = Object.prototype.hasOwnProperty.call(kv, 'poti_min') ? asNum('poti_min') : undefined;
@@ -284,6 +296,7 @@ export function parseStatusLine(line: string, setStatus: Dispatch<SetStateAction
         musicMode: kv.music_mode ?? s.musicMode,
         musicMod: asNum('music_mod') ?? s.musicMod,
         musicKickMs: asNum('music_kick_ms') ?? s.musicKickMs,
+        notifyMin,
         clapEnabled: kv.clap ? kv.clap.toUpperCase() === 'ON' : hasMusic === false ? false : s.clapEnabled,
         clapThreshold: asNum('clap_thr') ?? s.clapThreshold,
         clapCooldownMs: asInt('clap_cool') ?? s.clapCooldownMs,

frontend/src/i18n.tsx

@@ -111,6 +111,7 @@ const translations: Record<Lang, Record<string, string>> = {
     "label.values": "Values (0..1 CSV)",
     "label.step": "Step",
     "label.repeat": "Repeat",
+    "label.notifyMin": "Min. Notify-Helligkeit (%)",
     "label.lightGain": "Light gain",
     "label.musicGain": "Music gain",
     "label.clapThr": "Clap thr",
@@ -365,6 +366,8 @@ const translations: Record<Lang, Record<string, string>> = {
     "filter.delayMix": "Mix",
     "filter.presets": "Presets",
     "label.repeat": "Wiederholen",
+    "label.notifyMin": "Min. Notify-Helligkeit (%)",
+    "label.notifyMin": "Notify min (%)",
     "label.lightGain": "Licht-Gain",
     "label.musicGain": "Musik-Gain",
     "label.clapThr": "Klatsch-Schwelle",

frontend/src/sections/ActionsSection.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { MorseCard } from '@/cards/MorseCard';
 import { NotifyCard } from '@/cards/NotifyCard';
 import { WakeSleepCard } from '@/cards/WakeSleepCard';
@@ -10,6 +10,7 @@ export function ActionsSection() {
   const [notifySeq, setNotifySeq] = useState('80 40 80 120');
   const [notifyFade, setNotifyFade] = useState(0);
   const [notifyRepeat, setNotifyRepeat] = useState(1);
+  const [notifyMin, setNotifyMin] = useState(10);
   const [wakeDuration, setWakeDuration] = useState(180);
   const [wakeMode, setWakeMode] = useState('');
   const [wakeBri, setWakeBri] = useState('');
@@ -43,6 +44,13 @@ export function ActionsSection() {
     sendCmd(cmd).catch((e) => console.warn(e));
   };
 
+  // Sync min notify brightness from status if available
+  useEffect(() => {
+    if (typeof status.notifyMin === 'number' && !Number.isNaN(status.notifyMin)) {
+      setNotifyMin(status.notifyMin);
+    }
+  }, [status.notifyMin]);
+
   const handleWake = () => {
     const parts = ['wake'];
     if (wakeSoft) parts.push('soft');
@@ -76,6 +84,8 @@ export function ActionsSection() {
         setNotifyFade={setNotifyFade}
         notifyRepeat={notifyRepeat}
         setNotifyRepeat={setNotifyRepeat}
+        notifyMin={notifyMin}
+        setNotifyMin={setNotifyMin}
         handleNotify={handleNotify}
         sendCmd={sendCmd}
       />

include/notifications.h

@@ -10,4 +10,5 @@ extern bool notifyInvert;
 extern bool notifyRestoreLamp;
 extern bool notifyPrevLampOn;
 extern bool notifyActive;
-extern uint32_t notifyFadeMs;
+extern uint32_t notifyFadeMs;
+extern float notifyMinBrightness; // 0..1 floor for notify output

include/settings.h

@@ -80,6 +80,7 @@ constexpr float LIGHT_CLAMP_MIN_DEFAULT = 0.2f;
 constexpr float LIGHT_CLAMP_MAX_DEFAULT = 1.0f;
 constexpr float BRI_MIN_DEFAULT = 0.00f;
 constexpr float BRI_MAX_DEFAULT = 1.00f;
+constexpr float NOTIFY_MIN_BRI_DEFAULT = 0.10f; ///< Minimal brightness for notify pulses (0..1)
 constexpr uint32_t CUSTOM_STEP_MS_DEFAULT = 800;///< default step time for custom pattern
 // Require an incoming command before any feedback is printed/sent (set via -DREQUIRE_FEEDBACK_HANDSHAKE=1)
 #ifndef REQUIRE_FEEDBACK_HANDSHAKE

src/command.cpp

@@ -1014,6 +1014,19 @@ void handleCommand(String line)
     {
         std::vector<uint32_t> seq;
         notifyFadeMs = 0;
+        if (lower.startsWith("notify min"))
+        {
+            float v = line.substring(10).toFloat();
+            v = clamp01(v / 100.0f);
+            if (v < 0.0f)
+                v = 0.0f;
+            if (v > 1.0f)
+                v = 1.0f;
+            notifyMinBrightness = v;
+            saveSettings();
+            sendFeedback(String(F("[Notify] min_bri=")) + String(v * 100.0f, 1) + F("%"));
+            return;
+        }
         String args = line.substring(6);
         args.trim();
         while (args.length() > 0)

src/main.cpp

@@ -247,10 +247,8 @@ void updatePatternEngine()
     adjusted = 1.0f;
   relative = adjusted;
   float combined = lampEnabled ? relative * masterBrightness * ambientScale * outputScale : 0.0f;
-#ifndef ENABLE_MUSIC_MODE
-  if (musicEnabled)
-    combined *= musicModScale;
-#endif
+
+  // Notifications: ignore pattern; use brightness+ambient only with a floor.
   if (notifyActive && !notifySeq.empty())
   {
     uint32_t dtStage = now - notifyStageStartMs;
@@ -279,6 +277,12 @@ void updatePatternEngine()
     }
     if (notifyActive)
     {
+      // Start from brightness * ambient, with a minimum brightness to stay visible.
+      float base = masterBrightness;
+      if (base < notifyMinBrightness)
+        base = notifyMinBrightness;
+      base *= ambientScale;
+
       bool onPhase = (notifyIdx % 2 == 0);
       float scale = notifyInvert ? (onPhase ? 0.0f : 1.0f) : (onPhase ? 1.0f : 0.0f);
       if (notifyFadeMs > 0)
@@ -299,9 +303,14 @@ void updatePatternEngine()
         else
           scale = onPhase ? s : (1.0f - s);
       }
-      combined *= scale;
+      combined = base * scale;
     }
   }
+
+#ifndef ENABLE_MUSIC_MODE
+  if (musicEnabled && !notifyActive)
+    combined *= musicModScale;
+#endif
   if (patternFadeEnabled)
   {
     if (patternFilterLastMs == 0)

src/notifications.cpp

@@ -1,5 +1,6 @@
 
 #include "Arduino.h"
+#include "settings.h"
 #include <vector>
 
 // Notify blink
@@ -10,4 +11,5 @@ bool notifyInvert = false;
 bool notifyRestoreLamp = false;
 bool notifyPrevLampOn = false;
 bool notifyActive = false;
-uint32_t notifyFadeMs = 0;
+uint32_t notifyFadeMs = 0;
+float notifyMinBrightness = Settings::NOTIFY_MIN_BRI_DEFAULT;