display.go

@@ -157,21 +157,20 @@ func wakeDisplay(force bool) {
 		return
 	}
 
-	// Don't try to wake up if the display is turned off.
-	if config.DisplayMaxBrightness == 0 {
-		return
-	}
-
 	err := setDisplayBrightness(config.DisplayMaxBrightness)
 	if err != nil {
 		fmt.Printf("display wake failed, %s\n", err)
 	}
 
-	if config.DisplayDimAfterSec != 0 {
+	if config.DisplayDimAfterSec == 0 {
+		dimTicker.Stop()
+	} else {
 		dimTicker.Reset(time.Duration(config.DisplayDimAfterSec) * time.Second)
 	}
 
-	if config.DisplayOffAfterSec != 0 {
+	if config.DisplayOffAfterSec == 0 {
+		offTicker.Stop()
+	} else {
 		offTicker.Reset(time.Duration(config.DisplayOffAfterSec) * time.Second)
 	}
 	backlightState = 0
@@ -210,15 +209,8 @@ func watchTsEvents() {
 // option has the value set to zero, but time.NewTicker only accept positive values.
 func startBacklightTickers() {
 	LoadConfig()
-	// Don't start the tickers if the display is switched off.
-	// Set the display to off if that's the case.
-	if config.DisplayMaxBrightness == 0 {
-		setDisplayBrightness(0)
-		return
-	}
-
 	if dimTicker == nil && config.DisplayDimAfterSec != 0 {
-		fmt.Printf("display: dim_ticker has started\n")
+		fmt.Printf("display: dim_ticker has started.")
 		dimTicker = time.NewTicker(time.Duration(config.DisplayDimAfterSec) * time.Second)
 		defer dimTicker.Stop()
 
@@ -233,7 +225,7 @@ func startBacklightTickers() {
 	}
 
 	if offTicker == nil && config.DisplayOffAfterSec != 0 {
-		fmt.Printf("display: off_ticker has started\n")
+		fmt.Printf("display: off_ticker has started.")
 		offTicker = time.NewTicker(time.Duration(config.DisplayOffAfterSec) * time.Second)
 		defer offTicker.Stop()
 
@@ -256,9 +248,9 @@ func init() {
 		updateStaticContents()
 		displayInited = true
 		fmt.Println("display inited")
-		startBacklightTickers()
-		wakeDisplay(true)
+		wakeDisplay(false)
 		requestDisplayUpdate()
+		startBacklightTickers()
 	}()
 
 	go watchTsEvents()