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)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user