Avans/ErgometerIPR
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55 Commits 3 Branches 0 Tags
a1b8d87c2f0efbc1eae0ff9b507befe721ae7c81
Commit Graph
24 Commits
Author SHA1 Message Date
Janco Kock 314a1964b6 Fixed string.format bug (reverted from commit 34ade8178b) 2015-11-02 15:02:06 +01:00
Janco Kock 34ade8178b Fixed string.format bug 2015-11-02 14:57:04 +01:00
kennyboy55 2a59117d82 Merge remote-tracking branch 'origin/dev' into dev 2015-11-02 14:43:39 +01:00
kennyboy55 a11aa08fae Bugfix 2015-11-02 14:43:35 +01:00
Janco Kock fd3ab02b5a Added stop state 2015-11-02 14:35:03 +01:00
kennyboy55 2b2be4523e Added check if heartbeat is zero 2015-11-02 14:18:29 +01:00
kennyboy55 be6b20a10c Merge remote-tracking branch 'origin/dev' into dev 
Conflicts:
	ErgometerIPR/ErgometerApplication/ErgometerTest.cs
 2015-11-02 12:32:34 +01:00
kennyboy55 0ded1cb132 Different beeps at different times 2015-11-02 12:31:58 +01:00
Janco Kock 7dee57d58c Fixed wrong max / min 2015-11-02 12:25:23 +01:00
Janco Kock c7204fd593 Added beep sounds 2015-11-01 22:50:29 +01:00
kennyboy55 3dbd55ed47 Small changes 2015-11-01 22:23:04 +01:00
kennyboy55 fe0ac3d808 Merge remote-tracking branch 'origin/dev' into dev 2015-11-01 22:16:11 +01:00
kennyboy55 c43d9091f7 Correct workload 2015-11-01 22:09:00 +01:00
Janco Kock ec89a212a9 Added some more calculation functions. 2015-11-01 21:58:09 +01:00
kennyboy55 a634a6f4f1 Merge remote-tracking branch 'origin/dev' into dev 
Conflicts:
	ErgometerIPR/ErgometerApplication/ErgometerTest.cs
 2015-11-01 21:53:29 +01:00
kennyboy55 e63f421689 Added messages 2015-11-01 21:46:18 +01:00
Janco Kock 171b1b95d7 Added VO2 calculate function 2015-11-01 21:22:44 +01:00
kennyboy55 73a64eed2e Implement all workloads 2015-11-01 18:48:16 +01:00
Janco Kock 92581f6b31 Workload test working 2015-11-01 18:05:25 +01:00
kennyboy55 b95164c7f3 Merge remote-tracking branch 'origin/dev' into dev 2015-11-01 17:17:16 +01:00
kennyboy55 c3019f9e68 Added gatherinfo panel and logic 2015-11-01 17:17:07 +01:00
Janco Kock 679f17a98f Calculated average hearthbeat, Added some new structure 2015-11-01 16:58:57 +01:00
Janco Kock 78404b2295 Added gender 2015-11-01 16:35:31 +01:00
Janco Kock 9bf99a6f38 Added start of ergometer test 2015-11-01 16:22:07 +01:00