Avans/ErgometerIPR
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57 Commits 3 Branches 0 Tags
33c7887d1dbc0710a5ba06dc32dfc734cd13c1ad
Commit Graph
57 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kennyboy55 33c7887d1d Revert commit, changed timings 2015-11-02 15:22:30 +01:00
Janco Kock f610fc5465 Check if there are enough workloads 2015-11-02 15:13:50 +01:00
kennyboy55 a1b8d87c2f Merge remote-tracking branch 'origin/dev' into dev 2015-11-02 15:04:22 +01:00
kennyboy55 f1cf137519 Fix missing data 2015-11-02 15:04:17 +01:00
Janco Kock 314a1964b6 Fixed string.format bug (reverted from commit 34ade8178b) 2015-11-02 15:02:06 +01:00
kennyboy55 9308d5cea0 Merge remote-tracking branch 'origin/dev' into dev 2015-11-02 14:58:09 +01:00
kennyboy55 c8b1933b8f Fix null data 2015-11-02 14:57:55 +01:00
Janco Kock 34ade8178b Fixed string.format bug 2015-11-02 14:57:04 +01:00
kennyboy55 150739cd07 Stop test en logout 2015-11-02 14:50:58 +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 3b28c2c5d1 Dynamically change size of panel 2015-11-02 14:34:31 +01:00
kennyboy55 2b2be4523e Added check if heartbeat is zero 2015-11-02 14:18:29 +01:00
kennyboy55 7f4edf99b7 Fixed sending new data types and implemented them 2015-11-02 14:08:50 +01:00
kennyboy55 7f0e387065 Merge remote-tracking branch 'origin/dev' into dev 2015-11-02 13:31:07 +01:00
kennyboy55 dcd98e44d2 Save/Load TestResult/PersonalData 2015-11-02 13:31:02 +01:00
Janco Kock afaeeda67f Fixed word wrap kinda 2015-11-02 13:28:45 +01:00
kennyboy55 baf1171f4e Fix uitleg netcommand 2015-11-02 13:05:54 +01:00
kennyboy55 fc1d9a8fa0 Merge remote-tracking branch 'origin/dev' into dev 2015-11-02 13:01:34 +01:00
kennyboy55 424b6ddc9c Send uitleg to doctor 2015-11-02 13:01:24 +01:00
Janco Kock 1160cbca65 Doktor receives and update help text 2015-11-02 13:00:21 +01:00
kennyboy55 fe1c7c28b8 Added testresult 2015-11-02 12:55:55 +01:00
kennyboy55 177c89c43e Merge remote-tracking branch 'origin/dev' into dev 2015-11-02 12:48:52 +01:00
kennyboy55 ae9eac8ff7 Added PersonData and Uitleg 2015-11-02 12:48:37 +01:00
Janco Kock d236d350b2 Added panelclientsteps to doctor 2015-11-02 12:47:10 +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 d68a328e0d Update README.md 2015-11-01 22:30:04 +01:00
kennyboy55 3d265f10a5 Added todo 2015-11-01 22:29:34 +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 71bff3dc73 Fix power not being set 2015-11-01 22:16:05 +01:00
kennyboy55 c43d9091f7 Correct workload 2015-11-01 22:09:00 +01:00
kennyboy55 87213aecbb Added command mode 2015-11-01 22:08:39 +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 4f322fd866 Reduced CPU Usage 2015-11-01 20:51:26 +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 18d37e40fb Add random value on startup for testing 2015-11-01 17:26:29 +01:00
kennyboy55 31ca462666 Reset ergometer after start session 2015-11-01 17:23:45 +01:00
kennyboy55 f2324d88ae implemented ergotest 2015-11-01 17:18:45 +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