userbogd/webguicomp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed serial port mode setting from the SerialCard, added hw option

Browse Source 
and device ID to the SystemCard
This commit is contained in:
Bogdan Pilyugin 2023-10-25 13:03:41 +02:00
parent 0073f9edc9
commit 901a1ed4c3
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
cards/SerialCard.vue
View File

@ -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>

6
cards/SystemCard.vue
View File

@ -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' },