incyclist-services 1.0.32 → 1.0.34

package/lib/devices/configuration/service.js

@@ -681,7 +681,7 @@ class DeviceConfigurationService extends events_1.default {
         if (capability) {
             capabilites = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.capabilities.filter(c => c.capability === capability);
         }
-        return capabilites.filter(c => c.capability !== 'bike' && !(c.disabled === true)).map(c => {
+        return capabilites.filter(c => c.capability !== 'bike' && !(c.disabled === true) && c.selected).map(c => {
             const { capability, selected } = c;
             return { capability: capability, selected };
         });

package/lib/devices/ride/service.d.ts

@@ -5,7 +5,7 @@ import { AdapterInfo, DeviceConfigurationService, IncyclistDeviceSettings } from
 import { AdapterRideInfo, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./model";
 import { UserSettingsService } from "../../settings";
 import { EventLogger } from 'gd-eventlog';
-import { CyclingMode, DeviceData, DeviceSettings, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
+import { CyclingMode, DeviceData, DeviceSettings, IncyclistCapability, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
 export declare class DeviceRideService extends EventEmitter {
     protected static _instance: DeviceRideService;
     protected configurationService: DeviceConfigurationService;
@@ -46,6 +46,7 @@ export declare class DeviceRideService extends EventEmitter {
     stop(udid?: string): Promise<boolean>;
     pause(): void;
     resume(): void;
+    protected verifySelected(selectedDevices: any, capability: IncyclistCapability): void;
     onData(deviceSettings: DeviceSettings, data: DeviceData): void;
     sendUpdate(request: UpdateRequest): void;
     getCyclingMode(udid?: string): CyclingMode;

package/lib/devices/ride/service.js

@@ -500,6 +500,22 @@ class DeviceRideService extends events_1.default {
             ai.adapter.on('data', this.deviceDataHandler);
         });
     }
+    verifySelected(selectedDevices, capability) {
+        if (selectedDevices.find(sd => sd.capability === capability) === undefined) {
+            const verify = (toCheck) => {
+                const found = selectedDevices.find(sd => sd.capability === toCheck);
+                if (found) {
+                    const additional = (0, clone_1.default)(found);
+                    additional.capability = capability;
+                    selectedDevices.push(additional);
+                }
+                return found;
+            };
+            const added = verify(incyclist_devices_1.IncyclistCapability.Control);
+            if (!added && capability !== incyclist_devices_1.IncyclistCapability.Power)
+                verify(incyclist_devices_1.IncyclistCapability.Power);
+        }
+    }
     onData(deviceSettings, data) {
         const adapters = this.getAdapterList();
         const adapterInfo = adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.adapter.isEqual(deviceSettings));
@@ -507,23 +523,10 @@ class DeviceRideService extends events_1.default {
             return;
         adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => ai.capabilities = ai.adapter.getCapabilities());
         const selectedDevices = this.configurationService.getSelectedDevices();
-        if (selectedDevices.find(sd => sd.capability === incyclist_devices_1.IncyclistCapability.Speed) === undefined) {
-            const control = selectedDevices.find(sd => sd.capability === incyclist_devices_1.IncyclistCapability.Control);
-            if (control) {
-                const speed = (0, clone_1.default)(control);
-                speed.capability = incyclist_devices_1.IncyclistCapability.Speed;
-                selectedDevices.push(speed);
-            }
-            else {
-                const power = selectedDevices.find(sd => sd.capability === incyclist_devices_1.IncyclistCapability.Power);
-                const speed = (0, clone_1.default)(power);
-                speed.capability = incyclist_devices_1.IncyclistCapability.Speed;
-                selectedDevices.push(speed);
-            }
-        }
+        this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Speed);
+        this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Cadence);
+        this.verifySelected(selectedDevices, incyclist_devices_1.IncyclistCapability.Power);
         const enabledCapabilities = selectedDevices.filter(sd => sd.selected === adapterInfo.udid).map(c => c.capability);
-        const hasControl = (adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.capabilities.includes(incyclist_devices_1.IncyclistCapability.Control))) !== undefined;
-        const hasPower = (adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.capabilities.includes(incyclist_devices_1.IncyclistCapability.Power))) !== undefined;
         this.logEvent({ message: 'Data Update', device: adapterInfo.adapter.getName(), data, enabledCapabilities });
         enabledCapabilities.forEach(capability => {
             switch (capability) {
@@ -538,10 +541,6 @@ class DeviceRideService extends events_1.default {
                     break;
                 case incyclist_devices_1.IncyclistCapability.Cadence:
                     this.data.cadence = data.cadence;
-                    if (hasControl && !hasPower) {
-                        this.data.speed = data.speed;
-                        this.data.power = data.power;
-                    }
                     break;
                 case incyclist_devices_1.IncyclistCapability.Control:
                     this.data.deviceDistanceCounter = data.deviceDistanceCounter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "peerDependencies": {
     "gd-eventlog": "^0.1.24"
   },