Add variables and MAC address to device screen

Also cleaned up all the scrolling and click/gesture handling so all the menus work correctly.

Author: IDisposable

display.go

@@ -41,10 +41,16 @@ func switchToMainScreen() {
 
 func updateDisplay() {
 	if networkManager != nil {
-		nativeInstance.UpdateLabelAndChangeVisibility("home_info_ipv4_addr", networkManager.IPv4String())
-		nativeInstance.UpdateLabelAndChangeVisibility("home_info_ipv6_addr", networkManager.IPv6String())
-		nativeInstance.UpdateLabelIfChanged("home_info_mac_addr", networkManager.MACString())
-		nativeInstance.UpdateLabelIfChanged("home_info_hostname", networkManager.Hostname())
+		ipv4 := networkManager.IPv4String()
+		nativeInstance.UISetVar("ip_v4_address", ipv4)
+		nativeInstance.ChangeVisibility("home_info_ipv4_addr", ipv4 != "")
+
+		ipv6 := networkManager.IPv6String()
+		nativeInstance.UISetVar("ip_v6_address", ipv6)
+		nativeInstance.ChangeVisibility("home_info_ipv6_addr", ipv6 != "")
+
+		nativeInstance.UISetVar("mac_address", networkManager.MACString())
+		nativeInstance.UISetVar("hostname", networkManager.Hostname())
 
 		// we either show the MAC address (if no IP yet) or the hostname (if either IPv4 or IPv6 are available)
 		hasIP := networkManager.IPv4Ready() || networkManager.IPv6Ready()
@@ -210,7 +216,8 @@ func waitCtrlAndRequestDisplayUpdate(shouldWakeDisplay bool, reason string) {
 func updateStaticContents() {
 	//contents that never change
 	if networkManager != nil {
-		nativeInstance.UpdateLabelIfChanged("home_info_mac_addr", networkManager.MACString())
+		mac := networkManager.MACString()
+		nativeInstance.UISetVar("mac_address", mac)
 	}
 
 	// get cpu info
@@ -236,7 +243,7 @@ func updateStaticContents() {
 	nativeInstance.UpdateLabelAndChangeVisibility("build_date", version.BuildDate)
 	nativeInstance.UpdateLabelAndChangeVisibility("golang_version", version.GoVersion)
 
-	// nativeInstance.UpdateLabelAndChangeVisibility("boot_screen_device_id", GetDeviceID())
+	nativeInstance.UpdateLabelAndChangeVisibility("device_id", GetDeviceID())
 }
 
 // setDisplayBrightness sets /sys/class/backlight/backlight/brightness to alter

internal/native/cgo_notlinux.go

@@ -98,6 +98,10 @@ func uiGetLVGLVersion() string {
 	return ""
 }
 
+func uiTick() {
+	panicPlatformNotSupported()
+}
+
 func videoGetStreamQualityFactor() (float64, error) {
 	panicPlatformNotSupported()
 	return 0, nil

internal/native/display.go

@@ -109,6 +109,7 @@ func (n *Native) UpdateLabelIfChanged(objName string, newText string) {
 
 	if changed {
 		l.Msg("label changed")
+		uiTick()
 	} else {
 		l.Msg("label not changed")
 	}
@@ -130,6 +131,8 @@ func (n *Native) ChangeVisibility(objName string, show bool) {
 		_, _ = n.UIObjHide(objName)
 		_, _ = n.UIObjHide(containerName)
 	}
+
+	uiTick()
 }
 
 // SwitchToScreenIf switches to the screen if the screen name is different from the current screen and the screen name is in the shouldSwitch list

internal/native/eez/jetkvm.eez-project

@@ -56,6 +56,10 @@ void action_switch_to_reboot(lv_event_t *e) {
     loadScreen(SCREEN_ID_REBOOT_SCREEN);
 }
 
+void action_switch_to_network(lv_event_t *e) {
+    loadScreen(SCREEN_ID_MENU_NETWORK_SCREEN);
+}
+
 void action_menu_screen_gesture(lv_event_t * e) {
     handle_gesture_main_screen_switch(e, LV_DIR_RIGHT);
 }
@@ -76,6 +80,11 @@ void action_about_screen_gesture(lv_event_t * e) {
     handle_gesture_screen_switch(e, LV_DIR_RIGHT, SCREEN_ID_MENU_SCREEN);
 }
 
+void action_status_screen_gesture(lv_event_t *e) {
+    handle_gesture_screen_switch(e, LV_DIR_RIGHT, SCREEN_ID_MENU_SCREEN);
+}
+
+
 // user_data doesn't seem to be working, so we use a global variable here
 static uint32_t t_reset_config;
 static uint32_t t_reboot;
@@ -168,9 +177,9 @@ void action_dhcpc(lv_event_t * e) {
         .lock = &b_dhcpc_lock,
         .hold_time_seconds = DHCPC_HOLD_TIME,
         .rpc_method = "toggleDHCPClient",
-        .button_obj = NULL,  // No button/spinner for reboot
+        .button_obj = NULL,  // No button/spinner for dhcp client change
         .spinner_obj = NULL,
-        .label_obj = objects.dhcpc_label,
+        .label_obj = objects.dhcp_client_label,
         .default_text = "Press and hold for\n5 seconds"
     };
 

internal/native/eez/src/ui/actions.c

@@ -26,6 +26,8 @@ extern void action_reboot(lv_event_t * e);
 extern void action_switch_to_reboot(lv_event_t * e);
 extern void action_dhcpc(lv_event_t * e);
 extern void action_switch_to_dhcpc(lv_event_t * e);
+extern void action_status_screen_gesture(lv_event_t * e);
+extern void action_switch_to_network(lv_event_t * e);
 
 
 #ifdef __cplusplus

internal/native/eez/src/ui/actions.h

@@ -8,7 +8,6 @@ extern "C" {
 #endif
 
 extern const lv_font_t ui_font_font_bold30;
-extern const lv_font_t ui_font_font_bold24;
 extern const lv_font_t ui_font_font_book16;
 extern const lv_font_t ui_font_font_book18;
 extern const lv_font_t ui_font_font_book20;