#276 Integrate COCCON Spain Enclosure (49)

Debug and refine

Author: dostuffthatmatters

packages/cli/commands/aemet_enclosure.py

@@ -96,22 +96,22 @@ def _set_spectrometer_power(state: Literal["true", "false"]) -> None:
 
 
 @aemet_enclosure_command_group.command(
-    name="set-enhance-security-mode",
+    name="set-enhanced-security-mode",
     help="Set the variable ENHANCED_SECURITY to 1 (true) or 0 (false).",
 )
-@click.argument("state")
-def _set_enhance_security_mode(state: Literal["true", "false"]) -> None:
-    logger.info(f'running command "plc set-enhance-security-mode {state}"')
+@click.argument("value")
+def _set_enhance_security_mode(value: int) -> None:
+    logger.info(f'running command "plc set-enhance-security-mode {value}"')
     enclosure_interface = _get_enclosure_interface()
-    enclosure_interface.set_enhanced_security_mode(state == "true")
+    enclosure_interface.set_enhanced_security_mode(int(value) == 1)
     _print_green("Ok")
 
 
 @aemet_enclosure_command_group.command(
     name="set-averia-fault-code",
     help="Set the variable AVERIA to a given integer value.",
 )
-@click.argument("state")
+@click.argument("value")
 def _set_averia_fault_code(value: int) -> None:
     logger.info(f'running command "plc set-averia-fault-code {value}"')
     enclosure_interface = _get_enclosure_interface()
@@ -123,7 +123,7 @@ def _set_averia_fault_code(value: int) -> None:
     name="set-alert-level",
     help="Set the variable ALERTA to a given integer value.",
 )
-@click.argument("state")
+@click.argument("value")
 def _set_alert_level(value: int) -> None:
     logger.info(f'running command "plc set-alert-level {value}"')
     enclosure_interface = _get_enclosure_interface()
@@ -135,9 +135,9 @@ def _set_alert_level(value: int) -> None:
     name="set-auto-mode",
     help="Set the variable AUTO to a given integer value.",
 )
-@click.argument("state")
+@click.argument("value")
 def _set_auto_mode(value: int) -> None:
     logger.info(f'running command "plc set-auto-mode {value}"')
     enclosure_interface = _get_enclosure_interface()
-    enclosure_interface.set_enclosure_mode("auto" if value == 1 else "manual")
+    enclosure_interface.set_enclosure_mode("auto" if int(value) == 1 else "manual")
     _print_green("Ok")

packages/core/interfaces/enclosures/aemet.py

