gui fixes

eez-open · Mar 23, 2020 · 284ddf5 · 284ddf5
1 parent e5e2ac7
commit 284ddf5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -536990,6 +536990,14 @@
             "response": {
               "type": "nr2"
             }
+          },
+          {
+            "name": "SYSTem:MEASure[:SCALar][:VOLTage][:DC]?",
+            "parameters": [],
+            "response": {
+              "type": "discrete",
+              "enumeration": "SystemMeasureVoltage"
+            }
           }
         ]
       },
@@ -538302,7 +538310,7 @@
         "name": "SystemMeasureVoltage",
         "members": [
           {
-            "name": "VBAT",
+            "name": "RTC",
             "value": "1"
           }
         ]

diff --git a/src/eez/gui/event.cpp b/src/eez/gui/event.cpp
@@ -163,7 +163,11 @@ int getAction(const WidgetCursor &widgetCursor) {
 }
 
 void onPageTouch(const WidgetCursor &foundWidget, Event &touchEvent) {
-    foundWidget.appContext->onPageTouch(foundWidget, touchEvent);
+	if (foundWidget.appContext) {
+		foundWidget.appContext->onPageTouch(foundWidget, touchEvent);
+	} else {
+		getRootAppContext().onPageTouch(foundWidget, touchEvent);
+	}
 }
 
 void onInternalPageTouch(const WidgetCursor &widgetCursor, Event &touchEvent) {