patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tbnobody/OpenDTU/master' into development

Browse Source
This commit is contained in:
helgeerbe 2023-03-09 10:52:46 +01:00
commit a79f7b2026
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -199,6 +199,7 @@ Firmware version seems to play not a significant role and cannot be read from th
* Prometheus API endpoint (/api/prometheus/metrics) * Prometheus API endpoint (/api/prometheus/metrics)
* English, german and french web interface * English, german and french web interface
* Displays (SSD1306, SH1106, PCD8544) * Displays (SSD1306, SH1106, PCD8544)
* Dark Theme
## Features for developers ## Features for developers
* The microcontroller part * The microcontroller part

12
webapp/src/views/HomeView.vue
View File

@ -94,16 +94,18 @@
<div class="card-body"> <div class="card-body">
<div class="row flex-row-reverse flex-wrap-reverse g-3"> <div class="row flex-row-reverse flex-wrap-reverse g-3">
<template v-for="chanType in [{obj: inverter.INV, name: 'INV'}, {obj: inverter.AC, name: 'AC'}, {obj: inverter.DC, name: 'DC'}].reverse()"> <template v-for="chanType in [{obj: inverter.INV, name: 'INV'}, {obj: inverter.AC, name: 'AC'}, {obj: inverter.DC, name: 'DC'}].reverse()">
<div v-for="channel in Object.keys(chanType.obj).sort().reverse().map(x=>+x)" :key="channel" class="col"> <template v-for="channel in Object.keys(chanType.obj).sort().reverse().map(x=>+x)" :key="channel">
<template v-if="(chanType.name != 'DC') || <template v-if="(chanType.name != 'DC') ||
(chanType.name == 'DC' && getSumIrridiation(inverter) == 0) || (chanType.name == 'DC' && getSumIrridiation(inverter) == 0) ||
(chanType.name == 'DC' && getSumIrridiation(inverter) > 0 && chanType.obj[channel].Irradiation?.v || 0 > 0) (chanType.name == 'DC' && getSumIrridiation(inverter) > 0 && chanType.obj[channel].Irradiation?.v || 0 > 0)
"> ">
<InverterChannelInfo :channelData="chanType.obj[channel]" <div class="col">
:channelType="chanType.name" <InverterChannelInfo :channelData="chanType.obj[channel]"
:channelNumber="channel" /> :channelType="chanType.name"
:channelNumber="channel" />
</div>
</template> </template>
</div> </template>
</template> </template>
</div> </div>
</div> </div>