Skip to content

Commit

Permalink
fixed: AC input tile shows AC In Ignored when it is not
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwindrem
kwindrem committed Oct 23, 2022
1 parent 2415d0e commit f863aee
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 18 deletions.
22 changes: 18 additions & 4 deletions FileSets/v2.66/OverviewFlowComplex.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ OverviewPage {
property bool compact: showTanks && showTemps && tankTempCount > 4
property int tanksHeight: compact ? 22 : 45

VBusItem { id: ignoreAcInput; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput1; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput2; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn2") }
VBusItem { id: acActiveInput; bind: Utils.path(inverterService, "/Ac/ActiveIn/ActiveInput") }

property string guiModsPrefix: "com.victronenergy.settings/Settings/GuiMods"
VBusItem { id: showGaugesItem; bind: Utils.path(guiModsPrefix, "/ShowGauges") }
Expand Down Expand Up @@ -141,10 +143,22 @@ OverviewPage {
height: inOutTileHeight
title:
{
if (ignoreAcInput.valid && ignoreAcInput.value == 1)
return qsTr ("AC In Ignored")
// input 1 is active
if (! acActiveInput.valid || acActiveInput.value == 0)
{
if (ignoreAcInput1.valid && ignoreAcInput1.value == 1)
return qsTr ("AC In 1 Ignored")
else
return getAcSourceName(sys.acSource)
}
// input 2 is active
else
return getAcSourceName(sys.acSource)
{
if (ignoreAcInput2.valid && ignoreAcInput2.value == 1)
return qsTr ("AC In 2 Ignored")
else
return getAcSourceName(sys.acSource)
}
}
titleColor: "#E74c3c"
color: "#C0392B"
Expand Down
22 changes: 18 additions & 4 deletions FileSets/v2.66/OverviewHubEnhanced.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ OverviewPage {
VBusItem { id: pvInverterName3; bind: Utils.path(pvInverterPrefix3, "/CustomName") }

//////// add to display AC input ignored
VBusItem { id: ignoreAcInput; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput1; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput2; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn2") }
VBusItem { id: acActiveInput; bind: Utils.path(inverterService, "/Ac/ActiveIn/ActiveInput") }

VBusItem { id: _hasAcOutSystem; bind: "com.victronenergy.settings/Settings/SystemSetup/HasAcOutSystem" }
VBusItem { id: hasDcSys; bind: "com.victronenergy.settings/Settings/SystemSetup/HasDcSystem" }
Expand All @@ -165,10 +167,22 @@ OverviewPage {
height: showStatusBar ? 100 : 120
title:
{
if (ignoreAcInput.valid && ignoreAcInput.value == 1)
return qsTr ("AC In Ignored")
// input 1 is active
if (! acActiveInput.valid || acActiveInput.value == 0)
{
if (ignoreAcInput1.valid && ignoreAcInput1.value == 1)
return qsTr ("AC In 1 Ignored")
else
return getAcSourceName(sys.acSource)
}
// input 2 is active
else
return getAcSourceName(sys.acSource)
{
if (ignoreAcInput2.valid && ignoreAcInput2.value == 1)
return qsTr ("AC In 2 Ignored")
else
return getAcSourceName(sys.acSource)
}
}
titleColor: "#E74c3c"
color: "#C0392B"
Expand Down
22 changes: 18 additions & 4 deletions FileSets/v2.73/OverviewFlowComplex.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ OverviewPage {
property bool compact: showTanks && showTemps && tankTempCount > 4
property int tanksHeight: compact ? 22 : 45

VBusItem { id: ignoreAcInput; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput1; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput2; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn2") }
VBusItem { id: acActiveInput; bind: Utils.path(inverterService, "/Ac/ActiveIn/ActiveInput") }

property string guiModsPrefix: "com.victronenergy.settings/Settings/GuiMods"
VBusItem { id: showGaugesItem; bind: Utils.path(guiModsPrefix, "/ShowGauges") }
Expand Down Expand Up @@ -141,10 +143,22 @@ OverviewPage {
height: inOutTileHeight
title:
{
if (ignoreAcInput.valid && ignoreAcInput.value == 1)
return qsTr ("AC In Ignored")
// input 1 is active
if (! acActiveInput.valid || acActiveInput.value == 0)
{
if (ignoreAcInput1.valid && ignoreAcInput1.value == 1)
return qsTr ("AC In 1 Ignored")
else
return getAcSourceName(sys.acSource)
}
// input 2 is active
else
return getAcSourceName(sys.acSource)
{
if (ignoreAcInput2.valid && ignoreAcInput2.value == 1)
return qsTr ("AC In 2 Ignored")
else
return getAcSourceName(sys.acSource)
}
}
titleColor: "#E74c3c"
color: "#C0392B"
Expand Down
22 changes: 18 additions & 4 deletions FileSets/v2.89/OverviewHubEnhanced.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ OverviewPage {
VBusItem { id: pvInverterName3; bind: Utils.path(pvInverterPrefix3, "/CustomName") }

//////// add to display AC input ignored
VBusItem { id: ignoreAcInput; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput1; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn1") }
VBusItem { id: ignoreAcInput2; bind: Utils.path(inverterService, "/Ac/State/IgnoreAcIn2") }
VBusItem { id: acActiveInput; bind: Utils.path(inverterService, "/Ac/ActiveIn/ActiveInput") }

VBusItem { id: _hasAcOutSystem; bind: "com.victronenergy.settings/Settings/SystemSetup/HasAcOutSystem" }
VBusItem { id: hasDcSys; bind: "com.victronenergy.settings/Settings/SystemSetup/HasDcSystem" }
Expand All @@ -167,10 +169,22 @@ OverviewPage {
height: showStatusBar ? 100 : 120
title:
{
if (ignoreAcInput.valid && ignoreAcInput.value == 1)
return qsTr ("AC In Ignored")
// input 1 is active
if (! acActiveInput.valid || acActiveInput.value == 0)
{
if (ignoreAcInput1.valid && ignoreAcInput1.value == 1)
return qsTr ("AC In 1 Ignored")
else
return getAcSourceName(sys.acSource)
}
// input 2 is active
else
return getAcSourceName(sys.acSource)
{
if (ignoreAcInput2.valid && ignoreAcInput2.value == 1)
return qsTr ("AC In 2 Ignored")
else
return getAcSourceName(sys.acSource)
}
}
anchors {
top: multi.top
Expand Down
5 changes: 4 additions & 1 deletion changes
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v6.17:
fixed: AC input tile shows AC In Ignored when it is not

v6.16:
show more precision in tank bar number for small values (based on tank capacity)
fixed: alternator and wind generator power not removed from DC System
Expand Down Expand Up @@ -49,7 +52,7 @@ v6.6:

v6.5:
fixed: AC chargers not showing up in overview pages
fixed: Alternator temperatyr not showing up in details page
fixed: Alternator temperature not showing up in details page
v6.4:
fixed: some temp tiles don't display values

Expand Down
2 changes: 1 addition & 1 deletion version
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
v6.16
v6.17

0 comments on commit f863aee

Please sign in to comment.