Skip to content

chore: initialize usbgadget before native and display #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamshiervani merged 1 commit into from
Nov 27, 2025
+17 −11
Merged

chore: initialize usbgadget before native and display #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions display.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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")
Expand Down Expand Up @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down