Add dim, curtail (#1066)

Author: naltatis

src/components/DeviceFilter.astro

@@ -51,27 +51,37 @@ const labels = lang === "de"
       </button>
     </label>
 
-    {usages.map((u) => (
-      <button
-        type="button"
-        class="tag tag-usages"
-        data-device-filter-usage={u}
-        aria-pressed="false"
-        aria-label={`${labels.filterByPrefix} ${usageLabel(u, lang)}`}
-        title={usageLabel(u, lang)}
-      >
-        <UsageIcons usages={[u]} lang={lang} />
-      </button>
-    ))}
-
-    {features.map((f) => (
-      <button
-        type="button"
-        class="tag tag-feature"
-        data-device-filter-feature={f}
-        aria-pressed="false"
-      >{featureShortLabel(f, lang)}</button>
-    ))}
+    <div class="device-filter__tags">
+      {usages.length > 0 && (
+        <div class="device-filter__tag-row device-filter__tag-row--usages">
+          {usages.map((u) => (
+            <button
+              type="button"
+              class="tag tag-usages"
+              data-device-filter-usage={u}
+              aria-pressed="false"
+              aria-label={`${labels.filterByPrefix} ${usageLabel(u, lang)}`}
+              title={usageLabel(u, lang)}
+            >
+              <UsageIcons usages={[u]} lang={lang} />
+            </button>
+          ))}
+        </div>
+      )}
+
+      {features.length > 0 && (
+        <div class="device-filter__tag-row device-filter__tag-row--features">
+          {features.map((f) => (
+            <button
+              type="button"
+              class="tag tag-feature"
+              data-device-filter-feature={f}
+              aria-pressed="false"
+            >{featureShortLabel(f, lang)}</button>
+          ))}
+        </div>
+      )}
+    </div>
   </div>
 </div>
 

src/components/features.ts

@@ -8,6 +8,8 @@ const labels: Record<string, Partial<Record<Lang, string>>> = {
   "battery-control": { de: "Batteriesteuerung", en: "Battery control" },
   iso151182: { de: "ISO 15118-2", en: "ISO 15118-2" },
   "iso15118-2": { de: "ISO 15118-2", en: "ISO 15118-2" },
+  dim: { de: "Dimmbar", en: "Dimmable" },
+  curtail: { de: "Abregelbar", en: "Curtailable" },
   sponsorship: { de: "Sponsortoken", en: "Sponsor token" },
   sponsorfree: { de: "Kein Sponsortoken", en: "No sponsor token" },
   skiptest: { de: "", en: "" },
@@ -17,11 +19,14 @@ const labels: Record<string, Partial<Record<Lang, string>>> = {
 
 const shortLabels: Record<string, Partial<Record<Lang, string>>> = {
   mA: { de: "mA", en: "mA" },
-  meter: { de: "Zähler", en: "Meter" },
+  meter: { de: "Zähler", en: "meter" },
+  "battery-control": { de: "Batteriesteuerung", en: "battery control" },
   iso151182: { de: "ISO", en: "ISO" },
   "iso15118-2": { de: "ISO", en: "ISO" },
-  sponsorship: { de: "Sponsor", en: "Sponsor" },
-  sponsorfree: { de: "Sponsor-frei", en: "Sponsor free" },
+  dim: { de: "dimmbar", en: "dimmable" },
+  curtail: { de: "abregelbar", en: "curtailable" },
+  sponsorship: { de: "Sponsor", en: "sponsor" },
+  sponsorfree: { de: "sponsorfrei", en: "sponsor free" },
 };
 
 const descriptions: Record<string, Partial<Record<Lang, string>>> = {
@@ -53,6 +58,14 @@ const descriptions: Record<string, Partial<Record<Lang, string>>> = {
     de: "Externe Steuerung von Hausbatterie-Lade- und Entladevorgängen durch evcc.",
     en: "External control of home battery charging and discharging via evcc.",
   },
+  dim: {
+    de: "Verbrauchsleistung kann reduziert werden (bspw. §14a EnWG). Siehe [Externe Steuerung](/de/features/external-control).",
+    en: "Power consumption can be reduced (e.g. §14a EnWG). See [External Control](/en/features/external-control).",
+  },
+  curtail: {
+    de: "Wechselrichter-Erzeugung kann reduziert werden (bspw. §9 EEG). Siehe [Externe Steuerung](/de/features/external-control).",
+    en: "Inverter production can be reduced (e.g. §9 EEG). See [External Control](/en/features/external-control).",
+  },
   ocpp: {
     de: "Kommunikation über das offene OCPP-Protokoll.",
     en: "Communication via the open OCPP protocol.",

src/components/intros/ChargersIntro.astro

@@ -7,7 +7,7 @@ interface Props {
 }
 const { lang } = Astro.props;
 
-const featureKeys = ["1p3p", "rfid", "mA", "meter", "iso15118-2"];
+const featureKeys = ["1p3p", "rfid", "mA", "meter", "iso15118-2", "dim"];
 
 const t = lang === "de"
   ? {

src/components/intros/MetersIntro.astro

@@ -1,10 +1,14 @@
 ---
 import UsageIcons from "@components/UsageIcons.astro";
+import { featureLabel, featureDescription } from "@components/features";
+import { renderMarkdownInline } from "@utils/devices";
 
 interface Props {
   lang: "de" | "en";
 }
 const { lang } = Astro.props;
+
+const featureKeys = ["battery-control", "dim", "curtail"];
 ---
 
 {lang === "de" ? (
@@ -44,11 +48,12 @@ const { lang } = Astro.props;
 
     <h2 id="features">Eigenschaften</h2>
     <ul>
-      <li>
-        <strong>Batteriesteuerung:</strong> Geräte mit aktiver Steuerung erlauben weitere Optimierungen,
-        z. B. eine Entladesperre beim Schnellladen des Fahrzeugs.
-        Passive Batteriesteuerung funktioniert mit allen Hausakkus.
-      </li>
+      {featureKeys.map((f) => (
+        <li>
+          <strong>{featureLabel(f, lang)}:</strong>{" "}
+          <span set:html={renderMarkdownInline(featureDescription(f, lang))} />
+        </li>
+      ))}
     </ul>
   </>
 ) : (
@@ -88,11 +93,12 @@ const { lang } = Astro.props;
 
     <h2 id="features">Features</h2>
     <ul>
-      <li>
-        <strong>Battery control:</strong> Devices with active control unlock further optimisations,
-        e.g. preventing discharge while fast-charging the vehicle.
-        Passive battery control works with every home battery.
-      </li>
+      {featureKeys.map((f) => (
+        <li>
+          <strong>{featureLabel(f, lang)}:</strong>{" "}
+          <span set:html={renderMarkdownInline(featureDescription(f, lang))} />
+        </li>
+      ))}
     </ul>
   </>
 )}

src/content/docs/de/features/external-control.mdx

@@ -26,14 +26,17 @@ Wichtige Punkte:
 
 ### Einspeisemanagement (§9 EEG)
 
-:::caution[In Entwicklung]
-Der Mechanismus ist implementiert.
-Die Integration und Dokumentation unterstützter Wechselrichter ist in Arbeit.
+:::caution[Experimentell]
+Unterstützte Geräte sind in der [Geräteübersicht](/de/meters) mit "Abregelbar" markiert.
 :::
 
 Nach §9 des Erneuerbare-Energien-Gesetzes (EEG) können Netzbetreiber bei drohender Netzüberlastung die Einspeisung von Erneuerbare-Energien-Anlagen abregeln.
 Dies betrifft hauptsächlich größere PV-Anlagen, kann aber auch im privaten Bereich relevant werden.
 
+Erhält evcc ein Abregelungssignal, wird die Wechselrichter-Erzeugung direkt am Gerät auf 0 W begrenzt.
+Die Abregelung ist aktuell ein binäres Signal (an/aus) ohne dynamischen Grenzwert.
+Nach Ende des Signals wird die volle Erzeugung wieder freigegeben.
+
 ### Anbindungsmöglichkeiten
 
 Die Anbindung erfolgt über **Relais** (über einen Schaltkontakt) oder **EEBus** (über das EEBus-Protokoll).

src/content/docs/en/features/external-control.mdx

@@ -26,14 +26,17 @@ Important points:
 
 ### Feed-in Management (§9 EEG)
 
-:::caution[Under development]
-The mechanism is implemented.
-Integration and documentation of supported inverters is work in progress.
+:::caution[Experimental]
+Supported devices are marked with "Curtailable" in the [device overview](/en/meters).
 :::
 
 According to §9 of the Renewable Energy Act (EEG), grid operators can curtail the feed-in of renewable energy installations in the event of imminent grid overload.
 This mainly affects larger solar installations, but can also become relevant in the residential sector.
 
+When evcc receives a curtailment signal, inverter production is limited to 0 W directly at the device.
+Curtailment is currently a binary signal (on/off) without a dynamic setpoint.
+Full production resumes once the signal clears.
+
 ### Connection Options
 
 Connection is established via **Relay** (via a switch contact) or **EEBus** (via the EEBus protocol).

src/styles/custom.css

@@ -215,19 +215,18 @@ header.header .social-icons::after {
 
 .device-filter__body {
   display: flex;
-  flex-wrap: wrap;
-  align-items: center;
+  flex-direction: column;
   gap: 0.5rem;
 }
 @media (min-width: 50rem) {
-  .device-filter__search {
-    margin-right: auto;
+  .device-filter__body {
+    flex-direction: row;
+    align-items: flex-start;
+    gap: 1rem;
   }
 }
 
 .device-filter__search {
-  flex: 0 1 260px;
-  min-width: 180px;
   display: flex;
   align-items: center;
   gap: 0.5rem;
@@ -236,9 +235,28 @@ header.header .social-icons::after {
   border: 1px solid var(--sl-color-hairline);
   border-radius: 0.4rem;
 }
-@media (max-width: 47.99rem) {
+@media (min-width: 50rem) {
   .device-filter__search {
-    flex: 1 1 100%;
+    flex: 1;
+    min-width: 0;
+  }
+}
+
+.device-filter__tags {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  flex: 1;
+  min-width: 0;
+}
+.device-filter__tag-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+}
+@media (min-width: 50rem) {
+  .device-filter__tag-row {
+    justify-content: flex-end;
   }
 }
 .device-filter__search:focus-within {
@@ -535,9 +553,11 @@ nav.sidebar details:has(> summary[id*="authors"]) {
   border: 1px solid var(--sl-color-accent-low);
   padding: 0.15rem 0.45rem;
   border-radius: 0.4rem;
-  margin-inline-end: 0.4rem;
   vertical-align: middle;
 }
+.sl-markdown-content .usage-list .tag.tag-usages {
+  margin-inline-end: 0.4rem;
+}
 .sl-markdown-content ul.usage-list {
   list-style: none;
   padding-left: 0;