Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e07f7f42de | ||
|
|
2fd6f6abb6 | ||
|
|
d102a45bee | ||
|
|
db30d9146d | ||
|
|
481b746aef | ||
|
|
48b10afbba | ||
|
|
584d13e1fd | ||
|
|
d677c66a22 | ||
|
|
d14649d80c |
@@ -1,5 +1,11 @@
|
||||
package constants
|
||||
|
||||
// Peripheral Names
|
||||
const (
|
||||
CDashDisplay = "CDashDisplay"
|
||||
UIView = "UIView"
|
||||
)
|
||||
|
||||
// Provider Names
|
||||
const (
|
||||
IRacingProviderName = "iRacing"
|
||||
|
||||
@@ -405,6 +405,11 @@ func (d *CDashDisplay) UnloadLayout() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cds *CDashDisplay) resetState() {
|
||||
cds.fieldToWindows = make(map[telemetry.FieldID][]int16)
|
||||
cds.State.Layout = NewLayoutTree()
|
||||
}
|
||||
|
||||
func (cds *CDashDisplay) reset() error {
|
||||
err := cds.WT.SendCommand(resetCMDID, []byte{0x01, 0x02, 0x03, 0x04}, nil)
|
||||
if err != nil {
|
||||
@@ -413,6 +418,8 @@ func (cds *CDashDisplay) reset() error {
|
||||
|
||||
time.Sleep(3000 * time.Millisecond)
|
||||
|
||||
cds.resetState()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package uidevice
|
||||
|
||||
import (
|
||||
"esdi/constants"
|
||||
"esdi/peripheral"
|
||||
"esdi/telemetry"
|
||||
)
|
||||
@@ -9,7 +10,7 @@ type UIDevice struct {
|
||||
dataChan chan telemetry.TelemetryData
|
||||
}
|
||||
|
||||
const NAME = "UIView"
|
||||
const NAME = constants.UIView
|
||||
|
||||
func NewUIDevice() (peripheral.Peripheral, error) {
|
||||
return &UIDevice{
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
module esdi
|
||||
|
||||
go 1.27.0
|
||||
go 1.26.0
|
||||
|
||||
require (
|
||||
github.com/ESilva15/ESgoRepl v0.1.0
|
||||
github.com/ESilva15/gobngsdk v1.1.3
|
||||
github.com/ESilva15/goirsdk v0.3.0
|
||||
github.com/ESilva15/gobngsdk v1.2.0
|
||||
github.com/ESilva15/goirsdk v0.3.9
|
||||
github.com/arl/statsviz v0.8.0
|
||||
github.com/gdamore/tcell/v2 v2.8.1
|
||||
github.com/rivo/tview v0.42.0
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
github.com/ESilva15/ESgoRepl v0.1.0 h1:hOVcRBfdP8Yw1kLr2tFoM3SetV7vxFswKjzfAtq8UgM=
|
||||
github.com/ESilva15/ESgoRepl v0.1.0/go.mod h1:O2JQMyEgHy0zf9UvzvLNvp2w95T2uazc3torrzRmG9Y=
|
||||
github.com/ESilva15/gobngsdk v1.1.3 h1:CFaz2KjHKnBLrQuEN1QHOd1761cWM/rmTwLpSLrgbe4=
|
||||
github.com/ESilva15/gobngsdk v1.1.3/go.mod h1:cKLaZRgM0tGGXDvosaSjHnxeyC5Y6rg7zCLqEUJnOzw=
|
||||
github.com/ESilva15/goirsdk v0.3.0 h1:6D95Avq7chikGHwEUKh7Y/HaLHOWQ75Qxaz8oMDSfrw=
|
||||
github.com/ESilva15/goirsdk v0.3.0/go.mod h1:5borQbw+L4fe9b58JFHRHZwrzz0sMVAteuYbRnFOc0Q=
|
||||
github.com/ESilva15/gobngsdk v1.2.0 h1:jX2ByFaIHnjCdPmrj1JiqCoNRLyu4vqIXC7++EUOCK4=
|
||||
github.com/ESilva15/gobngsdk v1.2.0/go.mod h1:cKLaZRgM0tGGXDvosaSjHnxeyC5Y6rg7zCLqEUJnOzw=
|
||||
github.com/ESilva15/goirsdk v0.3.9 h1:p+C7JtTTlo75Tq+CMH4bL70rItSLIotkXcHx+mCgSuc=
|
||||
github.com/ESilva15/goirsdk v0.3.9/go.mod h1:5borQbw+L4fe9b58JFHRHZwrzz0sMVAteuYbRnFOc0Q=
|
||||
github.com/arl/statsviz v0.8.0 h1:O6GjjVxEDxcByAucOSl29HaGYLXsuwA3ujJw8H9E7/U=
|
||||
github.com/arl/statsviz v0.8.0/go.mod h1:XlrbiT7xYT03xaW9JMMfD8KFUhBOESJwfyNJu83PbB0=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
// Package devices will define the available devices we can communicate with
|
||||
package devices
|
||||
|
||||
import "esdi/peripheral/types"
|
||||
import (
|
||||
"esdi/constants"
|
||||
"esdi/peripheral/types"
|
||||
)
|
||||
|
||||
// IDs for our devices. They need to be correctly mapped on the devices
|
||||
// themselves so we can discover them
|
||||
const (
|
||||
CDashDisplayDevID = 0x01
|
||||
CDashDisplayDevName = "CDashDisplay"
|
||||
CDashDisplayDevName = constants.CDashDisplay
|
||||
ESBtnBoxDevID = 0x02
|
||||
)
|
||||
|
||||
|
||||
+11
-12
@@ -186,13 +186,11 @@ func (b *BeamNG) Subscribe(requestFields []telemetry.FieldID) []string {
|
||||
|
||||
// Internal
|
||||
|
||||
func (b *BeamNG) readData() {
|
||||
slog.Debug("READING THIS DATA")
|
||||
func (b *BeamNG) readData() error {
|
||||
ogSnapshot, err := b.SDK.Update()
|
||||
slog.Debug("THE DATA WAS READ")
|
||||
if err != nil {
|
||||
slog.Error("Error getting data", "error", err)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
b.mut.Lock()
|
||||
@@ -200,22 +198,20 @@ func (b *BeamNG) readData() {
|
||||
defer b.mut.Unlock()
|
||||
|
||||
// Read 1 to 1 data
|
||||
slog.Debug("Reading normal data binds")
|
||||
for _, bind := range b.data.ActiveBinds {
|
||||
slog.Debug("Current bind: ", "id", bind.ID)
|
||||
b.updaters[bind.ID](&b.data.Values[bind.ID])
|
||||
}
|
||||
|
||||
// Set up virtual binds
|
||||
slog.Debug("Entering virtual binds loop")
|
||||
for _, vBind := range b.data.VirtualBinds {
|
||||
// NOTE: delete the logs here, they are really bad
|
||||
slog.Debug("Processing virtual binds")
|
||||
vBind.Process(b.data)
|
||||
}
|
||||
|
||||
b.data.PenultimateDataPoll = b.data.LastDataPoll
|
||||
b.data.LastDataPoll = time.Now()
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (b *BeamNG) stream(ctx context.Context) <-chan telemetry.TelemetryData {
|
||||
@@ -239,14 +235,17 @@ func (b *BeamNG) stream(ctx context.Context) <-chan telemetry.TelemetryData {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-b.ticker.C:
|
||||
slog.Debug("READING DATA")
|
||||
b.readData()
|
||||
slog.Debug("READ DATA")
|
||||
err := b.readData()
|
||||
if err != nil {
|
||||
if b.streamCancel != nil {
|
||||
b.streamCancel()
|
||||
}
|
||||
}
|
||||
|
||||
// Publish data
|
||||
select {
|
||||
case outCh <- *b.data:
|
||||
slog.Debug("PUBLISHED DATA")
|
||||
// Successfuly read and sent data
|
||||
default:
|
||||
// skip this data, don't allow publishers to lag behind
|
||||
}
|
||||
|
||||
@@ -143,8 +143,8 @@ func (i *IRacing) stream(ctx context.Context) <-chan telemetry.TelemetryData {
|
||||
|
||||
// Put this into the configuration file
|
||||
consecutiveTimeouts := 0
|
||||
maxTimeouts := 30
|
||||
dataEvTimeout := 100
|
||||
maxTimeouts := 10
|
||||
dataEvTimeout := 30
|
||||
for {
|
||||
// Explicitly intercept cancellation
|
||||
select {
|
||||
|
||||
+11
-1
@@ -83,14 +83,17 @@ func (ds *DeviceService) PeripheralExists(pname string) bool {
|
||||
// Getters [END] ---------------------------------------------------------------
|
||||
|
||||
// Actions [START] -------------------------------------------------------------
|
||||
func (ds *DeviceService) StartStream() {
|
||||
func (ds *DeviceService) StartStream(ch <-chan telemetry.TelemetryData) {
|
||||
// NOTE: i'm using this pattern a whole lot. Maybe I can create a struct to handle this
|
||||
ds.SetTelemetryChannel(ch)
|
||||
|
||||
var ctx context.Context
|
||||
ctx, ds.streamCancel = context.WithCancel(context.Background())
|
||||
|
||||
ds.PSS.OnStartStream()
|
||||
|
||||
go ds.transmit(ctx)
|
||||
ds.Messages <- "Device service started stream\n"
|
||||
}
|
||||
|
||||
func (ds *DeviceService) StopStream() {
|
||||
@@ -104,6 +107,11 @@ func (ds *DeviceService) StopStream() {
|
||||
ds.streamCancel = nil
|
||||
}
|
||||
|
||||
func (ds *DeviceService) SetPeripheralUserConfigMode(pname string) error {
|
||||
ds.PSS.setDeviceBeingConfiguredByUser(pname)
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetTelemetryChannel sets the TelemCh to the passed channel
|
||||
func (ds *DeviceService) SetTelemetryChannel(ch <-chan telemetry.TelemetryData) {
|
||||
ds.TelemCh = ch
|
||||
@@ -154,6 +162,8 @@ func (ds *DeviceService) peripheralConfigured(pname string, fields []telemetry.F
|
||||
// We need to retrigger field subscription here
|
||||
subscribedTo := ds.triggerFieldSubscription(fields)
|
||||
ds.Messages <- fmt.Sprintf("subscribed to fields: %q\n", subscribedTo)
|
||||
|
||||
ds.PSS.OnStartStreamPeripheral(pname)
|
||||
}
|
||||
|
||||
// Callbacks [END] -------------------------------------------------------------
|
||||
|
||||
@@ -1 +1,6 @@
|
||||
package services
|
||||
|
||||
func (ds *DeviceService) OnStoppedMidStream() {
|
||||
// Need to make every device be unconfigured
|
||||
ds.StopStream()
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ const (
|
||||
DeviceIsConnected
|
||||
DeviceIsUnconfigured
|
||||
DeviceIsConfiguring
|
||||
DeviceBeingConfiguredByUser
|
||||
DeviceIsConfigured
|
||||
DeviceIsStreaming
|
||||
)
|
||||
@@ -50,6 +51,8 @@ func DeviceStateToStr(state DeviceState) string {
|
||||
return "DeviceIsUnconfigured"
|
||||
case DeviceIsConfiguring:
|
||||
return "DeviceIsConfiguring"
|
||||
case DeviceBeingConfiguredByUser:
|
||||
return "DeviceBeingConfiguredByUser"
|
||||
case DeviceIsConfigured:
|
||||
return "DeviceIsConfigured"
|
||||
case DeviceIsStreaming:
|
||||
@@ -211,14 +214,25 @@ func (pss *PeripheralStateStore) OnStartStream() {
|
||||
}
|
||||
}
|
||||
|
||||
func (pss *PeripheralStateStore) OnStartStreamPeripheral(pname string) {
|
||||
state, err := pss.GetState(pname)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if state.State == DeviceIsConfigured {
|
||||
pss.setDeviceIsStreaming(pname)
|
||||
}
|
||||
}
|
||||
|
||||
func (pss *PeripheralStateStore) OnStopStream() {
|
||||
pss.mu.Lock()
|
||||
pss.isStreaming = false
|
||||
pss.mu.Unlock()
|
||||
|
||||
for _, state := range pss.GetStates() {
|
||||
if state.State == DeviceIsStreaming {
|
||||
pss.setDeviceConfigured(state.device.Name)
|
||||
if state.State > DeviceIsConfigured {
|
||||
pss.setDeviceUnconfigured(state.device.Name)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -283,6 +297,14 @@ func (pss *PeripheralStateStore) setDeviceIsConfiguring(pname string) {
|
||||
pss.store[pname].State = DeviceIsConfiguring
|
||||
}
|
||||
|
||||
func (pss *PeripheralStateStore) setDeviceBeingConfiguredByUser(pname string) {
|
||||
pss.Logger.Info("device is being configured by the user", "device", pname)
|
||||
pss.mu.Lock()
|
||||
defer pss.mu.Unlock()
|
||||
|
||||
pss.store[pname].State = DeviceBeingConfiguredByUser
|
||||
}
|
||||
|
||||
func (pss *PeripheralStateStore) setDeviceConfigured(pname string) {
|
||||
pss.Logger.Info("device is configured and ready for data", "device", pname)
|
||||
|
||||
@@ -349,6 +371,7 @@ func (pss *PeripheralStateStore) configurePeripheral(
|
||||
onFailure(pname)
|
||||
return
|
||||
}
|
||||
pss.Messages <- fmt.Sprintf("Configuring peripheral for provider: %s\n", provider)
|
||||
|
||||
err = state.Peripheral.Setup(provider)
|
||||
if err != nil {
|
||||
@@ -445,6 +468,8 @@ func (pss *PeripheralStateStore) HandleDeviceState() {
|
||||
case DeviceIsConfigured:
|
||||
// Nothing to do here
|
||||
pss.handleDeviceIsConfigured(pName)
|
||||
case DeviceBeingConfiguredByUser:
|
||||
// Nothing to do here, need to wait for the user to finish
|
||||
case DeviceIsStreaming:
|
||||
//
|
||||
case DeviceReconnected:
|
||||
|
||||
@@ -29,7 +29,8 @@ func NewOrchestrator(logger *slog.Logger) (*Orchestrator, error) {
|
||||
devService.triggerFieldSubscription = telemService.SubscribeToFields
|
||||
|
||||
// Setup telemetry service callbacks
|
||||
// telemService.getRequiredFields = devService.GetRequiredFields
|
||||
telemService.startedStreaming = devService.StartStream
|
||||
telemService.providerStoppedMidStream = devService.OnStoppedMidStream
|
||||
|
||||
return &Orchestrator{
|
||||
DeviceService: devService,
|
||||
|
||||
@@ -35,6 +35,8 @@ type TelemetryService struct {
|
||||
CtxHealthcheck context.Context
|
||||
healthCheckCancel context.CancelFunc
|
||||
// Callbacks
|
||||
startedStreaming func(ch <-chan telemetry.TelemetryData)
|
||||
providerStoppedMidStream func()
|
||||
// Devices data request
|
||||
// peripheralProvider func() []peripheral.Peripheral
|
||||
// getRequiredFields func() []telemetry.FieldID
|
||||
@@ -138,6 +140,7 @@ func (t *TelemetryService) dropActiveProvider() {
|
||||
t.cancelForward()
|
||||
}
|
||||
|
||||
// NOTE: can we move the stop stream into the provider Close() method?
|
||||
t.activeProvider.StopStream()
|
||||
t.activeProvider.Close()
|
||||
t.activeProvider = nil
|
||||
@@ -204,21 +207,17 @@ func (t *TelemetryService) StopStream() {
|
||||
t.isStreaming = false
|
||||
}
|
||||
|
||||
func (t *TelemetryService) StartStream() {
|
||||
slog.Debug("Stream started")
|
||||
|
||||
func (t *TelemetryService) StartStream() <-chan telemetry.TelemetryData {
|
||||
// Start the new stream
|
||||
if t.activeProvider == nil {
|
||||
slog.Debug("there's no active provider. not starting the stream")
|
||||
return
|
||||
return nil
|
||||
}
|
||||
|
||||
// Stop the provider healthcheck
|
||||
t.healthCheckCancel()
|
||||
|
||||
simInCh, _ := t.activeProvider.Stream()
|
||||
// TODO: the provider needs to be able to tell the data has stopped
|
||||
// so we can restart the provider lookup routine
|
||||
|
||||
// Create the context so we can control the lifecycle
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
@@ -227,6 +226,10 @@ func (t *TelemetryService) StartStream() {
|
||||
// Multiplex this data
|
||||
go t.multiplexData(ctx, simInCh)
|
||||
t.isStreaming = true
|
||||
|
||||
t.Messages <- "Provider has started streaming data\n"
|
||||
|
||||
return simInCh
|
||||
}
|
||||
|
||||
func (t *TelemetryService) multiplexData(ctx context.Context, dataCh <-chan telem.TelemetryData) {
|
||||
|
||||
@@ -16,6 +16,7 @@ func (t *TelemetryService) onFindProvider(prov telem.TelemetryProvider) {
|
||||
// Attach to the provider
|
||||
t.logger.Info("found provider for " + prov.Name())
|
||||
t.Messages <- fmt.Sprintf("Found provider \"%s\"\n", prov.Name())
|
||||
|
||||
err := t.SwitchProvider(prov)
|
||||
if err != nil {
|
||||
t.Messages <- fmt.Sprintf("Failed to switch to provider: %+v\n", err.Error())
|
||||
@@ -26,6 +27,11 @@ func (t *TelemetryService) onFindProvider(prov telem.TelemetryProvider) {
|
||||
// Start the healthcheck on our provider so we can drop it if it stops
|
||||
t.CtxHealthcheck, t.healthCheckCancel = context.WithCancel(context.Background())
|
||||
go t.ProviderMonitor(t.CtxHealthcheck)
|
||||
|
||||
ch := t.StartStream()
|
||||
t.startedStreaming(ch)
|
||||
|
||||
t.Messages <- "provider switch completed\n"
|
||||
}
|
||||
|
||||
func (t *TelemetryService) onProviderStopsMidStream() {
|
||||
@@ -34,6 +40,10 @@ func (t *TelemetryService) onProviderStopsMidStream() {
|
||||
// if the stream stopped we have to restart the devices and everything
|
||||
t.Messages <- "Telemetry provider stopped mid stream\n"
|
||||
t.logger.Info("cleaning dropped provider and restarting lookup service")
|
||||
|
||||
t.dropActiveProvider()
|
||||
go t.FindProvider(t.CtxMonitor)
|
||||
|
||||
// Tell the devices service that we lost the thing
|
||||
t.providerStoppedMidStream()
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"os"
|
||||
"strconv"
|
||||
|
||||
"esdi/constants"
|
||||
"esdi/devices/cdashdisplay"
|
||||
"esdi/services"
|
||||
"esdi/tui/internal/views"
|
||||
@@ -585,3 +586,21 @@ func (lc *LayoutController) changeSelectedLoadout() {
|
||||
lc.LayoutToolView.ShowLayoutList()
|
||||
lc.App.SetFocus(lc.LayoutToolView.LayoutActions.LayoutSelection.Tree)
|
||||
}
|
||||
|
||||
// ##### Event Listener
|
||||
// OnLayoutToolOpen we need to change focus to the layout tool and move the
|
||||
// device out of streaming mode or whatever.
|
||||
// - start by making sure that device is able to be configured
|
||||
func (lc *LayoutController) OnLayoutToolOpen() {
|
||||
// Get the device from somewhere
|
||||
cdash, err := lc.DevService.GetPeripheral(constants.CDashDisplay)
|
||||
if err != nil {
|
||||
lc.Messages <- "failed to acquire CDashDisplay " + err.Error() + "\n"
|
||||
return
|
||||
}
|
||||
|
||||
lc.DevService.SetPeripheralUserConfigMode(cdash.Name())
|
||||
|
||||
// Change focus to the layout tree
|
||||
lc.App.SetFocus(lc.LayoutToolView.LayoutTree.Tree)
|
||||
}
|
||||
|
||||
@@ -77,7 +77,8 @@ func (mc *DeviceController) AddDeviceAPIListItems() {
|
||||
"layout-tool",
|
||||
mc.LayoutCtrl.LayoutToolView.Flex,
|
||||
)
|
||||
mc.App.SetFocus(mc.LayoutCtrl.LayoutToolView.LayoutTree.Tree)
|
||||
|
||||
mc.LayoutCtrl.OnLayoutToolOpen()
|
||||
})
|
||||
mc.DeviceAPIView.DevAPIList.
|
||||
AddItem("stream", "stream data to the display", func() {
|
||||
|
||||
@@ -88,23 +88,9 @@ func (sc *StreamingCtrl) registerHooks() {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: this isn't the startstop method/action anymore. It should show up the stream
|
||||
// visualizer - TODO: add metrics to the visualizer too, instead of just data
|
||||
func (sc *StreamingCtrl) StartStop() {
|
||||
if sc.TelemServ.IsStreaming() {
|
||||
slog.Info("stopping stream")
|
||||
|
||||
sc.TelemServ.StopStream()
|
||||
sc.DevService.StopStream()
|
||||
|
||||
sc.isRunning = false
|
||||
return
|
||||
}
|
||||
|
||||
// stream is not running, we have to start it now
|
||||
// NOTE:
|
||||
// Subscribe the only existing device - needs to be discovered by now
|
||||
slog.Debug("setting the data stream for device servie")
|
||||
sc.DevService.SetTelemetryChannel(sc.TelemServ.SubscribeListener("DeviceService", 1))
|
||||
|
||||
dev, err := sc.DevService.GetPeripheral(uidevice.NAME)
|
||||
if err == nil {
|
||||
if uiDev, ok := dev.(*uidevice.UIDevice); ok {
|
||||
@@ -112,14 +98,6 @@ func (sc *StreamingCtrl) StartStop() {
|
||||
go sc.listenToUIStream()
|
||||
}
|
||||
}
|
||||
|
||||
slog.Debug("starting services")
|
||||
sc.DevService.StartStream()
|
||||
sc.TelemServ.StartStream()
|
||||
|
||||
sc.isRunning = true
|
||||
|
||||
slog.Debug("starting stream")
|
||||
}
|
||||
|
||||
func (sc *StreamingCtrl) parseStreamUpdateForm(form *views.StreamOptionsView) (*models.StreamOptions, error) {
|
||||
|
||||
Reference in New Issue
Block a user