Commit Graph

63 Commits

Author SHA1 Message Date
Lars Berning f5ff252f95
moves formatting of metrics to the displaying components 2022-01-15 12:29:48 +01:00
Lars Berning 424ba431c7
implements global state, restructures code 2022-01-14 19:26:47 +01:00
Lars Berning c753cb4cf4
adds handling of some initial events 2022-01-10 22:31:00 +01:00
Lars Berning 582c5fd41c
updates and fixes some dependencies 2022-01-10 20:05:19 +01:00
Lars Berning bbd009453e
Merge branch 'main' into frontend_redesign 2022-01-09 22:22:13 +01:00
Lars Berning 2eed3fa6dd
adds a first test for a working global frontend state 2022-01-09 22:00:58 +01:00
Lars Berning 4737669216 improves conditional rendering 2021-12-13 20:37:21 +01:00
Jaap van Ekris 19ec4f28bb
Code Cleanup and Documentation Update (#30)
* Moved .doc to .md

Moved the Word document to a more open format

* Update of the file based on the new settings

Update of the settings documentation due to the introduction of the new RowingEngine

* Moved .doc to .md

Moved the information to the .md file, updated with the design decissions made in the new RowingEngine.

* Splitting the hardware set-ups for specific rowers

Split off the WRX700 hardware set-up from the generic setup, to allow for other rower-specific set-ups to be created (easier to read and better for search engines).

* Removal of generic text

* SPlit the generic from the WRX700

* Fixed a very rare bug

A very rare condition can cause the noise correction filter to get stuck and dismiss all subsequent values. Now the number of corrections is maximised preventing that situation.

* Code refactoring

Refactoring of the code (added calculateLinearVelocity(), calculateCyclePower(), calculateTorque() functions) to reduce code duplication across phases.

* Fixed a very rare bug

A very rare condition can cause the noise correction filter to get stuck and dismiss all subsequent values. Now the number of corrections is maximised preventing that situation.

* Code refactoring

Refactoring of the code (added calculateLinearVelocity(), calculateCyclePower(), calculateTorque() functions) to reduce code duplication across phases.

* fixes some typos, fixes some links, renames some files

Co-authored-by: Lars Berning <151194+laberning@users.noreply.github.com>
2021-12-13 20:01:28 +01:00
Lars Berning 80360e70f8
fixes some edge cases, removes some unneeded dependencies 2021-11-29 15:24:51 +01:00
Lars Berning 76a5e004f2
adds bundling with rollup 2021-11-29 10:30:45 +01:00
Lars Berning 70a86d0914
initial attempt to refactor frontend with lit 2021-11-27 17:17:58 +01:00
Lars Berning 68f4313518
Adds support for GitHub pages (#27)
* moves readme to docs folder

* Set theme jekyll-theme-cayman

* adjusts some colors

* adjusts image margin

* adds some styling and a navigation menu
2021-11-11 21:11:07 +01:00
Lars Berning 4196009237
adds documentation on the physics model (#25)
* adds documentation on the physics model
2021-11-08 11:32:08 +01:00
Lars Berning 67e7dbb36c
unifies interface of averagers 2021-11-08 09:00:45 +01:00
Lars Berning 36fe899e81
adds more tests to averagers 2021-11-08 08:47:56 +01:00
Lars Berning 02359e819d
updates documentation, fixes typos 2021-11-07 21:51:11 +01:00
Lars Berning 8f064a0aab
fixes typos, updates documentation to new names 2021-11-07 15:14:51 +01:00
Jaap van Ekris 7ee25292fc
Improved Rowing Engine (#24)
* Update to accomodate the new RowingEngine

Update of the MovingFlankDetector to provide the values needed to determine the speeds at the beginning of the flank.

* Created the MovingAverager for RowingEngine 2.0

Added the MovingAverager to accomodate the RowingEngine 2.0

* Update to RowingEngine 2.0

Update based on the great theoretical work of Anu Dudhia and the practical experiences of Dave Venrooy.

* Added to explain RowingEngine 2.0 design

A rationale for explaining the RowingEngine 2.0 design, based on the great theoretical work of Anu Dudhia, and the practical work of Dave Venrooy and Marinus van Holst, as well as the great feedback from Lars Berning.

* Update to accomodate the new RowingEngine

Update to the rower settings to accommodate the new RowingEngine. Please note that the modifications need to be verified by the respective users.

* Modifications to the RX800 tests

Modifications to the RX800 to bring it in line with the Concept2 Power and distance measurements.

* BUGFIX: Prevent ghost-strokes at end of session

This change to isAccelerating prevents stroke-detection to detect a stroke when the currentDt "flatlines". This typically happens when the error correction kicks in when you quit rowing (and thus the rowerSettings.maximumTimeBetweenImpulses is exceeded). It is bad (flatlining isn't acceleration), and this ghost-stroke causes havoc in the GUI: all measurements are reset again to random values instead of the nice indicators normally used.

* BUGFIX: Prevent ghost-strokes at end of session

This change to isAccelerating prevents stroke-detection to detect a stroke when the currentDt "flatlines". This typically happens when the error correction kicks in when you quit rowing (and thus the rowerSettings.maximumTimeBetweenImpulses is exceeded). It is bad (flatlining isn't acceleration), and this ghost-stroke causes havoc in the GUI: all measurements are reset again to random values instead of the nice indicators normally used.

* Added defensive programming

In some rare cases not rounding led to a buffer overflow, so added defensive programming to prevent this.

* Update MovingFlankDetector.js

* Improved stroke detection algorithm accuracy

Improvement of the Stroke detection algorithm: when naturalDeceleration is specified in the settings, it will only consider something a Revocery when this level of deceleration is encountered for the FlankLength.

* Made the RowingEngine more stateful

Removed some bugs, added a lot of defensive programming and made the RowingEngine report the key statistics every impuls to create a more fluid experience on the monitor. To do this, the rowingEngine maintins and reports absolute values to rowingStatistics, instead of relative.

* Improved stroke detection algorithm accuracy

Improvement of the Stroke detection algorithm: when naturalDeceleration is specified in the settings, it will only consider something a Revocery when this level of deceleration is encountered for the FlankLength.

* Modification to fit new RowingEngine

* Addition of new parameters for stroke detection

Added new parameters for stroke detection and monitor fluidity

* Fixed missing bracket

* Updated to more fluid RowingStatistics

Moved the timer from a static timer to the raw measurements of the flywheel, and the distance more frequently updated, to keep all data consistent. Also made the GUI-updates more fluid, responsive and dependent on settings: this more fluid GUI update mechanism is dependent on the screenUpdateInterval setting and moving averager dependent on a setting (numOfPhasesForAveragingScreenData)

* Made all monitor updates consistent

* Accommodate more frequent update of the monitors

Update to accommodate the more frequent updates, and to accommodate the reset for the RowingEngine

* improves some testcases, fixes some minor code styling and duplicate definitions

* Fixed a comment about dragfactor

* Added parameters for the new RowingStatistics.js

Added screenUpdateInterval, numOfPhasesForAveragingScreenData and maxCycleTimeBeforePause as config parameters to remove statically determined parameters in RowingStatistics.js

* Added RX800 as second testbed

* fixes some problems that caused the engine to crash

* uses non sanitized durations for now

* updates some settings, fixes some typos

* wires the correct timer configuration, fixes a problem where SPM would not reset to 0

* fixes a crash problem in workout recorder, fixes fallback value for strokeTime

* relaxes constraint on stroke time

* updates some explanatory text, updates some rower parameters

Co-authored-by: Lars Berning <151194+laberning@users.noreply.github.com>
2021-11-07 14:53:11 +01:00
Lars Berning 16fafc8add
updates websocket library to version 8 2021-10-17 11:40:03 +02:00
Lars Berning 6529d2bbe1
updates some dependencies 2021-10-17 11:24:12 +02:00
Lars Berning 3b6b42ec1a
extracts merge function into a helper module 2021-05-27 09:36:03 +02:00
Lars Berning a618419702
simplifies git hooks 2021-05-21 14:38:21 +02:00
Lars Berning 53ddec27da
fixes an issue with data types in tcx files 2021-05-21 10:06:39 +02:00
Lars Berning 602766c4a0
implements tcx and raw export 2021-05-20 13:40:42 +02:00
Lars Berning c87e78b000
fixes auto adjustment for rowed distance 2021-05-13 10:11:00 +02:00
Lars Berning 103b77190e
some minor layout adjustments 2021-05-08 13:55:22 +02:00
Lars Berning d50b1b8c7c
speeds up updating by reusing existing dependencies 2021-05-05 12:32:57 +02:00
Lars Berning b019fb3bd4
adds more settings, adds auto adjust for damping 2021-05-05 12:16:04 +02:00
Jaap van Ekris 1b895972af
refactores FlankDetector, extracts some flank settings
* Improvement of the MovingflankDetector

Simplified the call of the moving flank detector, making it dependent on the settings

* Update MovingFlankDetector.js

Cleaned up the call to the MovingFlankDetector

* Added heartrate data to TCX

* Added parameters for the flankdetector

Added parameters for the flankdetector (flankLength and numberOfErrorsAllowed)

* Gave the RX800 some room as the settings haven't stabilised yet (and I think the recording is with a different damper setting than the source tree)
2021-05-05 05:41:11 +02:00
Lars Berning 4e844b0722
makes low level integrations less dependent on raspberry pi hardware 2021-05-03 10:05:07 +02:00
Lars Berning 475f0f4835
improves regression tests, renames some settings 2021-05-02 15:02:58 +02:00
JaapvanEkris 2c6819ca02
implements better flank detection, adds spreadsheet for analysis
Added the flankdetector, to reliably detect an acceleration or deceleration of the flywheel
Added extra metrics for the creation of TCX-files
Added extra metrics (speed in m/s and cadence) to allow future export of this data to Garmin TCX files, which everybody seems to love.
I increased the priority of the GPIO-service, as I noticed that much of the measurement noise originates from delayed read-outs of the GPIO.
An Excel tool to "play" with the settings of a rower, to adjust the settings found in the rowerprofiles.js
Adds test and data for RX800 rower
Lightweight version of Excel file

Co-authored-by: Lars Berning <151194+laberning@users.noreply.github.com>
2021-04-30 22:03:47 +02:00
JaapvanEkris 5c9630d0e5
This constant c isn't as constant....
The constant C isn't as constant as you'd hope it would be. As http://eodg.atm.ox.ac.uk/user/dudhia/rowing/physics/ergometer.html states: "The figure used for c is somewhat arbitrary - selected to indicate a 'realistic' boat speed for a given output power."
2021-04-29 14:29:54 +02:00
Lars Berning d1f7a80c9a fixes a problem, that caused ANT+ not to work wit newer ANT+ usb sticks 2021-04-24 10:51:21 +02:00
Lars Berning d385ad78d7 adds support for ant+ heart rate monitors 2021-04-22 21:03:59 +02:00
Lars Berning 15c1553e42 adds an option to configure the ftms device names 2021-04-21 20:39:27 +02:00
Lars Berning 5dddeb2ff5 adds unit tests to verify the rowing engine with real rower recordings 2021-04-21 19:56:42 +02:00
Lars Berning 55cde69ce6 moves rower configuration into a config file and adds rower presets 2021-04-20 21:48:34 +02:00
Lars Berning 0586fc11d8 displays battery status of heart rate monitor in frontend 2021-04-16 21:27:36 +02:00
Lars Berning 6fcf649d65 adds strokes per minute to ftms bike via cadence value 2021-04-15 21:29:35 +02:00
Lars Berning 2f93a6a390 disables pinch to zoom 2021-04-15 20:55:00 +02:00
Lars Berning e8d1721919 updates documentation 2021-04-15 20:40:08 +02:00
Lars Berning 43fa45bf29 adds support for BLE heart rate monitors 2021-04-14 22:13:24 +02:00
Lars Berning 870fc53fc8 updates documentation 2021-04-01 22:05:05 +02:00
Lars Berning 89883dab2d adds install script, modifies icon 2021-03-31 19:41:12 +01:00
Lars Berning 61c3d5be8d adds some icons to the UI 2021-03-27 03:54:58 +00:00
Lars Berning 1c135a0c1f replaces unit testing framework ava -> uvu 2021-03-26 23:37:36 +00:00
Lars Berning c3d7d64a51 adds frontend build tool 2021-03-26 23:15:12 +00:00
Lars Berning f358d06247 adds simulated heart rate 2021-03-26 22:35:17 +00:00
Lars Berning 1ce1a2136a add heart rate and elapsed time to ftms profiles 2021-03-26 22:15:02 +00:00