feat: publish adaptive-link OSD contract and keep overlay above video (#3)
This commit is contained in:
+42
-8
@@ -1,6 +1,8 @@
|
||||
package display
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
|
||||
"git.piksar.eu/piotr/groundstation/internal/osd"
|
||||
)
|
||||
|
||||
@@ -44,18 +46,50 @@ func (t OSDTemplate) Draw(canvas Canvas) {
|
||||
canvas.Flush()
|
||||
}
|
||||
|
||||
// drawOSD renders the deliberately minimal flight telemetry: two short
|
||||
// lines in the top-left corner. The full final RC state stays in the
|
||||
// snapshot; the pilot-facing overlay stays terse.
|
||||
// drawOSD renders the deliberately minimal flight telemetry: the arm state
|
||||
// and one compact adaptive-link line — the operator's target table, the
|
||||
// temporary CH6 maxPower ceiling, the requested runtime level and the
|
||||
// applied VTX state. Values whose producers do not exist yet render at
|
||||
// their explicit pending marks. The full final RC state stays in the
|
||||
// snapshot; the pilot-facing overlay stays terse, and static configuration
|
||||
// is never rendered as applied VTX state.
|
||||
func drawOSD(canvas Canvas, snapshot osd.Snapshot) {
|
||||
arm := "OFF"
|
||||
if snapshot.Armed {
|
||||
arm = "ARMED"
|
||||
}
|
||||
power := "OFF"
|
||||
if snapshot.Power {
|
||||
power = "ON"
|
||||
}
|
||||
canvas.Text(32, 32, "ARM "+arm)
|
||||
canvas.Text(32, 64, "PWR "+power)
|
||||
canvas.Text(32, 64, vtxLine(snapshot))
|
||||
}
|
||||
|
||||
// vtxLine is the compact adaptive-link contract line.
|
||||
func vtxLine(snapshot osd.Snapshot) string {
|
||||
return "VTX tbl:" + vtxTable(snapshot.OpConfig.Table) +
|
||||
" ceil:" + strconv.FormatUint(uint64(snapshot.OpConfig.MaxPower), 10) +
|
||||
" req:" + vtxLevel(snapshot.Policy.Pending, snapshot.Policy.Level) +
|
||||
" ack:" + vtxAck(snapshot.Ack)
|
||||
}
|
||||
|
||||
func vtxTable(table osd.Table) string {
|
||||
if !table.Selected() {
|
||||
return "--"
|
||||
}
|
||||
return strconv.FormatUint(uint64(table.Gen), 10)
|
||||
}
|
||||
|
||||
func vtxLevel(pending bool, level uint8) string {
|
||||
if pending {
|
||||
return "--"
|
||||
}
|
||||
return strconv.FormatUint(uint64(level), 10)
|
||||
}
|
||||
|
||||
func vtxAck(ack osd.VTXAck) string {
|
||||
if ack.Pending {
|
||||
return "--"
|
||||
}
|
||||
if ack.Lifecycle == osd.VTXLifecycleError {
|
||||
return "ERR"
|
||||
}
|
||||
return vtxLevel(false, ack.Level)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user