From 405bcab55a45f476efd628a5d979db75317c788e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ab=C3=A1sz?= <>
Date: Sun, 1 Jan 2023 23:23:26 +0100
Subject: [PATCH] Code cleanup

Change logging level for the broadcast data of the ANT+ FE peripheral.
Fix callback signature mismatch in bleno `stopAdvertising()` method
---
 app/peripherals/ant/FEPeripheral.js   | 12 ++++++------
 app/peripherals/ble/CpsPeripheral.js  |  2 +-
 app/peripherals/ble/CscPeripheral.js  |  2 +-
 app/peripherals/ble/FtmsPeripheral.js |  2 +-
 app/peripherals/ble/Pm5Peripheral.js  |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/peripherals/ant/FEPeripheral.js b/app/peripherals/ant/FEPeripheral.js
index 86e89a9..0a3b99c 100644
--- a/app/peripherals/ant/FEPeripheral.js
+++ b/app/peripherals/ant/FEPeripheral.js
@@ -118,8 +118,8 @@ function createFEPeripheral (antManager) {
           ...Messages.intToLEHexArray(feCapabilitiesBitField, 1)
         ]
         if (sessionData.sessionStatus === 'Rowing') {
-          log.debug(`Page 17 Data Sent. Event=${dataPageCount}. Stroke Length=${sessionData.distancePerStroke}.`)
-          log.debug(`Hex Stroke Length=0x${sessionData.distancePerStroke.toString(16)}.`)
+          log.trace(`Page 17 Data Sent. Event=${dataPageCount}. Stroke Length=${sessionData.distancePerStroke}.`)
+          log.trace(`Hex Stroke Length=0x${sessionData.distancePerStroke.toString(16)}.`)
         }
         break
       case dataPageCount % 8 === 3: // 0x16 - Specific Rower Data (once a second)
@@ -135,8 +135,8 @@ function createFEPeripheral (antManager) {
           ...Messages.intToLEHexArray((sessionData.fitnessEquipmentState + rowingCapabilitiesBitField), 1)
         ]
         if (sessionData.sessionStatus === 'Rowing') {
-          log.debug(`Page 22 Data Sent. Event=${dataPageCount}. Strokes=${sessionData.accumulatedStrokes}. Stroke Rate=${sessionData.strokeRate}. Power=${sessionData.instantaneousPower}`)
-          log.debug(`Hex Strokes=0x${sessionData.accumulatedStrokes.toString(16)}. Hex Stroke Rate=0x${sessionData.strokeRate.toString(16)}. Hex Power=0x${Messages.intToLEHexArray(sessionData.instantaneousPower, 2)}.`)
+          log.trace(`Page 22 Data Sent. Event=${dataPageCount}. Strokes=${sessionData.accumulatedStrokes}. Stroke Rate=${sessionData.strokeRate}. Power=${sessionData.instantaneousPower}`)
+          log.trace(`Hex Strokes=0x${sessionData.accumulatedStrokes.toString(16)}. Hex Stroke Rate=0x${sessionData.strokeRate.toString(16)}. Hex Power=0x${Messages.intToLEHexArray(sessionData.instantaneousPower, 2)}.`)
         }
         break
       case dataPageCount % 4 === 2: // 0x10 - General FE Data (twice a second)
@@ -152,8 +152,8 @@ function createFEPeripheral (antManager) {
           ...Messages.intToLEHexArray((sessionData.fitnessEquipmentState + feCapabilitiesBitField), 1)
         ]
         if (sessionData.sessionStatus === 'Rowing') {
-          log.debug(`Page 16 Data Sent. Event=${dataPageCount}. Time=${sessionData.accumulatedTime}. Distance=${sessionData.accumulatedDistance}. Speed=${sessionData.cycleLinearVelocity}.`)
-          log.debug(`Hex Time=0x${sessionData.accumulatedTime.toString(16)}. Hex Distance=0x${sessionData.accumulatedDistance.toString(16)}. Hex Speed=0x${Messages.intToLEHexArray(sessionData.cycleLinearVelocity, 2)}.`)
+          log.trace(`Page 16 Data Sent. Event=${dataPageCount}. Time=${sessionData.accumulatedTime}. Distance=${sessionData.accumulatedDistance}. Speed=${sessionData.cycleLinearVelocity}.`)
+          log.trace(`Hex Time=0x${sessionData.accumulatedTime.toString(16)}. Hex Distance=0x${sessionData.accumulatedDistance.toString(16)}. Hex Speed=0x${Messages.intToLEHexArray(sessionData.cycleLinearVelocity, 2)}.`)
         }
         break
     }
diff --git a/app/peripherals/ble/CpsPeripheral.js b/app/peripherals/ble/CpsPeripheral.js
index 89cce87..48dc712 100644
--- a/app/peripherals/ble/CpsPeripheral.js
+++ b/app/peripherals/ble/CpsPeripheral.js
@@ -65,7 +65,7 @@ function createCpsPeripheral () {
     return new Promise((resolve) => {
       bleno.disconnect()
       bleno.removeAllListeners()
-      bleno.stopAdvertising(resolve)
+      bleno.stopAdvertising(() => resolve())
     })
   }
 
diff --git a/app/peripherals/ble/CscPeripheral.js b/app/peripherals/ble/CscPeripheral.js
index 6915d13..cc457fe 100644
--- a/app/peripherals/ble/CscPeripheral.js
+++ b/app/peripherals/ble/CscPeripheral.js
@@ -65,7 +65,7 @@ function createCscPeripheral () {
     return new Promise((resolve) => {
       bleno.disconnect()
       bleno.removeAllListeners()
-      bleno.stopAdvertising(resolve)
+      bleno.stopAdvertising(() => resolve())
     })
   }
 
diff --git a/app/peripherals/ble/FtmsPeripheral.js b/app/peripherals/ble/FtmsPeripheral.js
index c0845c6..53b363e 100644
--- a/app/peripherals/ble/FtmsPeripheral.js
+++ b/app/peripherals/ble/FtmsPeripheral.js
@@ -78,7 +78,7 @@ function createFtmsPeripheral (controlCallback, options) {
     return new Promise((resolve) => {
       bleno.disconnect()
       bleno.removeAllListeners()
-      bleno.stopAdvertising(resolve)
+      bleno.stopAdvertising(() => resolve())
     })
   }
 
diff --git a/app/peripherals/ble/Pm5Peripheral.js b/app/peripherals/ble/Pm5Peripheral.js
index badfe8e..d905064 100644
--- a/app/peripherals/ble/Pm5Peripheral.js
+++ b/app/peripherals/ble/Pm5Peripheral.js
@@ -68,7 +68,7 @@ function createPm5Peripheral (controlCallback, options) {
     return new Promise((resolve) => {
       bleno.disconnect()
       bleno.removeAllListeners()
-      bleno.stopAdvertising(resolve)
+      bleno.stopAdvertising(() => resolve())
     })
   }