Merge 557aa5891a into 37b1a8bf34

display.go

@@ -1,7 +1,6 @@
 package kvm
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -111,6 +110,12 @@ func clearDisplayState() {
 	currentScreen = "ui_Boot_Screen"
 }
 
+var (
+	cloudBlinkLock    sync.Mutex = sync.Mutex{}
+	cloudBlinkStopped bool
+	cloudBlinkTicker  *time.Ticker
+)
+
 func updateDisplay() {
 	updateLabelIfChanged("ui_Home_Content_Ip", networkState.IPv4String())
 	if usbState == "configured" {
@@ -147,81 +152,48 @@ func updateDisplay() {
 		stopCloudBlink()
 	case CloudConnectionStateConnecting:
 		_, _ = lvImgSetSrc("ui_Home_Header_Cloud_Status_Icon", "cloud.png")
-		restartCloudBlink()
+		startCloudBlink()
 	case CloudConnectionStateConnected:
 		_, _ = lvImgSetSrc("ui_Home_Header_Cloud_Status_Icon", "cloud.png")
 		stopCloudBlink()
 	}
 }
 
-const (
-	cloudBlinkInterval = 2 * time.Second
-	cloudBlinkDuration = 1 * time.Second
-)
-
-var (
-	cloudBlinkTicker *time.Ticker
-	cloudBlinkCancel context.CancelFunc
-	cloudBlinkLock   = sync.Mutex{}
-)
-
-func doCloudBlink(ctx context.Context) {
-	for range cloudBlinkTicker.C {
-		if cloudConnectionState != CloudConnectionStateConnecting {
-			continue
-		}
-
-		_, _ = lvObjFadeOut("ui_Home_Header_Cloud_Status_Icon", uint32(cloudBlinkDuration.Milliseconds()))
-
-		select {
-		case <-ctx.Done():
-			return
-		case <-time.After(cloudBlinkDuration):
-		}
-
-		_, _ = lvObjFadeIn("ui_Home_Header_Cloud_Status_Icon", uint32(cloudBlinkDuration.Milliseconds()))
-
-		select {
-		case <-ctx.Done():
-			return
-		case <-time.After(cloudBlinkDuration):
-		}
-	}
-}
-
-func restartCloudBlink() {
-	stopCloudBlink()
-	startCloudBlink()
-}
-
 func startCloudBlink() {
-	cloudBlinkLock.Lock()
-	defer cloudBlinkLock.Unlock()
-
 	if cloudBlinkTicker == nil {
-		cloudBlinkTicker = time.NewTicker(cloudBlinkInterval)
+		cloudBlinkTicker = time.NewTicker(2 * time.Second)
 	} else {
-		cloudBlinkTicker.Reset(cloudBlinkInterval)
+		// do nothing if the blink isn't stopped
+		if cloudBlinkStopped {
+			cloudBlinkLock.Lock()
+			defer cloudBlinkLock.Unlock()
+
+			cloudBlinkStopped = false
+			cloudBlinkTicker.Reset(2 * time.Second)
+		}
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
+	go func() {
-	cloudBlinkCancel = cancel
+		for range cloudBlinkTicker.C {
-
+			if cloudConnectionState != CloudConnectionStateConnecting {
-	go doCloudBlink(ctx)
+				continue
+			}
+			_, _ = lvObjFadeOut("ui_Home_Header_Cloud_Status_Icon", 1000)
+			time.Sleep(1000 * time.Millisecond)
+			_, _ = lvObjFadeIn("ui_Home_Header_Cloud_Status_Icon", 1000)
+			time.Sleep(1000 * time.Millisecond)
+		}
+	}()
 }
 
 func stopCloudBlink() {
-	cloudBlinkLock.Lock()
-	defer cloudBlinkLock.Unlock()
-
-	if cloudBlinkCancel != nil {
-		cloudBlinkCancel()
-		cloudBlinkCancel = nil
-	}
-
 	if cloudBlinkTicker != nil {
 		cloudBlinkTicker.Stop()
 	}
+
+	cloudBlinkLock.Lock()
+	defer cloudBlinkLock.Unlock()
+	cloudBlinkStopped = true
 }
 
 var (

resource/jetkvm_native.sha256

@@ -1 +1 @@
-01db2bbcd0bad46c3e21eb3cc5687d15df2153c3d8e2d4665b37acb55f0b5a57
+6dabd0e657dd099280d9173069687786a4a8c9c25cf7f9e7ce2f940cab67c521