Skip to content

Commit 0e79c85

Browse files
BTNBxBTNBx
authored
Bump version to 1.3.7 and enhance features
v1.3.7 Solis polarity - corrected for Modbus integrations. The preset now uses negative convention (same as Deye/Sunsynk), which means charging will show the correct direction without any manual override. If it still behaves oddly with your specific integration, try toggling the Battery: negative = option in the editor and let me know. Inverter LCD value - it was incorrectly showing the sum of all power flows, which made no sense. It now shows home consumption, matching the HOME node value. New Victron dual MPPT - the Victron preset now includes solar2 and pv_voltage2 fields. When both MPPT sensors are configured, the Solar node displays a per-string breakdown: PV1: 180W PV2: 151W, with the daily total on the line below. Visual Font sizes increased — the smaller sub-labels (voltage, frequency, daily kWh) bumped from 9.5px/12px to 11px/13px.
1 parent a2129ce commit 0e79c85

1 file changed

Lines changed: 28 additions & 11 deletions

File tree

‎xpower-flow-card.js‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// xPower Flow Card — Modern power flow card for solar hybrid inverters
22
// Copyright (C) 2025 BTNBx — MIT License
3-
const V='1.3.6';
3+
const V='1.3.7';
44

55
/* ═══════════════════════════════════════
66
CHANGELOG
@@ -18,6 +18,19 @@ v1.3.6
1818
- --xpf-dash-size dash segment size (default: 100; low value e.g. 8 = dot effect)
1919
──────────────────────────────────────────────────────── */
2020

