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

helgeerbe · Mar 3, 2023 · 9f2d79f · 9f2d79f
2 parents 6709338 + b42fff8
commit 9f2d79f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/lib/Hoymiles/src/parser/DevInfoParser.cpp b/lib/Hoymiles/src/parser/DevInfoParser.cpp
@@ -17,6 +17,7 @@ typedef struct {
 const devInfo_t devInfo[] = {
     { { 0x10, 0x10, 0x10, ALL }, 300, "HM-300" },
     { { 0x10, 0x10, 0x20, ALL }, 350, "HM-350" },
+    { { 0x10, 0x10, 0x30, ALL }, 400, "HM-400" },
     { { 0x10, 0x10, 0x40, ALL }, 400, "HM-400" },
     { { 0x10, 0x11, 0x10, ALL }, 600, "HM-600" },
     { { 0x10, 0x11, 0x20, ALL }, 700, "HM-700" },

diff --git a/webapp/src/views/HomeView.vue b/webapp/src/views/HomeView.vue
@@ -95,9 +95,14 @@
                             <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()">
                                     <div v-for="channel in Object.keys(chanType.obj).sort().reverse().map(x=>+x)" :key="channel" class="col">
-                                        <InverterChannelInfo :channelData="chanType.obj[channel]"
-                                            :channelType="chanType.name"
-                                            :channelNumber="channel" />
+                                        <template v-if="(chanType.name != 'DC') ||
+                                            (chanType.name == 'DC' && getSumIrridiation(inverter) == 0) ||
+                                            (chanType.name == 'DC' && getSumIrridiation(inverter) > 0 && chanType.obj[channel].Irradiation?.v || 0 > 0)
+                                            ">
+                                            <InverterChannelInfo :channelData="chanType.obj[channel]"
+                                                :channelType="chanType.name"
+                                                :channelNumber="channel" />
+                                        </template>
                                     </div>
                                 </template>
                             </div>
@@ -669,6 +674,13 @@ export default defineComponent({
         calculateAbsoluteTime(lastTime: number): string {
             const date = new Date(Date.now() - lastTime * 1000);
             return this.$d(date, 'datetime');
+        },
+        getSumIrridiation(inv: Inverter): number {
+            let total = 0;
+            Object.keys(inv.DC).forEach((key) => {
+                total += inv.DC[key as unknown as number].Irradiation?.v || 0;
+            });
+            return total;
         }
     },
 });

diff --git a/webapp_dist/index.html.gz b/webapp_dist/index.html.gz
diff --git a/webapp_dist/js/app.js.gz b/webapp_dist/js/app.js.gz
diff --git a/webapp_dist/zones.json.gz b/webapp_dist/zones.json.gz