Add OFF mode to BLE peripheral and refactoring

Add OFF mode to be able to turn BLE advertisement off. Rename
switchPeripheralMode function to include BLE in order to be more
descriptive.

app/client/components/DashboardActions.js

@@ -65,7 +65,7 @@ export class DashboardActions extends AppElement {
     return html`
     <button @click=${this.reset}>${icon_undo}</button>
     ${this.renderOptionalButtons()}
-    <button @click=${this.switchPeripheralMode}>${icon_bluetooth}</button>
+    <button @click=${this.switchBlePeripheralMode}>${icon_bluetooth}</button>
     <div class="peripheral-mode">${this.peripheralMode()}</div>
     ${this.dialog ? this.dialog : ''}
   `
@@ -116,7 +116,7 @@ export class DashboardActions extends AppElement {
       case 'FTMS':
         return 'FTMS Rower'
       default:
-        return ''
+        return 'Off'
     }
   }
 
@@ -135,8 +135,8 @@ export class DashboardActions extends AppElement {
     this.sendEvent('triggerAction', { command: 'reset' })
   }
 
-  switchPeripheralMode () {
+  switchBlePeripheralMode () {
-    this.sendEvent('triggerAction', { command: 'switchPeripheralMode' })
+    this.sendEvent('triggerAction', { command: 'switchBlePeripheralMode' })
   }
 
   uploadTraining () {

app/client/lib/app.js

@@ -130,8 +130,8 @@ export function createApp (app) {
 
   function handleAction (action) {
     switch (action.command) {
-      case 'switchPeripheralMode': {
+      case 'switchBlePeripheralMode': {
-        if (socket)socket.send(JSON.stringify({ command: 'switchPeripheralMode' }))
+        if (socket)socket.send(JSON.stringify({ command: 'switchBlePeripheralMode' }))
         break
       }
       case 'reset': {

app/peripherals/PeripheralManager.js

@@ -16,83 +16,88 @@ import child_process from 'child_process'
 import AntManager from './ant/AntManager.js'
 import { createAntHrmPeripheral } from './ant/HrmPeripheral.js'
 
-const modes = ['FTMS', 'FTMSBIKE', 'PM5', 'CSC', 'CPS']
+const bleModes = ['FTMS', 'FTMSBIKE', 'PM5', 'CSC', 'CPS', 'OFF']
 function createPeripheralManager () {
   const emitter = new EventEmitter()
-  let peripheral
+  let blePeripheral
-  let mode
+  let bleMode
 
-  createPeripheral(config.bluetoothMode)
+  createBlePeripheral(config.bluetoothMode)
 
-  function getPeripheral () {
+  function getBlePeripheral () {
-    return peripheral
+    return blePeripheral
   }
 
-  function getPeripheralMode () {
+  function getBlePeripheralMode () {
-    return mode
+    return bleMode
   }
 
-  function switchPeripheralMode (newMode) {
+  function switchBlePeripheralMode (newMode) {
     // if now mode was passed, select the next one from the list
     if (newMode === undefined) {
-      newMode = modes[(modes.indexOf(mode) + 1) % modes.length]
+      newMode = bleModes[(bleModes.indexOf(bleMode) + 1) % bleModes.length]
     }
-    createPeripheral(newMode)
+    createBlePeripheral(newMode)
   }
 
   function notifyMetrics (type, metrics) {
-    peripheral.notifyData(type, metrics)
+    blePeripheral.notifyData(type, metrics)
   }
 
   function notifyStatus (status) {
-    peripheral.notifyStatus(status)
+    blePeripheral.notifyStatus(status)
   }
 
-  async function createPeripheral (newMode) {
+  async function createBlePeripheral (newMode) {
-    if (peripheral) {
+    if (blePeripheral) {
-      await peripheral.destroy()
+      await blePeripheral.destroy()
     }
 
     switch (newMode) {
       case 'PM5':
         log.info('bluetooth profile: Concept2 PM5')
-        peripheral = createPm5Peripheral(controlCallback)
+        blePeripheral = createPm5Peripheral(controlCallback)
-        mode = 'PM5'
+        bleMode = 'PM5'
         break
 
       case 'FTMSBIKE':
         log.info('bluetooth profile: FTMS Indoor Bike')
-        peripheral = createFtmsPeripheral(controlCallback, {
+        blePeripheral = createFtmsPeripheral(controlCallback, {
           simulateIndoorBike: true
         })
-        mode = 'FTMSBIKE'
+        bleMode = 'FTMSBIKE'
         break
+
       case 'CSC':
         log.info('bluetooth profile: Cycling Speed and Cadence')
-        peripheral = createCscPeripheral()
+        blePeripheral = createCscPeripheral()
-        mode = 'CSC'
+        bleMode = 'CSC'
         break
+
       case 'CPS':
         log.info('bluetooth profile: Cycling Power Meter')
-        peripheral = createCpsPeripheral()
+        blePeripheral = createCpsPeripheral()
-        mode = 'CPS'
+        bleMode = 'CPS'
         break
 
       case 'FTMS':
-      default:
         log.info('bluetooth profile: FTMS Rower')
-        peripheral = createFtmsPeripheral(controlCallback, {
+        blePeripheral = createFtmsPeripheral(controlCallback, {
           simulateIndoorBike: false
         })
-        mode = 'FTMS'
+        bleMode = 'FTMS'
         break
+
+      default:
+        log.info('bluetooth profile: Off')
+        bleMode = 'OFF'
     }
-    peripheral.triggerAdvertising()
+    if (bleMode.toLocaleLowerCase() !== 'OFF'.toLocaleLowerCase()) { blePeripheral.triggerAdvertising() }
 
     emitter.emit('control', {
       req: {
-        name: 'peripheralMode',
+        name: 'blePeripheralMode',
-        peripheralMode: mode
+        peripheralMode: bleMode
       }
     })
   }
@@ -123,9 +128,9 @@ function createPeripheralManager () {
   return Object.assign(emitter, {
     startAntHeartRateService,
     startBleHeartRateService,
-    getPeripheral,
+    getBlePeripheral,
-    getPeripheralMode,
+    getBlePeripheralMode,
-    switchPeripheralMode,
+    switchBlePeripheralMode,
     notifyMetrics,
     notifyStatus
   })

app/server.js

@@ -98,7 +98,7 @@ peripheralManager.on('control', (event) => {
       peripheralManager.notifyStatus({ name: 'startedOrResumedByUser' })
       event.res = true
       break
-    case 'peripheralMode':
+    case 'blePeripheralMode':
       webServer.notifyClients('config', getConfig())
       event.res = true
       break
@@ -216,8 +216,8 @@ workoutUploader.on('resetWorkout', () => {
 const webServer = createWebServer()
 webServer.on('messageReceived', async (message, client) => {
   switch (message.command) {
-    case 'switchPeripheralMode':
+    case 'switchBlePeripheralMode':
-      peripheralManager.switchPeripheralMode()
+      peripheralManager.switchBlePeripheralMode()
       break
     case 'reset':
       resetWorkout()
@@ -243,7 +243,7 @@ webServer.on('clientConnected', (client) => {
 // todo: extract this into some kind of state manager
 function getConfig () {
   return {
-    peripheralMode: peripheralManager.getPeripheralMode(),
+    peripheralMode: peripheralManager.getBlePeripheralMode(),
     stravaUploadEnabled: !!config.stravaClientId && !!config.stravaClientSecret,
     shutdownEnabled: !!config.shutdownCommand
   }

config/default.config.js

@@ -78,6 +78,7 @@ export default {
   // - FTMSBIKE: The FTMS profile is used by Smart Bike Trainers (please note: the speed and power are still aimed for rowing, NOT for a bike!)
   // - CPS: The BLE Cycling Power Profile simulates a bike for more modern Garmin watches
   // - CSC: The BLE Cycling Speed and Cadence Profile simulates a bike for older Garmin watches
+  // - OFF: Turns Bluetooth advertisement off
   bluetoothMode: 'FTMS',
 
   // Turn this on if you want support for Bluetooth Low Energy heart rate monitors