Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Aveline 2025-11-27 10:44:06 +01:00 committed by GitHub
parent 8d801fdb3d
commit 56968dede5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
display.go
View File

@ -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()

8
main.go
View File

@ -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()