fix after implementing new changes to PSS. streaming was broken
This commit is contained in:
+2
-2
@@ -59,7 +59,7 @@ func (ds *DeviceService) GetDevices() []peripheral.Peripheral {
|
||||
peripherals := make([]peripheral.Peripheral, 0, len(snapshot))
|
||||
|
||||
for _, state := range snapshot {
|
||||
if state.State != DeviceIsConnected {
|
||||
if state.State < DeviceIsConnected {
|
||||
continue
|
||||
}
|
||||
peripherals = append(peripherals, state.Peripheral)
|
||||
@@ -126,7 +126,7 @@ func (ds *DeviceService) transmit(ctx context.Context) {
|
||||
// TODO: make a copy of the data and send that copy instead of keeping
|
||||
// the data locked
|
||||
for _, dev := range ds.PSS.GetStates() {
|
||||
if dev.State != DeviceIsConnected {
|
||||
if dev.State != DeviceIsConfigured {
|
||||
continue
|
||||
}
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@ type DeviceState = uint8
|
||||
|
||||
const (
|
||||
DeviceTimedOut uint8 = iota
|
||||
DeviceIsDisconnected
|
||||
DeviceReconnected
|
||||
DeviceIsConnected
|
||||
DeviceIsUnconfigured
|
||||
DeviceIsConfigured
|
||||
DeviceIsDisconnected
|
||||
DeviceReconnected
|
||||
)
|
||||
|
||||
type PeripheralState struct {
|
||||
@@ -101,7 +101,7 @@ func (pss *PeripheralStateStore) GetPeripheral(pname string) (peripheral.Periphe
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if state.State != DeviceIsConnected {
|
||||
if state.State < DeviceIsConnected {
|
||||
return nil, ErrDeviceIsNotConnected
|
||||
}
|
||||
|
||||
|
||||
@@ -155,10 +155,7 @@ func (sc *StreamingCtrl) updateStream() {
|
||||
// so we can get away with using a map for convenience here
|
||||
func (sc *StreamingCtrl) SetInternalState() {
|
||||
fields := sc.TelemServ.SubscribeToFields()
|
||||
|
||||
// sc.Messages <- fmt.Sprintf("Subscribed Fields: %+v [%d]\n", fields, len(fields))
|
||||
// Should I update this?
|
||||
sc.Messages <- fmt.Sprintf("Subscribed to fields: %+v", fields)
|
||||
sc.Messages <- fmt.Sprintf("Subscribed to fields: %+v\n", fields)
|
||||
}
|
||||
|
||||
func (sc *StreamingCtrl) listenToUIStream() {
|
||||
|
||||
Reference in New Issue
Block a user