cyteen
/
openrowingmonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup 

Change logging level for the broadcast data of the ANT+ FE peripheral.
Fix callback signature mismatch in bleno `stopAdvertising()` method
This commit is contained in:
Abász 2023-01-01 23:23:26 +01:00
parent a0686150a2
commit 405bcab55a
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/peripherals/ant/FEPeripheral.js
View File

@ -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
}

2
app/peripherals/ble/CpsPeripheral.js
View File

@ -65,7 +65,7 @@ function createCpsPeripheral () {
return new Promise((resolve) => {
bleno.disconnect()
bleno.removeAllListeners()
bleno.stopAdvertising(resolve)
bleno.stopAdvertising(() => resolve())
})
}

2
app/peripherals/ble/CscPeripheral.js
View File

@ -65,7 +65,7 @@ function createCscPeripheral () {
return new Promise((resolve) => {
bleno.disconnect()
bleno.removeAllListeners()
bleno.stopAdvertising(resolve)
bleno.stopAdvertising(() => resolve())
})
}

2
app/peripherals/ble/FtmsPeripheral.js
View File

@ -78,7 +78,7 @@ function createFtmsPeripheral (controlCallback, options) {
return new Promise((resolve) => {
bleno.disconnect()
bleno.removeAllListeners()
bleno.stopAdvertising(resolve)
bleno.stopAdvertising(() => resolve())
})
}

2
app/peripherals/ble/Pm5Peripheral.js
View File

@ -68,7 +68,7 @@ function createPm5Peripheral (controlCallback, options) {
return new Promise((resolve) => {
bleno.disconnect()
bleno.removeAllListeners()
bleno.stopAdvertising(resolve)
bleno.stopAdvertising(() => resolve())
})
}