img.go

@@ -29,7 +29,7 @@ const (
 	rightX = 530
 )
 
-func getImg(
+func getBlack(
 	ctx context.Context,
 	nowFunc func() time.Time,
 	transportsClient *transports.Client,

main.go

@@ -41,30 +41,16 @@ func main() {
 		CacheLocation: os.Getenv("WEATHER_CACHE_LOCATION"),
 	})
 
-	const minSleep = 1 * time.Second
+	const minSleep = 30 * time.Second
 
 	sleep, err := time.ParseDuration(os.Getenv("SLEEP_DURATION"))
 	if err != nil || sleep < minSleep {
 		sleep = minSleep
 	}
 
-	const minInitFastThreshold = 1 * time.Second
-
-	initFastThreshold, err := time.ParseDuration(os.Getenv("INIT_FAST_THRESHOLD"))
-	if err != nil || initFastThreshold < minInitFastThreshold {
-		initFastThreshold = minInitFastThreshold
-	}
-
 	log.Printf("sleep duration: %v\n", sleep)
 
-	if err := run(
+	if err := run(ctx, sleep, transportsClient, feteClient, weatherClient); err != nil {
-		ctx,
-		sleep,
-		initFastThreshold,
-		transportsClient,
-		feteClient,
-		weatherClient,
-	); err != nil {
 		log.Fatal("error: ", err)
 	}
 

run_darwin_arm64.go

@@ -13,12 +13,11 @@ import (
 func run(
 	ctx context.Context,
 	_ time.Duration,
-	_ time.Duration,
 	transportsClient *transports.Client,
 	feteClient *fete.Client,
 	weatherClient *weather.Client,
 ) error {
-	img, err := getImg(
+	img, err := getBlack(
 		ctx,
 		func() time.Time {
 			t, err := time.Parse(time.DateOnly, "2024-08-01zzz")

run_linux_arm64.go

@@ -7,7 +7,6 @@ import (
 	"github.com/Crocmagnon/display-epaper/fete"
 	"github.com/Crocmagnon/display-epaper/transports"
 	"github.com/Crocmagnon/display-epaper/weather"
-	"image"
 	"log"
 	"os"
 	"periph.io/x/host/v3"
@@ -17,7 +16,6 @@ import (
 func run(
 	ctx context.Context,
 	sleep time.Duration,
-	initFastThreshold time.Duration,
 	transportsClient *transports.Client,
 	feteClient *fete.Client,
 	weatherClient *weather.Client,
@@ -32,8 +30,6 @@ func run(
 		return fmt.Errorf("initializing epd: %w", err)
 	}
 
-	var currentImg image.Image
-
 	for {
 		select {
 		case <-ctx.Done():
@@ -44,11 +40,9 @@ func run(
 
 		log.Println("running loop")
 
-		img, err := loop(
+		err = loop(
 			ctx,
 			display,
-			initFastThreshold,
-			currentImg,
 			transportsClient,
 			feteClient,
 			weatherClient,
@@ -57,8 +51,6 @@ func run(
 			log.Printf("error looping: %v\n", err)
 		}
 
-		currentImg = img
-
 		log.Printf("time.Sleep(%v)\n", sleep)
 		time.Sleep(sleep)
 	}
@@ -67,13 +59,11 @@ func run(
 func loop(
 	ctx context.Context,
 	display *epd.EPD,
-	initFastThreshold time.Duration,
-	currentImg image.Image,
 	transportsClient *transports.Client,
 	feteClient *fete.Client,
 	weatherClient *weather.Client,
-) (image.Image, error) {
+) error {
-	img, err := getImg(
+	black, err := getBlack(
 		ctx,
 		time.Now,
 		transportsClient,
@@ -81,12 +71,7 @@ func loop(
 		weatherClient,
 	)
 	if err != nil {
-		return nil, fmt.Errorf("getting black: %w", err)
+		return fmt.Errorf("getting black: %w", err)
-	}
-
-	if imgEqual(currentImg, img, epd.Width, epd.Height) {
-		log.Println("Images are equal, doing nothing.")
-		return img, nil
 	}
 
 	defer func() {
@@ -95,23 +80,23 @@ func loop(
 		}
 	}()
 
-	err = initDisplay(display, initFastThreshold)
+	err = initDisplay(display)
 	if err != nil {
-		return nil, fmt.Errorf("initializing display: %w", err)
+		return fmt.Errorf("initializing display: %w", err)
 	}
 
 	display.Clear()
 
-	display.Send(img)
+	display.Send(black)
 	display.Refresh()
 
-	return img, nil
+	return nil
 }
 
 const filename = "/perm/display-epaper-lastFullRefresh"
 
-func initDisplay(display *epd.EPD, threshold time.Duration) error {
+func initDisplay(display *epd.EPD) error {
-	if canInitFast(threshold) {
+	if canInitFast() {
 		err := display.InitFast()
 		if err != nil {
 			return fmt.Errorf("running fast init: %w", err)
@@ -129,13 +114,13 @@ func initDisplay(display *epd.EPD, threshold time.Duration) error {
 	return nil
 }
 
-func canInitFast(threshold time.Duration) bool {
+func canInitFast() bool {
 	stat, err := os.Stat(filename)
 	if err != nil {
 		return false
 	}
 
-	return stat.ModTime().Add(threshold).After(time.Now())
+	return stat.ModTime().Add(12 * time.Hour).After(time.Now())
 }
 
 func markInitFull() {
@@ -146,21 +131,3 @@ func markInitFull() {
 
 	f.Close()
 }
-
-func imgEqual(img1, img2 image.Image, width, height int) bool {
-	if img1 == nil || img2 == nil {
-		return false
-	}
-
-	for y := 0; y < height; y++ {
-		for x := 0; x < width; x++ {
-			r1, g1, b1, a1 := img1.At(x, y).RGBA()
-			r2, g2, b2, a2 := img2.At(x, y).RGBA()
-			if r1 != r2 || g1 != g2 || b1 != b2 || a1 != a2 {
-				return false
-			}
-		}
-	}
-
-	return true
-}