Created a devices service and moved the CDashDisplay service to the sahdow realm
This commit is contained in:
+119
-136
@@ -1,148 +1,131 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"sync/atomic"
|
||||
// type CDashService struct {
|
||||
// Logger *slog.Logger
|
||||
// CDash *cdashdisplay.CDashDisplay
|
||||
// // DevClerk *peripheral.PeripheralDeviceClerk
|
||||
// // Messages chan string
|
||||
// // Telemetry Channel
|
||||
// // streamCancel context.CancelFunc
|
||||
// // TelemCh <-chan telemetry.TelemetryData
|
||||
// }
|
||||
|
||||
"esdi/cdashdisplay"
|
||||
helper "esdi/helpers"
|
||||
"esdi/peripheral"
|
||||
"esdi/telemetry"
|
||||
)
|
||||
// func NewCDashService(logger *slog.Logger) *CDashService {
|
||||
// // sharedChannel := make(chan string, 10)
|
||||
// return &CDashService{
|
||||
// Logger: logger,
|
||||
// CDash: nil,
|
||||
// // DevClerk: peripheral.NewPeripheralDeviceClerk(),
|
||||
// // Messages: sharedChannel,
|
||||
// }
|
||||
// }
|
||||
|
||||
type CDashService struct {
|
||||
Logger *slog.Logger
|
||||
CDash *cdashdisplay.CDashDisplay
|
||||
DevClerk *peripheral.PeripheralDeviceClerk
|
||||
Messages chan string
|
||||
// Telemetry Channel
|
||||
streamCancel context.CancelFunc
|
||||
TelemCh <-chan telemetry.TelemetryData
|
||||
}
|
||||
// func (ds *CDashService) FindDevice() {
|
||||
// ds.Messages <- "looking for cdash display...\n"
|
||||
// ds.Logger.Info("Looking for CDashDisplay")
|
||||
|
||||
func NewCDashService(logger *slog.Logger) *CDashService {
|
||||
sharedChannel := make(chan string, 10)
|
||||
return &CDashService{
|
||||
Logger: logger,
|
||||
CDash: nil,
|
||||
DevClerk: peripheral.NewPeripheralDeviceClerk(),
|
||||
Messages: sharedChannel,
|
||||
}
|
||||
}
|
||||
// cdashdisplay.SetLogger(ds.Logger.With("[device]", "cdashdisplay"))
|
||||
|
||||
func (cds *CDashService) FindDevice() {
|
||||
cds.Messages <- "looking for cdash display...\n"
|
||||
cds.Logger.Info("Looking for CDashDisplay")
|
||||
// display, err := cdashdisplay.Discover()
|
||||
// if err != nil {
|
||||
// ds.Logger.Info("didn't find cdashdisplay")
|
||||
// ds.Messages <- "didn't find cdash display\n"
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// ds.CDash = display
|
||||
// ds.Logger.Info("found cdashdisplay on: " + display.WT.Cfg.Name)
|
||||
// ds.Messages <- "found cdashdisplay on: " + display.WT.Cfg.Name + "\n"
|
||||
// }
|
||||
|
||||
cdashdisplay.SetLogger(cds.Logger.With("[device]", "cdashdisplay"))
|
||||
// func (ds *CDashService) CreateWindow(
|
||||
// win *cdashdisplay.DesktopUIWindow,
|
||||
// ) (*cdashdisplay.DesktopUIWindow, error) {
|
||||
// updatedWindow, err := ds.CDash.CreateWindow(win)
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
//
|
||||
// return updatedWindow, nil
|
||||
// }
|
||||
//
|
||||
// func (ds *CDashService) LoadLayout(layoutPath string) error {
|
||||
// return ds.CDash.LoadLayout(layoutPath)
|
||||
// }
|
||||
//
|
||||
// func (ds *CDashService) SaveLayout(layoutPath string) error {
|
||||
// return ds.CDash.SaveLayout(layoutPath)
|
||||
// }
|
||||
//
|
||||
// func (ds *CDashService) UnloadLayout() error {
|
||||
// return ds.CDash.UnloadLayout()
|
||||
// }
|
||||
//
|
||||
// func (ds *CDashService) UpdateWindow(win *cdashdisplay.DesktopUIWindow) error {
|
||||
// ds.Messages <- fmt.Sprintf("Updating a window:\n%+v\n", win)
|
||||
// return ds.CDash.UpdateWindow(win)
|
||||
// }
|
||||
//
|
||||
// func (ds *CDashService) DeleteWindow(idx int16) error {
|
||||
// return ds.CDash.DestroyWindow(idx)
|
||||
// }
|
||||
//
|
||||
// func (ds *CDashService) ResizeWindow(idx int16, vec *helper.Vector) error {
|
||||
// err := ds.CDash.ResizeWindow(idx, vec)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
//
|
||||
// return nil
|
||||
// }
|
||||
//
|
||||
// func (ds *CDashService) MoveWindow(idx int16, vec *helper.Vector) error {
|
||||
// return ds.CDash.MoveWindow(idx, vec)
|
||||
// }
|
||||
|
||||
display, err := cdashdisplay.NewCDashDisplay()
|
||||
if err != nil {
|
||||
cds.Logger.Info("didn't find cdashdisplay")
|
||||
cds.Messages <- "didn't find cdash display\n"
|
||||
return
|
||||
}
|
||||
// func (ds *CDashService) SetTelemetryChannel(ch <-chan telemetry.TelemetryData) {
|
||||
// ds.TelemCh = ch
|
||||
// }
|
||||
|
||||
cds.CDash = display
|
||||
cds.Logger.Info("found cdashdisplay on: " + display.WT.Cfg.Name)
|
||||
cds.Messages <- "found cdashdisplay on: " + display.WT.Cfg.Name + "\n"
|
||||
}
|
||||
|
||||
func (cds *CDashService) CreateWindow(
|
||||
win *cdashdisplay.DesktopUIWindow,
|
||||
) (*cdashdisplay.DesktopUIWindow, error) {
|
||||
updatedWindow, err := cds.CDash.CreateWindow(win)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return updatedWindow, nil
|
||||
}
|
||||
|
||||
func (cds *CDashService) LoadLayout(layoutPath string) error {
|
||||
return cds.CDash.LoadLayout(layoutPath)
|
||||
}
|
||||
|
||||
func (cds *CDashService) SaveLayout(layoutPath string) error {
|
||||
return cds.CDash.SaveLayout(layoutPath)
|
||||
}
|
||||
|
||||
func (cds *CDashService) UnloadLayout() error {
|
||||
return cds.CDash.UnloadLayout()
|
||||
}
|
||||
|
||||
func (cds *CDashService) UpdateWindow(win *cdashdisplay.DesktopUIWindow) error {
|
||||
cds.Messages <- fmt.Sprintf("Updating a window:\n%+v\n", win)
|
||||
return cds.CDash.UpdateWindow(win)
|
||||
}
|
||||
|
||||
func (cds *CDashService) DeleteWindow(idx int16) error {
|
||||
return cds.CDash.DestroyWindow(idx)
|
||||
}
|
||||
|
||||
func (cds *CDashService) ResizeWindow(idx int16, vec *helper.Vector) error {
|
||||
err := cds.CDash.ResizeWindow(idx, vec)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cds *CDashService) MoveWindow(idx int16, vec *helper.Vector) error {
|
||||
err := cds.CDash.MoveWindow(idx, vec)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cds *CDashService) SetTelemetryChannel(ch <-chan telemetry.TelemetryData) {
|
||||
cds.TelemCh = ch
|
||||
}
|
||||
|
||||
func (cds *CDashService) StartStream() {
|
||||
// NOTE: i'm using this pattern a whole lot. Maybe I can create a struct to handle this
|
||||
var ctx context.Context
|
||||
ctx, cds.streamCancel = context.WithCancel(context.Background())
|
||||
|
||||
go cds.transmit(ctx)
|
||||
}
|
||||
|
||||
func (cds *CDashService) StopStream() {
|
||||
if cds.streamCancel == nil {
|
||||
return
|
||||
}
|
||||
|
||||
cds.streamCancel()
|
||||
cds.streamCancel = nil
|
||||
}
|
||||
// func (cds *CDashService) StartStream() {
|
||||
// // NOTE: i'm using this pattern a whole lot. Maybe I can create a struct to handle this
|
||||
// var ctx context.Context
|
||||
// ctx, cds.streamCancel = context.WithCancel(context.Background())
|
||||
//
|
||||
// go cds.transmit(ctx)
|
||||
// }
|
||||
//
|
||||
// func (cds *CDashService) StopStream() {
|
||||
// if cds.streamCancel == nil {
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// cds.streamCancel()
|
||||
// cds.streamCancel = nil
|
||||
// }
|
||||
|
||||
// INTERNAL
|
||||
|
||||
func (cds *CDashService) transmit(ctx context.Context) {
|
||||
var isSending atomic.Bool
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case data, ok := <-cds.TelemCh:
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
if isSending.Load() {
|
||||
continue
|
||||
}
|
||||
|
||||
isSending.Store(true)
|
||||
|
||||
cds.CDash.SendData(&data)
|
||||
isSending.Store(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
// func (ds *CDashService) transmit(ctx context.Context) {
|
||||
// var isSending atomic.Bool
|
||||
//
|
||||
// for {
|
||||
// select {
|
||||
// case <-ctx.Done():
|
||||
// return
|
||||
// case data, ok := <-ds.TelemCh:
|
||||
// if !ok {
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// if isSending.Load() {
|
||||
// continue
|
||||
// }
|
||||
//
|
||||
// isSending.Store(true)
|
||||
//
|
||||
// ds.CDash.SendData(&data)
|
||||
// isSending.Store(false)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user