From 901a1ed4c3b7662aa5f36a601a416da31aef5119 Mon Sep 17 00:00:00 2001
From: bogd <bogd@live.ru>
Date: Wed, 25 Oct 2023 13:03:41 +0200
Subject: [PATCH] removed serial port mode setting from the SerialCard, added
 hw option and device ID to the SystemCard

---
 cards/SerialCard.vue | 72 ++++++++++++++++++++------------------------
 cards/SystemCard.vue |  6 ++--
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/cards/SerialCard.vue b/cards/SerialCard.vue
index a78c9e5..79663e2 100644
--- a/cards/SerialCard.vue
+++ b/cards/SerialCard.vue
@@ -1,43 +1,35 @@
 <template>
-    <q-card flat class="card" v-show="data.serial_visible">
-      <q-card-section>
-        <div class="text-h6">Serial port</div>
-      </q-card-section>
-      <q-card-section class="q-pt-none">
-        <div class="q-pa-md">
-          <div class="q-gutter-md q-pa-none q-pb-none">
-            <q-toggle v-model="data.serial_enab" label="Serial port enable" />
-            <q-select v-model="serialmodestr" :options="serialmodes" :map-options="true" :emit-value="true" label="Serial port mode"></q-select>          
-            <q-toggle v-model="data.serial_bridge" label="Enable bridge to MQTT" />
-            <q-input v-model="data.serial_baud" label="Baud rate" />
-            <q-input type="number" v-model="data.serial_break" label="Input data separate brake, ms" />
-          </div>
+  <q-card flat class="card" v-show="data.serial_visible">
+    <q-card-section>
+      <div class="text-h6">Serial port</div>
+    </q-card-section>
+    <q-card-section class="q-pt-none">
+      <div class="q-pa-md">
+        <div class="q-gutter-md q-pa-none q-pb-none">
+          <div>Port mode: {{ data.serial_mode }}</div>
+          <q-toggle v-model="data.serial_enab" label="Serial port enable" />
+          <q-toggle v-model="data.serial_bridge" label="Enable bridge to MQTT" />
+          <q-input v-model="data.serial_baud" label="Baud rate" />
+          <q-input type="number" v-model="data.serial_break" label="Input data separate brake, ms" />
         </div>
-      </q-card-section>
-      <CardActions :senddata="data"></CardActions>
-    </q-card>
-  </template>
+      </div>
+    </q-card-section>
+    <CardActions :senddata="data"></CardActions>
+  </q-card>
+</template>
   
-  <script setup>
-  import { reactive, computed } from "vue";
-  import { PostData } from "components/webguicomp/network";
-  import CardActions from "components/webguicomp/CardActions.vue"
-  const init = {
-    serial_visible: false,
-    serial_enab: false,
-    serial_baud: 115200,
-    serial_mode: 1, 
-    serial_bridge: false,
-    serial_break: 50
-  }
-  const serialmodes = [
-    { label: 'UART', value: '1' },
-    { label: 'RS485', value: '2' }];
-  const serialmodestr = computed({
-    get() { return (data.serial_mode).toString() },
-    set(val) { data.serial_mode = Number(val); }
-  })
-  
-  const data = reactive(init);
-  PostData(data, 2, 0, null);
-  </script>
+<script setup>
+import { reactive, computed } from "vue";
+import { PostData } from "components/webguicomp/network";
+import CardActions from "components/webguicomp/CardActions.vue"
+const init = {
+  serial_visible: false,
+  serial_enab: false,
+  serial_baud: 115200,
+  serial_mode: "-",
+  serial_bridge: false,
+  serial_break: 50
+}
+const data = reactive(init);
+PostData(data, 2, 0, null);
+</script>
diff --git a/cards/SystemCard.vue b/cards/SystemCard.vue
index 5bec0ab..067ab61 100644
--- a/cards/SystemCard.vue
+++ b/cards/SystemCard.vue
@@ -13,10 +13,12 @@
             label="Color scheme"></q-select>
           <div>Device model: {{ data.model_name }}</div>
           <div>Hardware revision: {{ data.hw_rev }}</div>
+          <div>Hardware option: {{ data.hw_opt }}</div>
           <div>Firmware version: {{ data.fw_rev }}</div>
           <div>IDF version: {{ data.idf_rev }}</div>
           <div>Build date: {{ data.build_date }}</div>
-          <div>Serial number: {{ data.ser_num }}</div>
+          <div>Device ID: {{ data.dev_id }}</div>
+          <div>S/N: {{ data.ser_num }}</div>
         </div>
       </div>
     </q-card-section>
@@ -52,7 +54,7 @@ defineOptions({
 })
 const init = {
   net_bios_name: "", sys_name: "", sys_pass: "", color_scheme: 1,
-  model_name: "", hw_rev: 0, fw_rev: "", idf_rev: "", build_date: "", ser_num: ""
+  model_name: "", hw_rev: 0, hw_opt: "", fw_rev: "", idf_rev: "", build_date: "", dev_id: "", ser_num: ""
 }
 const colorschemes = [
   { label: 'Light', value: '1' },