fxes

Author: MaxwellDPS

pkg/sensehat/sensehat.go

@@ -712,66 +712,52 @@ func (s *SenseHat) FlashLED(x, y int, r, g, b uint8, duration time.Duration) err
 	return s.SetPixel(x, y, 0, 0, 0)
 }
 
-// PlaneAnimation animates "SKYSPY" text scrolling followed by a plane flying across the LED matrix.
+// PlaneAnimation animates a plane flying across the LED matrix with nav lights.
 func (s *SenseHat) PlaneAnimation(frameDelay time.Duration) error {
-	// 5x5 font for SKYSPY (each letter is 5 columns wide)
-	letters := map[rune][][2]int{
-		'S': {{0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 0}, {1, 4}, {2, 0}, {2, 2}, {2, 4}, {3, 0}, {3, 4}, {4, 0}, {4, 1}, {4, 2}, {4, 4}},
-		'K': {{0, 0}, {0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 2}, {2, 1}, {2, 3}, {3, 0}, {3, 4}},
-		'Y': {{0, 0}, {0, 1}, {1, 2}, {2, 2}, {2, 3}, {2, 4}, {3, 2}, {4, 0}, {4, 1}},
-		'P': {{0, 0}, {0, 1}, {0, 2}, {0, 3}, {0, 4}, {1, 0}, {1, 2}, {2, 0}, {2, 2}, {3, 0}, {3, 1}, {3, 2}},
-	}
-
-	// Build "SKYSPY" as a bitmap with 1 column spacing between letters
-	text := "SKYSPY"
-	letterWidth := 5
-	spacing := 1
-	var textPixels [][2]int
-	xOffset := 0
-	for _, ch := range text {
-		if pixels, ok := letters[ch]; ok {
-			for _, p := range pixels {
-				textPixels = append(textPixels, [2]int{p[0] + xOffset, p[1]})
-			}
-		}
-		xOffset += letterWidth + spacing
+	// Plane shape (relative pixels from nose position)
+	// Shape:   >=>
+	//           =
+	plane := [][2]int{
+		{0, 0},   // nose
+		{-1, 0},  // body
+		{-2, 0},  // tail
+		{-1, -1}, // top wing
+		{-1, 1},  // bottom wing
 	}
-	textWidth := xOffset - spacing
 
-	// Scroll text from right to left with airplane nav lights
+	// Animate plane flying from left (-2) to right (9) to fully exit
 	strobeCounter := 0
-	for scroll := 0; scroll <= textWidth+8; scroll++ {
+	for x := -2; x <= 9; x++ {
 		if err := s.ClearLEDs(); err != nil {
 			return err
 		}
 
-		// Draw scrolling text
-		for _, p := range textPixels {
-			px := 7 - scroll + p[0]
-			py := 1 + p[1] // Center vertically
+		// Draw plane at current position (y=3 for center)
+		for _, p := range plane {
+			px := x + p[0]
+			py := 3 + p[1]
 			if px >= 0 && px <= 7 && py >= 0 && py <= 7 {
-				if err := s.SetPixel(px, py, 0, 200, 255); err != nil {
+				if err := s.SetPixel(px, py, 255, 255, 255); err != nil {
 					return err
 				}
 			}
 		}
 
 		// Navigation lights: green on right (starboard), red on left (port)
-		// Bottom row: positions 0 and 7
 		if err := s.SetPixel(0, 7, 255, 0, 0); err != nil { // Red - port (left)
 			return err
 		}
 		if err := s.SetPixel(7, 7, 0, 255, 0); err != nil { // Green - starboard (right)
 			return err
 		}
 
-		// Strobe lights: white flashing every 4 frames (slower flash)
+		// Strobe lights: white flashing every 4 frames, opposite corners
 		strobeOn := (strobeCounter % 4) < 2
 		if strobeOn {
-			if err := s.SetPixel(1, 7, 255, 255, 255); err != nil { // White strobe near red
+			if err := s.SetPixel(7, 0, 255, 255, 255); err != nil { // White strobe top-right
 				return err
 			}
-			if err := s.SetPixel(6, 7, 255, 255, 255); err != nil { // White strobe near green
+			if err := s.SetPixel(0, 0, 255, 255, 255); err != nil { // White strobe top-left
 				return err
 			}
 		}
@@ -780,37 +766,6 @@ func (s *SenseHat) PlaneAnimation(frameDelay time.Duration) error {
 		time.Sleep(frameDelay)
 	}
 
-	// Plane shape (relative pixels from nose position)
-	// Shape:   >=>
-	//           =
-	plane := [][2]int{
-		{0, 0},   // nose
-		{-1, 0},  // body
-		{-2, 0},  // tail
-		{-1, -1}, // top wing
-		{-1, 1},  // bottom wing
-	}
-
-	// Animate plane flying from left (-2) to right (9) to fully exit
-	for x := -2; x <= 9; x++ {
-		if err := s.ClearLEDs(); err != nil {
-			return err
-		}
-
-		// Draw plane at current position (y=3 for center)
-		for _, p := range plane {
-			px := x + p[0]
-			py := 3 + p[1]
-			if px >= 0 && px <= 7 && py >= 0 && py <= 7 {
-				if err := s.SetPixel(px, py, 255, 255, 255); err != nil {
-					return err
-				}
-			}
-		}
-
-		time.Sleep(frameDelay)
-	}
-
 	// Clear after animation
 	return s.ClearLEDs()
 }