From 199d14ce769c33f7117950ae7bb5db5f1e7c7c54 Mon Sep 17 00:00:00 2001 From: Daniel McInnes Date: Mon, 8 Jul 2024 10:09:06 +1000 Subject: [PATCH 1/2] Show 'Unknown' for RS system state instead of an empty string Fixes #1300 --- data/System.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/System.qml b/data/System.qml index 72ec6d390..314bb8f80 100644 --- a/data/System.qml +++ b/data/System.qml @@ -161,8 +161,9 @@ QtObject { case VenusOS.System_State_DynamicESS: //% "Dynamic ESS" return qsTrId("inverters_state_dynamic_ess") + default: + return CommonWords.unknown_status } - return "" } Component.onCompleted: Global.system = root From 306a9b896cf440d26d7d495092ec1cdd7af4e992 Mon Sep 17 00:00:00 2001 From: Daniel McInnes Date: Mon, 8 Jul 2024 10:22:55 +1000 Subject: [PATCH 2/2] Display ActiveAcInput on the RS System Page. --- pages/settings/devicelist/rs/PageRsSystem.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pages/settings/devicelist/rs/PageRsSystem.qml b/pages/settings/devicelist/rs/PageRsSystem.qml index 04640f073..4b37b40cd 100644 --- a/pages/settings/devicelist/rs/PageRsSystem.qml +++ b/pages/settings/devicelist/rs/PageRsSystem.qml @@ -50,6 +50,10 @@ Page { } } + ActiveAcInputTextItem { + bindPrefix: root.bindPrefix + } + Loader { width: parent ? parent.width : 0 sourceComponent: numberOfPhases.value === 1 ? singlePhaseAcInOut