Skip to content

Restore contextual TUI reboot and WS2811 controls #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DRSDavidSoft merged 2 commits into from
Oct 1, 2026
Merged

Restore contextual TUI reboot and WS2811 controls #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75cd022
fix(tui): restore contextual reboot and strip controls
atomicdeploy Oct 1, 2026
ab912f0
fix(tui): harden contextual output routing
atomicdeploy Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 82 additions & 62 deletions Tools/Controller/internal/tui/interactions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,13 @@ func (model Model) handleKey(message tea.KeyMsg) (Model, tea.Cmd, bool) {
case "ctrl+x":
return model.closePort()
case "ctrl+r":
if firmwareRebootAvailable(model.snapshot()) {
return model.dispatchLine("reset app")
}
if snapshot := model.snapshot(); snapshot.ConnectionState == "close_failed" || snapshot.ConnectionPhase == "blocked" {
model.setNotice("Hardware reset unavailable until retained serial ownership is cleaned up")
return model, nil, true
}
return model.dispatchLine("reset lines")
case "~", "`":
model.toggleTerminal()
Expand Down Expand Up @@ -363,15 +370,19 @@ func (model Model) handleKey(message tea.KeyMsg) (Model, tea.Cmd, bool) {
model.moveCursor(1)
return model, nil, true
case "home":
if inputEmpty && model.page == PageOutputs && model.cursor >= 15 && model.cursor <= 26 {
return model.setSelectedPWM(0)
if inputEmpty && model.page == PageOutputs {
if row, ok := model.selectedOutputRow(); ok && row.Kind == "pwm" {
return model.setPWMChannel(row.Index, 0)
}
}
if inputEmpty && model.page == PageMenus {
return model.moveSelectedMenuToRank(0)
}
case "end":
if inputEmpty && model.page == PageOutputs && model.cursor >= 15 && model.cursor <= 26 {
return model.setSelectedPWM(4095)
if inputEmpty && model.page == PageOutputs {
if row, ok := model.selectedOutputRow(); ok && row.Kind == "pwm" {
return model.setPWMChannel(row.Index, 4095)
}
}
if inputEmpty && model.page == PageMenus {
return model.moveSelectedMenuToRank(len(model.activeMenuPages()) - 1)
Expand Down Expand Up @@ -478,8 +489,10 @@ func (model Model) dispatchLine(line string) (Model, tea.Cmd, bool) {
if strings.EqualFold(line, "reset app") || strings.EqualFold(line, "reset lines") {
model.rebootPending = true
if strings.EqualFold(line, "reset lines") {
model.rebootKind = "hardware"
model.setNotice("Pulsing DTR hardware reset…")
} else {
model.rebootKind = "firmware"
model.setNotice("Rebooting controller application…")
}
}
Expand Down Expand Up @@ -783,16 +796,29 @@ func (model Model) activateSelection() (Model, tea.Cmd, bool) {
func (model Model) adjustSelection(delta int) (Model, tea.Cmd, bool) {
switch model.page {
case PageOutputs:
if model.cursor >= 15 && model.cursor <= 26 {
channel := model.cursor - 15
if row, ok := model.selectedOutputRow(); ok && row.Adjust != "" {
switch row.Adjust {
case "strip-count":
pixels, _ := model.stripConfiguration()
model.stripPixels = wrapInt(pixels-1, delta, native.StripMaximumPixels) + 1
Comment thread
DRSDavidSoft marked this conversation as resolved.
Resolved
case "strip-fps":
_, fps := model.stripConfiguration()
model.stripFPS = wrapInt(fps-1, delta, 30) + 1
case "strip-color":
model.stripColor = wrapInt(model.stripColorIndex(), delta, len(stripColorPresets))
}
return model, nil, true
}
if row, ok := model.selectedOutputRow(); ok && row.Kind == "pwm" {
channel := row.Index
value := int(model.pwmValues[channel]) + delta*64
if value < 0 {
value = 4095
}
if value > 4095 {
value = 0
}
return model.setSelectedPWM(uint16(value))
return model.setPWMChannel(channel, uint16(value))
}
case PageMenus:
entry, ok := model.selectedMenuConfiguration()
Expand All @@ -812,57 +838,29 @@ func (model Model) adjustSelection(delta int) (Model, tea.Cmd, bool) {
}

func (model Model) activateOutput() (Model, tea.Cmd, bool) {
switch {
case model.cursor >= 0 && model.cursor <= 7:
return model.dispatchLine(fmt.Sprintf("relay %d toggle", model.cursor+1))
case model.cursor == 8:
return model.dispatchLine("relay off")
case model.cursor >= 9 && model.cursor <= 14:
commands := []string{
"relay side left up", "relay side left stop", "relay side left down",
"relay side right up", "relay side right stop", "relay side right down",
}
return model.dispatchLine(commands[model.cursor-9])
case model.cursor >= 15 && model.cursor <= 26:
value := model.pwmValues[model.cursor-15]
if value == 0 {
value = 2048
} else {
value = 0
if row, ok := model.selectedOutputRow(); ok {
if row.Action != "" {
return model.dispatchLine(row.Action)
}
if row.Kind == "pwm" {
value := model.pwmValues[row.Index]
if value == 0 {
value = 2048
} else {
value = 0
}
return model.setPWMChannel(row.Index, value)
}
return model.setSelectedPWM(value)
case model.cursor == 27:
return model.dispatchLine("pwm off")
}
return model, nil, true
}

func outputPeripheralDescriptor(cursor int) (appconfig.PeripheralDescriptor, bool) {
rows := make([]appconfig.PeripheralDescriptor, 0, 27)
descriptors := appconfig.PeripheralDescriptors()
for _, descriptor := range descriptors {
if descriptor.Kind == "relay" {
rows = append(rows, descriptor)
}
}
rows = append(rows, appconfig.PeripheralDescriptor{}) // All relays.
for _, descriptor := range descriptors {
if descriptor.Kind == "motion" {
for range 3 { // Up, stop, and down share one presentation name.
rows = append(rows, descriptor)
}
}
}
for _, descriptor := range descriptors {
if descriptor.Control == "pwm-user" {
rows = append(rows, descriptor)
}
}
rows = append(rows, appconfig.PeripheralDescriptor{}) // All user PWM.
if cursor < 0 || cursor >= len(rows) || rows[cursor].Key == "" {
return appconfig.PeripheralDescriptor{}, false
func (model Model) selectedOutputRow() (controlTableRow, bool) {
rows := model.controlTableRows(model.snapshot(), 8)
if model.cursor < 0 || model.cursor >= len(rows) {
return controlTableRow{}, false
}
return rows[cursor], true
return rows[model.cursor], true
}

func (model Model) peripheralName(key, fallback string) string {
Expand All @@ -873,11 +871,21 @@ func (model Model) peripheralName(key, fallback string) string {
}

func (model Model) beginPeripheralRename() (Model, tea.Cmd, bool) {
descriptor, ok := outputPeripheralDescriptor(model.cursor)
if !ok {
row, ok := model.selectedOutputRow()
if !ok || row.PeripheralKey == "" {
model.setNotice("Select a relay, motion side, or PWM channel before renaming")
return model, nil, true
}
var descriptor appconfig.PeripheralDescriptor
for _, candidate := range appconfig.PeripheralDescriptors() {
if candidate.Key == row.PeripheralKey {
descriptor, ok = candidate, true
break
}
}
if !ok {
return model, nil, true
}
return model.beginPeripheralRenameDescriptor(descriptor)
}

Expand Down Expand Up @@ -988,7 +996,14 @@ func (model Model) savePeripheralName(descriptor appconfig.PeripheralDescriptor,
}

func (model Model) setSelectedPWM(value uint16) (Model, tea.Cmd, bool) {
channel := model.cursor - 15
row, ok := model.selectedOutputRow()
if !ok || row.Kind != "pwm" {
return model, nil, true
}
return model.setPWMChannel(row.Index, value)
}

func (model Model) setPWMChannel(channel int, value uint16) (Model, tea.Cmd, bool) {
if channel < 0 || channel > 11 {
return model, nil, true
}
Expand Down Expand Up @@ -1834,7 +1849,7 @@ func (model Model) handleMouse(message tea.MouseMsg) (tea.Model, tea.Cmd) {
return model, nil
}
if message.Action == tea.MouseActionMotion && message.Button == tea.MouseButtonLeft && model.pwmDragChannel >= 0 {
return model.setOutputPWMFromX(15+model.pwmDragChannel, message.X)
return model.setOutputPWMFromX(model.cursor, message.X)
}
}
if message.Action == tea.MouseActionRelease && model.page == PageMenus && !model.portPicker {
Expand Down Expand Up @@ -1910,7 +1925,10 @@ func (model Model) handleActionBarClick(x int) (tea.Model, tea.Cmd) {
case "close":
updated, command, _ := model.closePort()
return updated, command
case "reboot":
case "firmware-reboot":
updated, command, _ := model.dispatchLine("reset app")
return updated, command
case "hardware-reset":
updated, command, _ := model.dispatchLine("reset lines")
return updated, command
case "refresh":
Expand Down Expand Up @@ -1977,14 +1995,14 @@ func (model Model) handleContentClick(row, x int) (tea.Model, tea.Cmd) {
index, ok := controlTableLogicalAt(rows, tableBodyRows(model.contentHeight()), model.cursor, row-3)
if ok {
model.cursor = index
if index >= 15 && index <= 26 {
if selected := rows[index]; selected.Kind == "pwm" {
tableStart := max(0, (model.width-tableWidth)/2)
levelWidth := max(8, columns[1].Width-7)
sliderStart := tableStart + 1 + columns[0].Width + 1
if x < sliderStart-1 || x > sliderStart+levelWidth {
return model, nil
}
model.pwmDragChannel = index - 15
model.pwmDragChannel = selected.Index
model.pwmDragSet = false
return model.setOutputPWMFromX(index, x)
}
Expand Down Expand Up @@ -2084,9 +2102,11 @@ func (model Model) handleContentClick(row, x int) (tea.Model, tea.Cmd) {
}

func (model Model) setOutputPWMFromX(index, x int) (tea.Model, tea.Cmd) {
if index < 15 || index > 26 {
rows := model.controlTableRows(model.snapshot(), 8)
if index < 0 || index >= len(rows) || rows[index].Kind != "pwm" {
return model, nil
}
channel := rows[index].Index
tableWidth := model.presentationTableWidth(118)
columns := outputTableColumns(tableWidth)
tableStart := max(0, (model.width-tableWidth)/2)
Expand All @@ -2096,13 +2116,13 @@ func (model Model) setOutputPWMFromX(index, x int) (tea.Model, tea.Cmd) {
percent = min(100, max(0, percent))
value := uint16(percent * 4095 / 100)
model.cursor = index
model.pwmDragChannel = index - 15
model.pwmDragChannel = channel
if model.pwmDragSet && model.pwmDragValue == value {
return model, nil
}
model.pwmDragValue = value
model.pwmDragSet = true
updated, command, _ := model.setSelectedPWM(value)
updated, command, _ := model.setPWMChannel(channel, value)
return updated, command
}

Expand Down
26 changes: 24 additions & 2 deletions Tools/Controller/internal/tui/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ type Model struct {
connectRetryAt time.Time
connectRetryDelay time.Duration
rebootPending bool
rebootKind string
statusPending bool
uiConfig func() appconfig.UI
saveUI func(appconfig.UI) error
Expand Down Expand Up @@ -126,6 +127,9 @@ type Model struct {
pwmDragValue uint16
pwmDragSet bool
pwmPending bool
stripPixels int
stripFPS int
stripColor int
lastPWMRefresh time.Time
overrideIllumination func(context.Context, uint16) (uint16, error)
portPicker bool
Expand Down Expand Up @@ -1025,6 +1029,7 @@ func (model Model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
if strings.EqualFold(strings.TrimSpace(message.line), "reset app") ||
strings.EqualFold(strings.TrimSpace(message.line), "reset lines") {
model.rebootPending = false
model.rebootKind = ""
}

if errors.Is(message.err, shell.ErrExit) {
Expand Down Expand Up @@ -1473,8 +1478,10 @@ func (model Model) applyAppAction(action hostui.AppAction) (Model, []tea.Cmd, bo
strings.EqualFold(strings.TrimSpace(action.Value), "reset lines") {
model.rebootPending = true
if strings.EqualFold(strings.TrimSpace(action.Value), "reset lines") {
model.rebootKind = "hardware"
model.setNotice("Pulsing DTR hardware reset…")
} else {
model.rebootKind = "firmware"
model.setNotice("Rebooting controller application…")
}
}
Expand Down Expand Up @@ -2140,9 +2147,19 @@ func (model Model) actionBarItems(snapshot control.Snapshot) []actionBarItem {
items = append(items, actionBarItem{label: "O Open", action: "open", style: buttonGoodStyle})
}
rebootLabel := "^R HW Reset"
rebootAction := "reboot"
rebootAction := "hardware-reset"
if firmwareRebootAvailable(snapshot) {
rebootLabel = "^R Reboot"
rebootAction = "firmware-reboot"
} else if snapshot.ConnectionState == "close_failed" || snapshot.ConnectionPhase == "blocked" {
rebootLabel = "^R Close blocked"
rebootAction = ""
}
if model.rebootPending {
rebootLabel = model.spinnerView() + " Resetting"
rebootLabel = model.spinnerView() + " Rebooting"
Comment thread
DRSDavidSoft marked this conversation as resolved.
Resolved
if model.rebootKind == "hardware" {
rebootLabel = model.spinnerView() + " HW Resetting"
}
rebootAction = ""
}
items = append(items,
Expand All @@ -2159,6 +2176,11 @@ func (model Model) actionBarItems(snapshot control.Snapshot) []actionBarItem {
return items
}

func firmwareRebootAvailable(snapshot control.Snapshot) bool {
return snapshot.Connected && snapshot.Hello.IsPCController() &&
snapshot.ConnectionState != "close_failed" && snapshot.ConnectionPhase != "blocked"
}

func (model Model) actionBar(snapshot control.Snapshot) string {
items := model.actionBarItems(snapshot)
buttons := make([]string, 0, len(items))
Expand Down
Loading
Loading