ESilvaLabs/esdi
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Created a devices service and moved the CDashDisplay service to the sahdow realm

Browse Source
This commit is contained in:
esilva
2026-09-17 23:01:50 +01:00
parent 66012b6904
commit afc4b794bb
19 changed files with 444 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tui/internal/controllers/layout.go → tui/internal/controllers/cdashdisplay_layout.go
+105 -11
View File
@@ -5,11 +5,12 @@ import (
"os"
"strconv"
"esdi/cdashdisplay"
helper "esdi/helpers"
"esdi/devices/cdashdisplay"
"esdi/services"
"esdi/tui/internal/views"
helper "esdi/helpers"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"
)
@@ -19,12 +20,14 @@ type LayoutController struct {
OnExit func()
LayoutToolView *views.LayoutToolView
Messages chan string
DevService *services.CDashService
DevService *services.DeviceService
MoveToolState *windowManipState
SelectedLayout string // NOTE: This should be a struct to handle its own things
// TODO: create a filter to select the layout
// filter telemetry provider, then filter vehicle in use and so on
}
func NewLayoutController(base *Controller, service *services.CDashService) *LayoutController {
func NewLayoutController(base *Controller, service *services.DeviceService) *LayoutController {
lc := &LayoutController{
Controller: base,
LayoutToolView: views.NewLayoutToolView(),
@@ -207,7 +210,20 @@ func (lc *LayoutController) createWindow() {
return
}
window, err = lc.DevService.CreateWindow(window)
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
window, err = display.CreateWindow(window)
if err != nil {
lc.Messages <- "failed to create window\n"
return
@@ -304,7 +320,20 @@ func (lc *LayoutController) newWindowAction() {
}
func (lc *LayoutController) updateWindowAction(win *cdashdisplay.DesktopUIWindow) {
err := lc.DevService.UpdateWindow(win)
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
err = display.UpdateWindow(win)
lc.Messages <- fmt.Sprintf("Window: %v\n", win)
@@ -317,7 +346,20 @@ func (lc *LayoutController) updateWindowAction(win *cdashdisplay.DesktopUIWindow
func (lc *LayoutController) displayLoadedLayouts() {
lc.Logger.Debug("We want to view our layout!")
for _, w := range lc.DevService.CDash.State.Layout.Windows {
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
for _, w := range display.State.Layout.Windows {
lc.Logger.Debug("==========================================================================")
lc.Logger.Debug(fmt.Sprintf("updating form view for a layout: %+v", w.UIData.TelemetryField))
err := lc.updateFormView(w)
@@ -349,8 +391,21 @@ func (lc *LayoutController) getCurrentTreeNodeModel() (*tview.TreeNode, int16, e
}
func (lc *LayoutController) loadLayout() {
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
// We would get the layout path from somewhere but for nots its layout.yaml
err := lc.DevService.LoadLayout(lc.SelectedLayout)
err = display.LoadLayout(lc.SelectedLayout)
if err != nil {
lc.Messages <- "failed to load layout: " + err.Error()
return
@@ -360,7 +415,20 @@ func (lc *LayoutController) loadLayout() {
}
func (lc *LayoutController) unloadLayout() {
err := lc.DevService.UnloadLayout()
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
err = display.UnloadLayout()
if err != nil {
lc.Logger.Error(fmt.Sprintf("Failed to unload layout: %+v", err))
return
@@ -368,7 +436,20 @@ func (lc *LayoutController) unloadLayout() {
}
func (lc *LayoutController) saveLayout() {
err := lc.DevService.SaveLayout(lc.SelectedLayout)
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
err = display.SaveLayout(lc.SelectedLayout)
if err != nil {
lc.Messages <- "failed to save layout: " + err.Error()
return
@@ -388,8 +469,21 @@ func (lc *LayoutController) deleteWindow() {
}
wID := curNode.GetReference().(int16)
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
// Delete it
err := lc.DevService.DeleteWindow(wID)
err = display.DestroyWindow(wID)
if err != nil {
lc.Messages <- "failed to delete window: " + err.Error() + "\n"
return
tui/internal/controllers/layout_moveTool.go → tui/internal/controllers/cdashdisplay_layout_moveTool.go
+35 -6
View File
@@ -1,6 +1,7 @@
package controllers
import (
"esdi/devices/cdashdisplay"
helper "esdi/helpers"
"github.com/gdamore/tcell/v2"
@@ -43,40 +44,68 @@ func keyToVector(r rune) (helper.Vector, bool) {
}
func (lc *LayoutController) handleMovementCapture(idx int16,
ev *tcell.EventKey) *tcell.EventKey {
ev *tcell.EventKey,
) *tcell.EventKey {
vec, ok := keyToVector(ev.Rune())
if !ok {
return nil
}
err := lc.DevService.MoveWindow(idx, &vec)
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return nil
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return nil
}
// ---
err = display.MoveWindow(idx, &vec)
if err != nil {
lc.Messages <- "failed to move window: " + err.Error() + "\n"
return nil
}
// Success - update the form
window := lc.DevService.CDash.State.Layout.Windows[idx]
window := display.State.Layout.Windows[idx]
lc.LayoutToolView.UpdateFormView(idx, window)
return nil
}
func (lc *LayoutController) handleResizeCapture(idx int16,
ev *tcell.EventKey) *tcell.EventKey {
ev *tcell.EventKey,
) *tcell.EventKey {
vec, ok := keyToVector(ev.Rune())
if !ok {
return nil
}
err := lc.DevService.ResizeWindow(idx, &vec)
// Acquire the cdashdisplay
displayIF, err := lc.DevService.GetDevice(cdashdisplay.Name)
if err != nil {
lc.Messages <- "failed to get " + cdashdisplay.Name
return nil
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
lc.Messages <- "failed to acquire " + cdashdisplay.Name
return nil
}
// ---
err = display.ResizeWindow(idx, &vec)
if err != nil {
lc.Messages <- "failed to resize window: " + err.Error() + "\n"
return nil
}
// Success - update the form
window := lc.DevService.CDash.State.Layout.Windows[idx]
window := display.State.Layout.Windows[idx]
lc.LayoutToolView.UpdateFormView(idx, window)
return nil
tui/internal/controllers/device.go
+5 -4
View File
@@ -15,12 +15,12 @@ type DeviceController struct {
DeviceAPIView *views.DeviceAPIView
LayoutCtrl *LayoutController
StreamCtrl *StreamingCtrl
DevService *serv.CDashService
DevService *serv.DeviceService
}
func NewDeviceController(
base *Controller,
devService *serv.CDashService,
devService *serv.DeviceService,
telemService *serv.TelemetryService,
) *DeviceController {
mc := &DeviceController{
@@ -56,7 +56,7 @@ func (mc *DeviceController) setDeviceAPIViewEvents() {
SetInputCapture(func(ev *tcell.EventKey) *tcell.EventKey {
switch ev.Rune() {
case 'r':
go mc.DevService.FindDevice()
go mc.DevService.FindDevices()
}
return ev
})
@@ -75,7 +75,8 @@ func (mc *DeviceController) AddDeviceAPIListItems() {
})
mc.DeviceAPIView.DevAPIList.
AddItem("stream", "stream data to the display", func() {
views.AddAndShowPage(mc.DeviceAPIView.DevAPIToolView.Pages,
views.AddAndShowPage(
mc.DeviceAPIView.DevAPIToolView.Pages,
"streaming-tool",
mc.StreamCtrl.StreamView.Flex,
)
tui/internal/controllers/streaming.go
+19 -5
View File
@@ -6,6 +6,7 @@ import (
"sync/atomic"
"esdi/config"
"esdi/devices/cdashdisplay"
"esdi/providers"
"esdi/services"
"esdi/telemetry"
@@ -17,7 +18,7 @@ import (
type StreamingCtrl struct {
*Controller
Service *services.CDashService
Service *services.DeviceService
StreamView *views.StreamToolView
Messages chan string
Internal chan string
@@ -32,7 +33,7 @@ type StreamingCtrl struct {
func NewStreamingCtrl(
base *Controller,
serCDash *services.CDashService,
devService *services.DeviceService,
serTelem *services.TelemetryService,
) *StreamingCtrl {
// NOTE: looks sus, put this somewhere also. Not very good in here
@@ -44,7 +45,7 @@ func NewStreamingCtrl(
ctrl := &StreamingCtrl{
Controller: base,
Service: serCDash,
Service: devService,
TelemServ: serTelem,
Messages: make(chan string, 10),
Internal: make(chan string, 10),
@@ -155,9 +156,22 @@ func (sc *StreamingCtrl) updateStream() {
// Performance reasoning: this is not used during the high frequency data transmission
// so we can get away with using a map for convenience here
func (sc *StreamingCtrl) SetInternalState() {
fields := make(map[int16]telemetry.FieldID, len(sc.Service.CDash.State.Layout.Windows))
// Acquire the cdashdisplay
displayIF, err := sc.Service.GetDevice(cdashdisplay.Name)
if err != nil {
sc.Messages <- "failed to get " + cdashdisplay.Name
return
}
display, ok := displayIF.(*cdashdisplay.CDashDisplay)
if !ok {
sc.Messages <- "failed to acquire " + cdashdisplay.Name
return
}
// ---
for _, w := range sc.Service.CDash.State.Layout.Windows {
fields := make(map[int16]telemetry.FieldID, len(display.State.Layout.Windows))
for _, w := range display.State.Layout.Windows {
fieldID, _ := telemetry.GetFieldID(w.UIData.TelemetryField)
fields[w.UIData.IDX] = fieldID
}