diff --git a/devices/cdashdisplay/display.go b/devices/cdashdisplay/display.go index 51b84a0..9294d10 100644 --- a/devices/cdashdisplay/display.go +++ b/devices/cdashdisplay/display.go @@ -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 } diff --git a/services/devices_events.go b/services/devices_events.go index 5e568ea..bd45330 100644 --- a/services/devices_events.go +++ b/services/devices_events.go @@ -1 +1,6 @@ package services + +func (ds *DeviceService) OnStoppedMidStream() { + // Need to make every device be unconfigured + ds.StopStream() +} diff --git a/services/devices_lookup.go b/services/devices_lookup.go index 0034e09..b53da2e 100644 --- a/services/devices_lookup.go +++ b/services/devices_lookup.go @@ -228,8 +228,8 @@ func (pss *PeripheralStateStore) OnStopStream() { 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) } } } diff --git a/services/services.go b/services/services.go index 8356ddf..7686f6a 100644 --- a/services/services.go +++ b/services/services.go @@ -30,6 +30,7 @@ func NewOrchestrator(logger *slog.Logger) (*Orchestrator, error) { // Setup telemetry service callbacks telemService.startedStreaming = devService.StartStream + telemService.providerStoppedMidStream = devService.OnStoppedMidStream return &Orchestrator{ DeviceService: devService, diff --git a/services/telemetry.go b/services/telemetry.go index 9be6a4d..f449ce6 100644 --- a/services/telemetry.go +++ b/services/telemetry.go @@ -35,7 +35,8 @@ type TelemetryService struct { CtxHealthcheck context.Context healthCheckCancel context.CancelFunc // Callbacks - startedStreaming func(ch <-chan telemetry.TelemetryData) + startedStreaming func(ch <-chan telemetry.TelemetryData) + providerStoppedMidStream func() // Devices data request // peripheralProvider func() []peripheral.Peripheral // getRequiredFields func() []telemetry.FieldID @@ -139,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 diff --git a/services/telemetry_events.go b/services/telemetry_events.go index 603903d..8416f21 100644 --- a/services/telemetry_events.go +++ b/services/telemetry_events.go @@ -30,6 +30,8 @@ func (t *TelemetryService) onFindProvider(prov telem.TelemetryProvider) { ch := t.StartStream() t.startedStreaming(ch) + + t.Messages <- "provider switch completed" } func (t *TelemetryService) onProviderStopsMidStream() { @@ -38,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() }