21+
/* ════════════════════════════════════════════════════════
22+
v1.3.7
23+
Fixes:
24+
- Solis polarity: bat_polarity changed to 'negative' (modbus reports charging as positive,
25+
same convention as Deye/Sunsynk — no inversion needed)
26+
- LCD inverter display: now shows load power (home consumption) instead of sum of all flows
27+
Features:
28+
- Victron dual MPPT: added pv1_power + pv2_power entity fields in preset;
29+
Solar node shows per-MPPT power breakdown when both sensors configured
30+
Visual:
31+
- Sub-labels font sizes increased: .vc 9.5px→11px, .vd 12px→13px, .vc battery 9.5px→11px
32+
════════════════════════════════════════════════════════ */
33+
2134
/* ────────────────────────────────────────────────────────
2235
v1.3.5
2336
Visual:
@@ -197,9 +210,9 @@ const PRESETS={
197210
victron:{
198211
label:'Victron (Venus OS)',inverter_name:'VICTRON',
199212
bat_polarity:'positive',grid_polarity:'positive',
200-
e:{solar:'sensor.pv_power',battery:'sensor.battery_power',soc:'sensor.battery_soc',
213+
e:{solar:'sensor.pv_power',solar2:'',battery:'sensor.battery_power',soc:'sensor.battery_soc',
201214
grid:'sensor.grid_power',load:'sensor.ac_consumption',grid_voltage:'sensor.grid_voltage',
202-
battery_voltage:'sensor.battery_voltage',pv_voltage:'sensor.pv_voltage',
215+
battery_voltage:'sensor.battery_voltage',pv_voltage:'sensor.pv_voltage',pv_voltage2:'',
203216
temperature:'sensor.inverter_temperature',frequency:'sensor.grid_frequency',
204217
grid_status:'',daily_solar:'sensor.daily_solar_yield',daily_import:'sensor.daily_grid_import',
205218
daily_export:'sensor.daily_grid_export',daily_load:'sensor.daily_consumption',
@@ -220,7 +233,7 @@ const PRESETS={
220233
},
221234
solis:{
222235
label:'Solis (SolisCloud)',inverter_name:'SOLIS',
223-
bat_polarity:'positive',grid_polarity:'positive',
236+
bat_polarity:'negative',grid_polarity:'positive',
224237
e:{solar:'sensor.solis_pv_power',battery:'sensor.solis_battery_power',soc:'sensor.solis_battery_soc',
225238
grid:'sensor.solis_grid_power',load:'sensor.solis_house_load',grid_voltage:'sensor.solis_grid_voltage',
226239
battery_voltage:'sensor.solis_battery_voltage',pv_voltage:'sensor.solis_pv_voltage',
@@ -511,8 +524,8 @@ svg{width:100%;height:auto;display:block}
511524
.vm{fill:var(--t1);font-size:var(--xpf-vm-size);font-weight:600;text-anchor:middle;dominant-baseline:middle}
512525
.vl{fill:var(--t3);font-size:10px;font-weight:600;letter-spacing:0.14em;text-anchor:middle;dominant-baseline:middle}
513526
.vs{fill:var(--t1);font-size:22px;font-weight:700;text-anchor:middle;dominant-baseline:middle}
514-
.vd{fill:var(--t3);font-size:12px;font-weight:500;text-anchor:middle;dominant-baseline:middle}
515-
.vc{fill:var(--t3);font-size:9.5px;font-weight:600;text-anchor:middle;dominant-baseline:middle}
527+
.vd{fill:var(--t3);font-size:13px;font-weight:500;text-anchor:middle;dominant-baseline:middle}
528+
.vc{fill:var(--t3);font-size:11px;font-weight:600;text-anchor:middle;dominant-baseline:middle}
516529
.ib{fill:rgba(255,255,255,0.02);stroke:rgba(255,255,255,0.06);stroke-width:1}
517530
.il{fill:rgba(255,255,255,0.35);font-size:12px;font-weight:600;letter-spacing:0.05em;text-anchor:middle;dominant-baseline:middle}
518531
.au{fill:white;font-size:9px;font-weight:600;letter-spacing:0.04em;text-anchor:middle;dominant-baseline:middle}
@@ -636,13 +649,18 @@ this._$('bl').setAttribute('width',(26*(socVal/100)).toFixed(1));
636649
const blEl=this._$('bl');if(blEl){if(bat!==null&&bat<-10){blEl.setAttribute('fill','#4CD964');blEl.setAttribute('class','bat-charge');}else{blEl.setAttribute('fill','var(--battery)');blEl.removeAttribute('class');}}
637650

638651
if(temp!==null)this._$('tp').textContent=temp.toFixed(0)+'\u00B0C';else this._$('tp').textContent='';
639-
if(pvv!==null&&pvv2!==null)this._$('pv').textContent=pvv.toFixed(0)+'V / '+pvv2.toFixed(0)+'V';else if(pvv!==null)this._$('pv').textContent=pvv.toFixed(0)+'V';else if(pvv2!==null)this._$('pv').textContent=pvv2.toFixed(0)+'V';else this._$('pv').textContent='';
652+
if(pvv!==null&&pvv2!==null)this._$('pv').textContent=pvv.toFixed(0)+'V / '+pvv2.toFixed(0)+'V';else if(pvv!==null)this._$('pv').textContent=pvv.toFixed(0)+'V';else if(pvv2!==null)this._$('pv').textContent=pvv2.toFixed(0)+'V';else if(c.solar2&&sol1!==null&&sol2!==null)this._$('pv').textContent=L.daily+' '+this._fmtE(dS);else this._$('pv').textContent='';
640653
if(gv!==null&&freq!==null)this._$('gv').textContent=gv.toFixed(0)+'V \u00B7 '+freq.toFixed(1)+'Hz';else if(gv!==null)this._$('gv').textContent=gv.toFixed(0)+'V';else if(freq!==null)this._$('gv').textContent=freq.toFixed(1)+'Hz';else this._$('gv').textContent='';
641654
if(bv!==null)this._$('bv').textContent=bv.toFixed(1)+'V';else this._$('bv').textContent='';
642655
const bt=this._gv(c.battery_temperature);if(bt!==null)this._$('bt').textContent=bt.toFixed(0)+'\u00B0C';else this._$('bt').textContent='';
643656

644657
const dS=this._gv(c.daily_solar)??0,dI=this._gv(c.daily_import)??0,dE=this._gv(c.daily_export)??0,dL=this._gv(c.daily_load)??0,dC=this._gv(c.daily_charge)??0,dD=this._gv(c.daily_discharge)??0;
645-
this._$('ds').textContent=L.daily+' '+this._fmtE(dS);
658+
// Solar node: if dual MPPT, show per-MPPT power above daily kWh
659+
if(c.solar2&&sol1!==null&&sol2!==null){
660+
this._$('ds').textContent='PV1:'+this._fmt(sol1)+' PV2:'+this._fmt(sol2);
661+
}else{
662+
this._$('ds').textContent=L.daily+' '+this._fmtE(dS);
663+
}
646664
this._$('dg').textContent=L.import_+' '+this._fmtE(dI)+(this._fmtC(c.import_cost)?' · '+this._fmtC(c.import_cost):'')+' '+L.export_+' '+this._fmtE(dE)+(this._fmtC(c.export_cost)?' · '+this._fmtC(c.export_cost):'');
647665
this._$('dl').textContent=L.daily+' '+this._fmtE(dL);
648666
this._$('db').textContent=L.charge+' '+this._fmtE(dC)+' '+L.discharge+' '+this._fmtE(dD);
@@ -718,9 +736,8 @@ else if(bC>=sC&&bC>=gC&&bC>10)borderColor='rgba(255,179,0,0.55)';
718736
else if(gC>10)borderColor='rgba(239,83,80,0.45)';
719737
card.style.borderColor=borderColor;}
720738

721-
// #2 LCD — total power throughput on inverter display
722-
const lcd=this._$('lcd');if(lcd){const total=solF+Math.abs(batF)+Math.abs(gridF);
723-
const a=Math.abs(total);lcd.textContent=a>=1000?(a/1000).toFixed(1)+'kW':a.toFixed(0)+'W';}
739+
// #2 LCD — home consumption on inverter display
740+
const lcd=this._$('lcd');if(lcd){const a=Math.abs(loadF??0);lcd.textContent=a>=1000?(a/1000).toFixed(1)+'kW':a.toFixed(0)+'W';}
724741

725742
// #3 Pill glow — autarky >90%
726743

0 commit comments

Comments
 (0)