webapp: Added cmt radio status to system overview

tbnobody · Apr 15, 2023 · c19d200 · c19d200
1 parent 46036eb
commit c19d200
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 18 deletions.
diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp
@@ -69,8 +69,12 @@ void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request)
 
     root["uptime"] = esp_timer_get_time() / 1000000;
 
-    root["radio_connected"] = Hoymiles.getRadioNrf()->isConnected();
-    root["radio_pvariant"] = Hoymiles.getRadioNrf()->isPVariant();
+    root["nrf_configured"] = Hoymiles.getRadioNrf()->isInitialized();
+    root["nrf_connected"] = Hoymiles.getRadioNrf()->isConnected();
+    root["nrf_pvariant"] = Hoymiles.getRadioNrf()->isPVariant();
+
+    root["cmt_configured"] = Hoymiles.getRadioCmt()->isInitialized();
+    root["cmt_connected"] = Hoymiles.getRadioCmt()->isConnected();
 
     response->setLength();
     request->send(response);

diff --git a/webapp/src/components/RadioInfo.vue b/webapp/src/components/RadioInfo.vue
@@ -4,27 +4,61 @@
             <table class="table table-hover table-condensed">
                 <tbody>
                     <tr>
-                        <th>{{ $t('radioinfo.ChipStatus') }}</th>
+                        <th>{{ $t('radioinfo.Status', { module: "nRF24" }) }}</th>
                         <td>
-                            <StatusBadge :status="systemStatus.radio_connected" true_text="radioinfo.Connected" false_text="radioinfo.NotConnected" />
+                            <StatusBadge :status="systemStatus.nrf_configured" true_text="radioinfo.Configured" false_text="radioinfo.NotConfigured" false_class="text-bg-secondary" />
                         </td>
                     </tr>
                     <tr>
-                        <th>{{ $t('radioinfo.ChipType') }}</th>
+                        <th>{{ $t('radioinfo.ChipStatus', { module: "nRF24" }) }}</th>
                         <td>
                             <span class="badge" :class="{
-                                'text-bg-danger': systemStatus.radio_connected && !systemStatus.radio_pvariant,
-                                'text-bg-success': systemStatus.radio_connected && systemStatus.radio_pvariant,
-                                'text-bg-secondary': !systemStatus.radio_connected,
+                                'text-bg-danger': systemStatus.nrf_configured && !systemStatus.nrf_connected,
+                                'text-bg-success': systemStatus.nrf_configured && systemStatus.nrf_connected,
                             }">
                                 <template
-                                    v-if="systemStatus.radio_connected && systemStatus.radio_pvariant">nRF24L01+</template>
+                                    v-if="systemStatus.nrf_configured && systemStatus.nrf_connected">{{ $t('radioinfo.Connected') }}</template>
                                 <template
-                                    v-else-if="systemStatus.radio_connected && !systemStatus.radio_pvariant">nRF24L01</template>
+                                    v-else-if="systemStatus.nrf_configured && !systemStatus.nrf_connected">{{ $t('radioinfo.NotConnected') }}</template>
+                            </span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>{{ $t('radioinfo.ChipType', { module: "nRF24" }) }}</th>
+                        <td>
+                            <span class="badge" :class="{
+                                'text-bg-danger': systemStatus.nrf_connected && !systemStatus.nrf_pvariant,
+                                'text-bg-success': systemStatus.nrf_connected && systemStatus.nrf_pvariant,
+                                'text-bg-secondary': !systemStatus.nrf_connected,
+                            }">
+                                <template
+                                    v-if="systemStatus.nrf_connected && systemStatus.nrf_pvariant">nRF24L01+</template>
+                                <template
+                                    v-else-if="systemStatus.nrf_connected && !systemStatus.nrf_pvariant">nRF24L01</template>
                                 <template v-else>{{ $t('radioinfo.Unknown') }}</template>
                             </span>
                         </td>
                     </tr>
+                    <tr>
+                        <th>{{ $t('radioinfo.Status', { module: "CMT2300a" }) }}</th>
+                        <td>
+                            <StatusBadge :status="systemStatus.cmt_configured" true_text="radioinfo.Configured" false_text="radioinfo.NotConfigured" false_class="text-bg-secondary" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>{{ $t('radioinfo.ChipStatus', { module: "CMT2300a" }) }}</th>
+                        <td>
+                            <span class="badge" :class="{
+                                'text-bg-danger': systemStatus.cmt_configured && !systemStatus.cmt_connected,
+                                'text-bg-success': systemStatus.cmt_configured && systemStatus.cmt_connected,
+                            }">
+                                <template
+                                    v-if="systemStatus.cmt_configured && systemStatus.cmt_connected">{{ $t('radioinfo.Connected') }}</template>
+                                <template
+                                    v-else-if="systemStatus.cmt_configured && !systemStatus.cmt_connected">{{ $t('radioinfo.NotConnected') }}</template>
+                            </span>
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -187,10 +187,13 @@
     },
     "radioinfo": {
         "RadioInformation": "Funkmodulinformationen",
-        "ChipStatus": "Chip-Status",
-        "ChipType": "Chip-Typ",
+        "Status": "{module} Status",
+        "ChipStatus": "{module} Chip-Status",
+        "ChipType": "{module} Chip-Type",
         "Connected": "verbunden",
         "NotConnected": "nicht verbunden",
+        "Configured": "konfiguriert",
+        "NotConfigured": "nicht konfiguriert",
         "Unknown": "unbekannt"
     },
     "networkinfo": {

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -187,10 +187,13 @@
     },
     "radioinfo": {
         "RadioInformation": "Radio Information",
-        "ChipStatus": "Chip Status",
-        "ChipType": "Chip Type",
+        "Status": "{module} Status",
+        "ChipStatus": "{module} Chip Status",
+        "ChipType": "{module} Chip Type",
         "Connected": "connected",
         "NotConnected": "not connected",
+        "Configured": "configured",
+        "NotConfigured": "not configured",
         "Unknown": "Unknown"
     },
     "networkinfo": {

diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
@@ -187,10 +187,13 @@
     },
     "radioinfo": {
         "RadioInformation": "Informations sur la radio",
-        "ChipStatus": "État de la puce",
-        "ChipType": "Type de puce",
+        "Status": "{module} Status",
+        "ChipStatus": "{module} sÉtat de la puce",
+        "ChipType": "{module} Type de puce",
         "Connected": "connectée",
         "NotConnected": "non connectée",
+        "Configured": "configured",
+        "NotConfigured": "not configured",
         "Unknown": "Inconnue"
     },
     "networkinfo": {

diff --git a/webapp/src/types/SystemStatus.ts b/webapp/src/types/SystemStatus.ts
@@ -25,6 +25,9 @@ export interface SystemStatus {
     sketch_total: number;
     sketch_used: number;
     // RadioInfo
-    radio_connected: boolean;
-    radio_pvariant: boolean;
+    nrf_configured: boolean;
+    nrf_connected: boolean;
+    nrf_pvariant: boolean;
+    cmt_configured: boolean;
+    cmt_connected: boolean;
 }