chore: initialize usbgadget before native and display (#1010)

Author: ym

display.go

@@ -39,6 +39,16 @@ func switchToMainScreen() {
 	}
 }
 
+func updateDisplayUsbState() {
+	if usbState == "configured" {
+		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Connected")
+		_, _ = nativeInstance.UIObjAddState("usb_status_label", "LV_STATE_CHECKED")
+	} else {
+		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Disconnected")
+		_, _ = nativeInstance.UIObjClearState("usb_status_label", "LV_STATE_CHECKED")
+	}
+}
+
 func updateDisplay() {
 	if networkManager != nil {
 		nativeInstance.UpdateLabelIfChanged("home_info_ipv4_addr", networkManager.IPv4String())
@@ -56,13 +66,8 @@ func updateDisplay() {
 		nativeInstance.UpdateLabelIfChanged("dhcp_client_change_label", "Change to JetKVM")
 	}
 
-	if usbState == "configured" {
-		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Connected")
-		_, _ = nativeInstance.UIObjAddState("usb_status_label", "LV_STATE_CHECKED")
-	} else {
-		nativeInstance.UpdateLabelIfChanged("usb_status_label", "Disconnected")
-		_, _ = nativeInstance.UIObjClearState("usb_status_label", "LV_STATE_CHECKED")
-	}
+	updateDisplayUsbState()
+
 	if lastVideoState.Ready {
 		nativeInstance.UpdateLabelIfChanged("hdmi_status_label", "Connected")
 		_, _ = nativeInstance.UIObjAddState("hdmi_status_label", "LV_STATE_CHECKED")
@@ -371,6 +376,7 @@ func initDisplay() {
 		displayLogger.Info().Msg("setting initial display contents")
 		time.Sleep(500 * time.Millisecond)
 		updateStaticContents()
+		updateDisplayUsbState()
 		displayInited = true
 		displayLogger.Info().Msg("display inited")
 		startBacklightTickers()

main.go

@@ -54,14 +54,14 @@ func Main() {
 
 	go runWatchdog()
 
-	setProcTitle("initNative")
-	initNative(systemVersionLocal, appVersionLocal)
-	initDisplay()
-
 	// initialize usb gadget
 	setProcTitle("initUsbGadget")
 	initUsbGadget()
 
+	setProcTitle("initNative")
+	initNative(systemVersionLocal, appVersionLocal)
+	initDisplay()
+
 	http.DefaultClient.Timeout = 1 * time.Minute
 
 	err = rootcerts.UpdateDefaultTransport()