feat: render minimal flight OSD from supervisor snapshots (#3)
This commit is contained in:
@@ -12,18 +12,26 @@ import (
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"git.piksar.eu/piotr/groundstation/internal/display"
|
||||
"git.piksar.eu/piotr/groundstation/internal/osd"
|
||||
)
|
||||
|
||||
// osdRefresh is the OSD overlay's redraw cadence, deliberately slower than
|
||||
// the video: newly published flight snapshots appear without waiting for X
|
||||
// events while the video window keeps rendering priority.
|
||||
const osdRefresh = time.Second
|
||||
|
||||
// buildTarget selects the target-specific layers. Each target owns its own
|
||||
// backend and layouts; there is no shared global template. The Viture target
|
||||
// builds two independent layers — the fullscreen fallback/menu canvas below
|
||||
// video and the transparent OSD overlay above it — wired to one shared video
|
||||
// presence signal: the sessions observe the video output lifecycle on the
|
||||
// display server and the templates draw or hide from it. WFB and video
|
||||
// decode never move into this process.
|
||||
func buildTarget(name string) ([]display.Layer, error) {
|
||||
// display server and the templates draw or hide from it. The OSD layer also
|
||||
// consumes the supervisor-published flight snapshots and refreshes on its
|
||||
// own slower cadence. WFB and video decode never move into this process.
|
||||
func buildTarget(name string, osdState string) ([]display.Layer, error) {
|
||||
switch name {
|
||||
case "x11":
|
||||
video := display.NewVideoPresence()
|
||||
@@ -34,9 +42,13 @@ func buildTarget(name string) ([]display.Layer, error) {
|
||||
Template: display.NewFallbackTemplate(video, "Brak połączenia WFB"),
|
||||
},
|
||||
{
|
||||
Name: "osd-overlay",
|
||||
Opener: display.X11Opener{Video: video, Role: display.RoleAbove},
|
||||
Template: display.NewOSDTemplate(video),
|
||||
Name: "osd-overlay",
|
||||
Opener: display.X11Opener{
|
||||
Video: video,
|
||||
Role: display.RoleAbove,
|
||||
RefreshInterval: osdRefresh,
|
||||
},
|
||||
Template: display.NewOSDTemplate(video, osd.NewFileSource(osdState)),
|
||||
},
|
||||
}, nil
|
||||
default:
|
||||
@@ -68,9 +80,11 @@ func formatDiagnostic(d display.Diagnostic) string {
|
||||
|
||||
func main() {
|
||||
target := flag.String("target", "x11", "display target: x11 (Viture) today; mipi planned")
|
||||
osdState := flag.String("osd-state", osd.DefaultStatePath,
|
||||
"OSD snapshot state file published by the groundstation supervisor")
|
||||
flag.Parse()
|
||||
|
||||
layers, err := buildTarget(*target)
|
||||
layers, err := buildTarget(*target, *osdState)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
@@ -2,10 +2,12 @@ package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.piksar.eu/piotr/groundstation/internal/display"
|
||||
"git.piksar.eu/piotr/groundstation/internal/osd"
|
||||
)
|
||||
|
||||
type recordingCanvas struct {
|
||||
@@ -22,16 +24,16 @@ func (c *recordingCanvas) Text(_, _ int, message string) {
|
||||
func (c *recordingCanvas) Flush() { c.flushes++ }
|
||||
|
||||
func TestBuildTargetBuildsIndependentVitureLayers(t *testing.T) {
|
||||
layers, err := buildTarget("x11")
|
||||
layers, err := buildTarget("x11", filepath.Join(t.TempDir(), "osd-state.bin"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(layers) != 2 {
|
||||
t.Fatalf("layers=%d want the fallback canvas and the OSD overlay", len(layers))
|
||||
}
|
||||
canvas, osd := layers[0], layers[1]
|
||||
if canvas.Name != "fallback-canvas" || osd.Name != "osd-overlay" {
|
||||
t.Fatalf("layer names %q/%q want fallback-canvas/osd-overlay", canvas.Name, osd.Name)
|
||||
canvas, osdLayer := layers[0], layers[1]
|
||||
if canvas.Name != "fallback-canvas" || osdLayer.Name != "osd-overlay" {
|
||||
t.Fatalf("layer names %q/%q want fallback-canvas/osd-overlay", canvas.Name, osdLayer.Name)
|
||||
}
|
||||
|
||||
canvasOpener, ok := canvas.Opener.(display.X11Opener)
|
||||
@@ -41,13 +43,21 @@ func TestBuildTargetBuildsIndependentVitureLayers(t *testing.T) {
|
||||
if canvasOpener.Role != display.RoleBelow {
|
||||
t.Fatalf("canvas layer role %v must stay below video", canvasOpener.Role)
|
||||
}
|
||||
osdOpener, ok := osd.Opener.(display.X11Opener)
|
||||
osdOpener, ok := osdLayer.Opener.(display.X11Opener)
|
||||
if !ok {
|
||||
t.Fatalf("OSD opener %T must be the X11 target", osd.Opener)
|
||||
t.Fatalf("OSD opener %T must be the X11 target", osdLayer.Opener)
|
||||
}
|
||||
if osdOpener.Role != display.RoleAbove {
|
||||
t.Fatalf("OSD layer role %v must stay above video", osdOpener.Role)
|
||||
}
|
||||
// The OSD refreshes on its own slower cadence; the canvas stays purely
|
||||
// event-driven.
|
||||
if osdOpener.RefreshInterval <= 0 {
|
||||
t.Fatal("the OSD overlay must redraw on its own refresh interval")
|
||||
}
|
||||
if canvasOpener.RefreshInterval != 0 {
|
||||
t.Fatal("the fallback canvas must keep its event-driven redraws")
|
||||
}
|
||||
|
||||
// Both layers must share one presence signal so the video lifecycle
|
||||
// observed by either session drives both templates.
|
||||
@@ -63,9 +73,10 @@ func TestBuildTargetBuildsIndependentVitureLayers(t *testing.T) {
|
||||
t.Fatalf("canvas lines=%q want the exact fallback text", canvasSurface.lines)
|
||||
}
|
||||
|
||||
// The OSD layer is the OSD surface, never the fallback.
|
||||
// The OSD layer is the OSD surface, never the fallback: without a
|
||||
// published snapshot it presents nothing.
|
||||
osdSurface := &recordingCanvas{width: 800, height: 600}
|
||||
osd.Template.Draw(osdSurface)
|
||||
osdLayer.Template.Draw(osdSurface)
|
||||
if len(osdSurface.lines) != 0 {
|
||||
t.Fatalf("OSD lines=%q want none: the overlay must not duplicate the fallback", osdSurface.lines)
|
||||
}
|
||||
@@ -80,8 +91,45 @@ func TestBuildTargetBuildsIndependentVitureLayers(t *testing.T) {
|
||||
canvasOpener.Video.SetActive(false)
|
||||
}
|
||||
|
||||
func TestBuildTargetOSDLayerRendersPublishedSnapshots(t *testing.T) {
|
||||
state := filepath.Join(t.TempDir(), "run", "osd-state.bin")
|
||||
publisher := osd.NewFilePublisher(state, nil)
|
||||
defer publisher.Close()
|
||||
|
||||
snapshot := osd.Snapshot{Sequence: 11, Armed: true, Power: true}
|
||||
publisher.Publish(snapshot)
|
||||
deadline := time.Now().Add(2 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
if _, err := osd.DecodeFile(state); err == nil {
|
||||
break
|
||||
}
|
||||
time.Sleep(time.Millisecond)
|
||||
}
|
||||
|
||||
layers, err := buildTarget("x11", state)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
osdLayer := layers[1]
|
||||
osdOpener := osdLayer.Opener.(display.X11Opener)
|
||||
osdOpener.Video.SetActive(true)
|
||||
|
||||
surface := &recordingCanvas{width: 800, height: 600}
|
||||
osdLayer.Template.Draw(surface)
|
||||
|
||||
want := []string{"ARM ARMED", "PWR ON"}
|
||||
if len(surface.lines) != len(want) {
|
||||
t.Fatalf("OSD lines=%q want %q from the supervisor-published snapshot", surface.lines, want)
|
||||
}
|
||||
for i := range want {
|
||||
if surface.lines[i] != want[i] {
|
||||
t.Fatalf("line %d=%q want %q", i, surface.lines[i], want[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildTargetRejectsUnknownTarget(t *testing.T) {
|
||||
if _, err := buildTarget("hdmi-mirror"); err == nil {
|
||||
if _, err := buildTarget("hdmi-mirror", ""); err == nil {
|
||||
t.Fatal("unknown target must fail")
|
||||
}
|
||||
}
|
||||
@@ -101,7 +149,7 @@ func TestFormatDiagnosticRendersStructuredFields(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestWireDiagnosticsTagsEveryLayerWithItsName(t *testing.T) {
|
||||
layers, err := buildTarget("x11")
|
||||
layers, err := buildTarget("x11", filepath.Join(t.TempDir(), "osd-state.bin"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user