@@ -138,25 +138,7 @@ def update_config(
     def read(
         self,
         immediate_write_to_central_state: bool = True,
-        skip_power_plug_state: bool = False,
     ) -> types.aemet.AEMETEnclosureState:
-        em27_has_power: Optional[bool] = None
-        em27_voltage: Optional[float] = None
-        em27_current: Optional[float] = None
-        em27_power: Optional[float] = None
-        if skip_power_plug_state:
-            em27_has_power = self.state.em27_has_power
-            em27_voltage = self.state.em27_voltage
-            em27_current = self.state.em27_current
-            em27_power = self.state.em27_power
-        else:
-            if self.enclosure_config.use_em27_power_plug:
-                em27_has_power = self.tasmota_plug.get_power_state()
-                throughput_state = self.tasmota_plug.get_throughput_state()
-                em27_voltage = throughput_state["em27_voltage"]
-                em27_current = throughput_state["em27_current"]
-                em27_power = throughput_state["em27_power"]
-
         try:
             out = self._run_command("DataQuery", mode="most-recent", uri="dl:Public")
             headers = [d["name"] for d in out["head"]["fields"]]
@@ -170,11 +152,12 @@ def read(
                 # d["time"] = out["data"][0]["time"]
                 # d["no"] = out["data"][0]["no"]
                 news = types.aemet.AEMETEnclosureState.model_validate(d)
-
-                news.em27_has_power = em27_has_power
-                news.em27_voltage = em27_voltage
-                news.em27_current = em27_current
-                news.em27_power = em27_power
+                if self.enclosure_config.use_em27_power_plug:
+                    news.em27_has_power = self.tasmota_plug.get_power_state()
+                    throughput_state = self.tasmota_plug.get_throughput_state()
+                    news.em27_voltage = throughput_state["em27_voltage"]
+                    news.em27_current = throughput_state["em27_current"]
+                    news.em27_power = throughput_state["em27_power"]
 
                 news.dt = datetime.datetime.now(tz=datetime.timezone.utc)
                 if news.auto_mode is None:
@@ -208,9 +191,7 @@ def set_enhanced_security_mode(self, mode: bool) -> None:
         self.logger.info(f"Setting enhanced security mode to {mode}")
         self._set_value("dl:Public.ENHANCED_SECURITY", 1 if mode else 0)
         dt = tum_esm_utils.timing.wait_for_condition(
-            is_successful=lambda: (
-                self.read(skip_power_plug_state=True).enhanced_security_mode == mode
-            ),
+            is_successful=lambda: self.read().enhanced_security_mode == mode,
             timeout_seconds=40,
             timeout_message="Enhanced security mode did not update within 30 seconds.",
             check_interval_seconds=5,
@@ -224,9 +205,7 @@ def set_enclosure_mode(self, mode: Literal["auto", "manual"]) -> None:
         else:
             self._set_value("dl:Public.AUTO_", 0)
         dt = tum_esm_utils.timing.wait_for_condition(
-            is_successful=lambda: (
-                self.read(skip_power_plug_state=True).auto_mode == (1 if mode == "auto" else 0)
-            ),
+            is_successful=lambda: self.read().auto_mode == (1 if mode == "auto" else 0),
             timeout_seconds=40,
             timeout_message="Enclosure mode did not update within 30 seconds.",
             check_interval_seconds=5,
@@ -238,9 +217,7 @@ def set_averia_fault_code(self, new_value: int) -> None:
         self.logger.info(f"Setting averia fault code to {new_value}")
         self._set_value("dl:Public.AVERIA", new_value)
         dt = tum_esm_utils.timing.wait_for_condition(
-            is_successful=lambda: (
-                self.read(skip_power_plug_state=True).averia_fault_code == new_value
-            ),
+            is_successful=lambda: self.read().averia_fault_code == new_value,
             timeout_seconds=40,
             timeout_message="Averia fault code did not update within 30 seconds.",
             check_interval_seconds=5,
@@ -253,7 +230,7 @@ def set_alert_level(self, new_value: int) -> None:
         self.logger.info(f"Setting alert level to {new_value}")
         self._set_value("dl:Public.ALERTA", new_value)
         dt = tum_esm_utils.timing.wait_for_condition(
-            is_successful=lambda: self.read(skip_power_plug_state=True).alert_level == new_value,
+            is_successful=lambda: self.read().alert_level == new_value,
             timeout_seconds=40,
             timeout_message="Alert level did not update within 30 seconds.",
             check_interval_seconds=5,
@@ -269,9 +246,7 @@ def open_cover(self) -> None:
             self._set_value("dl:Public.MOTOR_ON", 1)
             self._set_value("dl:Public.Estado_actual", "AF")  # open releasing fechillo
             dt = tum_esm_utils.timing.wait_for_condition(
-                is_successful=lambda: (
-                    self.read(skip_power_plug_state=True).pretty_cover_status == "open"
-                ),
+                is_successful=lambda: self.read().pretty_cover_status == "open",
                 timeout_seconds=90,
                 timeout_message="Cover did not open within 90 seconds.",
                 check_interval_seconds=5,
@@ -287,9 +262,7 @@ def close_cover(self) -> None:
             self._set_value("dl:Public.MOTOR_ON", 1)
             self._set_value("dl:Public.Estado_actual", "C.")  # closing
             dt = tum_esm_utils.timing.wait_for_condition(
-                is_successful=lambda: (
-                    self.read(skip_power_plug_state=True).pretty_cover_status == "closed"
-                ),
+                is_successful=lambda: self.read().pretty_cover_status == "closed",
                 timeout_seconds=90,
                 timeout_message="Cover did not close within 90 seconds.",
                 check_interval_seconds=5,

packages/ui/src/components/configuration/sections/config-section-aemet-enclosure.tsx

@@ -150,7 +150,7 @@ export default function ConfigSectionAEMETEnclosure() {
             />
             <configurationComponents.ConfigElementLine />
             <configurationComponents.ConfigElementBooleanToggle
-                title="Toggle EM27 Power"
+                title="Use EM27 Power Plug"
                 value={localSectionConfig.use_em27_power_plug}
                 setValue={(v: boolean) =>
                     setLocalConfigItem('aemet_enclosure.use_em27_power_plug', v)

packages/ui/src/components/overview/system-state.tsx

@@ -5,6 +5,7 @@ import {
     renderString,
     renderNumber,
     renderColorfulBoolean,
+    renderColorfulInteger,
     renderInteger,
 } from '../../utils/functions';
 import { IconCloudRain } from '@tabler/icons-react';
@@ -50,12 +51,12 @@ function StateBarPanel(props: { title: string; value: number | null }) {
 }
 
 const COVERR_STATUS_MAP: Record<string, string> = {
-    AF: 'Opening (Unlocking)',
-    'A.': 'Opening (Hood)',
-    A: 'Open',
-    'C.': 'Closing (Hood)',
-    CF: 'Closing (Locking)',
-    C: 'Closed',
+    AF: 'opening lock',
+    'A.': 'opening hood',
+    A: 'open',
+    'C.': 'closing hood',
+    CF: 'closing lock',
+    C: 'closed',
 };
 
 export function SystemState() {
@@ -196,11 +197,13 @@ export function SystemState() {
                         <StatePanel title="Alert Level | Averia Fault Code">
                             <div className="flex flex-row items-center w-full justitfy-center gap-x-2">
                                 <div className="flex-grow text-center">
-                                    {renderInteger(coreState.aemet_enclosure_state.alert_level)}
+                                    {renderColorfulInteger(
+                                        coreState.aemet_enclosure_state.alert_level
+                                    )}
                                 </div>
                                 <div className="bg-slate-300 h-3.5 w-px" />
                                 <div className="flex-grow text-center">
-                                    {renderInteger(
+                                    {renderColorfulInteger(
                                         coreState.aemet_enclosure_state.averia_fault_code
                                     )}
                                 </div>

packages/ui/src/tabs/control-tab.tsx

@@ -19,6 +19,15 @@ function renderStringValue(value: string | number | null, postfix: string) {
     return `${value} ${postfix}`;
 }
 
+const COVERR_STATUS_MAP: Record<string, string> = {
+    AF: 'opening lock',
+    'A.': 'opening hood',
+    A: 'open',
+    'C.': 'closing hood',
+    CF: 'closing lock',
+    C: 'closed',
+};
+
 function VariableBlock(props: {
     label: string;
     disabled: boolean;
@@ -44,8 +53,8 @@ function VariableBlock(props: {
                 {props.rows.map((r, i) => (
                     <div className="w-full h-8 flex-row-left" key={i}>
                         <div className="flex-row-center whitespace-nowrap">
-                            <div className="w-40">{r.variable.key}:</div>{' '}
-                            <span className="w-12 font-semibold text-right">
+                            <div className="w-72">{r.variable.key}:</div>{' '}
+                            <span className="w-20 font-semibold text-right">
                                 {r.variable.value}
                             </span>
                         </div>
@@ -57,7 +66,7 @@ function VariableBlock(props: {
                                         variant="white"
                                         onClick={r.action.callback}
                                         key={r.action.label}
-                                        className="w-52"
+                                        className="w-60"
                                         disabled={props.disabled}
                                     >
                                         {r.action.label}
@@ -68,7 +77,7 @@ function VariableBlock(props: {
                                         initialValue={r.action.initialValue}
                                         onClick={r.action.callback}
                                         key={r.action.label}
-                                        className="w-52"
+                                        className="w-60"
                                         postfix={r.action.postfix}
                                         disabled={props.disabled}
                                     >
@@ -704,7 +713,7 @@ export function AEMETEnclosureControlTab() {
                                 ),
                             },
                             action: {
-                                label: 'set enhanced security mode',
+                                label: 'set enhanced security',
                                 callback: setEnhancedSecurityMode,
                                 variant: 'numeric',
                                 initialValue:
@@ -990,7 +999,13 @@ export function AEMETEnclosureControlTab() {
                             variable: {
                                 key: 'Cover Status',
                                 value: renderStringValue(
-                                    coreState.aemet_enclosure_state.cover_status,
+                                    (() => {
+                                        const value = coreState.aemet_enclosure_state.cover_status;
+                                        if (value == null) return '-';
+                                        if (COVERR_STATUS_MAP[value])
+                                            return COVERR_STATUS_MAP[value];
+                                        return `unknown (${value})`;
+                                    })(),
                                     ''
                                 ),
                             },

packages/ui/src/utils/functions.tsx

@@ -22,9 +22,21 @@ export function renderColorfulBoolean(value: undefined | null | boolean) {
         return '-';
     } else {
         return value ? (
-            <span className="text-red-700">Yes</span>
+            <span className="font-semibold text-red-700">yes</span>
         ) : (
-            <span className="text-green-700">No</span>
+            <span className="font-semibold text-green-700">no</span>
+        );
+    }
+}
+
+export function renderColorfulInteger(value: undefined | null | string | number) {
+    if (value === undefined || value === null) {
+        return '-';
+    } else {
+        return Number(value) == 0 ? (
+            <span className="font-semibold text-green-700">0</span>
+        ) : (
+            <span className="font-semibold text-red-700">{Number(value).toFixed(0)}</span>
         );
     }
 }