don't use fixed integers for ID_GW_SYSALARM and ID_GW_SYSSERVICE

jens-maus · Sep 6, 2021 · 22b63d4 · 22b63d4
1 parent baa1382
commit 22b63d4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/buildroot-external/patches/occu/0072-WebUI-Fix-hm_autoconf.patch b/buildroot-external/patches/occu/0072-WebUI-Fix-hm_autoconf.patch
@@ -58,16 +58,21 @@
 
      proc conf_device_HM-CCU-1 { url dev_id desc_var } {
          rega "dom.GetObject($dev_id).ReadyConfig(true);"
-@@ -136,7 +136,6 @@
+@@ -136,101 +136,16 @@
 
      proc conf_value_WEATHER.RAIN_COUNTER { url ch_id ch_desc_var value_desc_var} {
          create_rain_calculation $ch_id
 -        
      }
 
      proc conf_value_DISPLAY.SERVICE_COUNT { url ch_id ch_desc_var value_desc_var} {
-@@ -147,90 +146,6 @@
-         create_sysvar_to_value_prg $ch_id ALARM_COUNT 40 "Alarmmeldungen anzeigen"
+-        create_sysvar_to_value_prg $ch_id SERVICE_COUNT 41 "Servicemeldungen anzeigen"
++        create_sysvar_to_value_prg $ch_id SERVICE_COUNT ID_GW_SYSSERVICE "Servicemeldungen anzeigen"
+     }
+
+     proc conf_value_DISPLAY.ALARM_COUNT { url ch_id ch_desc_var value_desc_var} {
+-        create_sysvar_to_value_prg $ch_id ALARM_COUNT 40 "Alarmmeldungen anzeigen"
++        create_sysvar_to_value_prg $ch_id ALARM_COUNT ID_GW_SYSALARM "Alarmmeldungen anzeigen"
      }
 
 -    proc create_objects {collection enum_type names} {
@@ -412,13 +417,13 @@
 +    sv.ValueName1("${sysVarPresencePresent}");
 +    sv.ValueName0("${sysVarPresenceNotPresent}");
 +
-+    sv=dom.GetObject(40);
++    sv=dom.GetObject(ID_GW_SYSALARM);
 +    dom.GetObject(ID_SYSTEM_VARIABLES).Add(sv.ID());
 +    sv.Name("${sysVarAlarmMessages}");
 +    sv.DPInfo("${sysVarAlarmMessagesCount}");
 +    sv.Internal(0);
 +
-+    sv=dom.GetObject(41);
++    sv=dom.GetObject(ID_GW_SYSSERVICE);
 +    dom.GetObject(ID_SYSTEM_VARIABLES).Add(sv.ID());
 +    sv.Name("${sysVarServiceMessages}");
 +    sv.DPInfo("${sysVarServiceMessagesCount}");

diff --git a/buildroot-external/patches/occu/0072-WebUI-Fix-hm_autoconf/occu/WebUI/bin/hm_autoconf b/buildroot-external/patches/occu/0072-WebUI-Fix-hm_autoconf/occu/WebUI/bin/hm_autoconf
@@ -139,11 +139,11 @@ if { [catch {
     }
 
     proc conf_value_DISPLAY.SERVICE_COUNT { url ch_id ch_desc_var value_desc_var} {
-        create_sysvar_to_value_prg $ch_id SERVICE_COUNT 41 "Servicemeldungen anzeigen"
+        create_sysvar_to_value_prg $ch_id SERVICE_COUNT ID_GW_SYSSERVICE "Servicemeldungen anzeigen"
     }
 
     proc conf_value_DISPLAY.ALARM_COUNT { url ch_id ch_desc_var value_desc_var} {
-        create_sysvar_to_value_prg $ch_id ALARM_COUNT 40 "Alarmmeldungen anzeigen"
+        create_sysvar_to_value_prg $ch_id ALARM_COUNT ID_GW_SYSALARM "Alarmmeldungen anzeigen"
     }
 
     proc create_sysvar_to_value_prg {ch_id value sv_id prg_name} {

diff --git a/buildroot-external/patches/occu/0072-WebUI-Fix-hm_autoconf/occu/WebUI/bin/hm_startup b/buildroot-external/patches/occu/0072-WebUI-Fix-hm_autoconf/occu/WebUI/bin/hm_startup
@@ -114,13 +114,13 @@ proc create_default_sysvars {} {
     sv.ValueName1("${sysVarPresencePresent}");
     sv.ValueName0("${sysVarPresenceNotPresent}");
 
-    sv=dom.GetObject(40);
+    sv=dom.GetObject(ID_GW_SYSALARM);
     dom.GetObject(ID_SYSTEM_VARIABLES).Add(sv.ID());
     sv.Name("${sysVarAlarmMessages}");
     sv.DPInfo("${sysVarAlarmMessagesCount}");
     sv.Internal(0);
 
-    sv=dom.GetObject(41);
+    sv=dom.GetObject(ID_GW_SYSSERVICE);
     dom.GetObject(ID_SYSTEM_VARIABLES).Add(sv.ID());
     sv.Name("${sysVarServiceMessages}");
     sv.DPInfo("${sysVarServiceMessagesCount}");