Merge develop into master #1

Merged
SemvdH merged 40 commits from develop into master 2020-09-11 13:34:57 +00:00

40 Commits

Author SHA1 Message Date
Sem van der Hoeven
72c369a578 merge simulation into develop 2020-09-11 15:34:21 +02:00
Logophilist
1c0958f33c Bike Simulator 0x19 (acc)Power update and cadence fix 2020-09-11 15:31:14 +02:00
Logophilist
dee370a4cb Worked on 0x19 simulator 2020-09-11 14:48:44 +02:00
Sem van der Hoeven
40f70a42d4 changed while true 2020-09-11 12:41:29 +02:00
shinichi
4ab46d94db Merge branch 'DataConverter' into develop 2020-09-11 12:39:43 +02:00
shinichi
e77372c913 added resistance changing 2020-09-11 12:39:06 +02:00
Sem van der Hoeven
a471854d71 added null check for sending resistance 2020-09-11 12:37:15 +02:00
fabjuuuh
7da952628d Added comments to BikeSimulation 2020-09-11 11:55:13 +02:00
shinichi
6e07f3b33a fixed instant power
who doesn't love bit flipping
2020-09-11 11:50:28 +02:00
fabjuuuh
631129a206 Set resistance in simulator 2020-09-11 11:48:39 +02:00
Sem van der Hoeven
45096558fb added comments to dataconverter 2020-09-11 11:37:53 +02:00
fabjuuuh
024490df1e Made Interface 2020-09-11 11:32:28 +02:00
Sem van der Hoeven
8dac69ebf9 added documentation comments to BLEHandler 2020-09-11 11:27:37 +02:00
fabjuuuh
e5e6ae16fd Page 0x10 working 2020-09-11 11:24:04 +02:00
Sem van der Hoeven
5c29a9c064 removed some comments 2020-09-11 11:17:00 +02:00
fabjuuuh
03a0c6febb Merged 2020-09-11 11:09:59 +02:00
fabjuuuh
24ab1a01c1 Merge remote-tracking branch 'origin/DataConverter' into simulation 2020-09-11 11:03:08 +02:00
shinichi
ce2f91854e forgot to add
:P
2020-09-09 21:00:08 +02:00
shinichi
0b659a9dc3 better checksum fix
i was the dumb one :`(
2020-09-09 20:55:38 +02:00
shinichi
75f5ce7d7e checksum fix
dumbest reason ever          (maybe)
2020-09-09 20:47:45 +02:00
shinichi
226bc265ef idk i give up (sending messages to BLE) 2020-09-09 18:29:26 +02:00
shinichi
2854684b86 wip 2020-09-09 17:09:08 +02:00
fabjuuuh
a0e1e527a1 Almost done with page 0x10 2020-09-09 16:59:36 +02:00
fabjuuuh
692f9700cc Merge remote-tracking branch 'origin/DataConverter' into simulation 2020-09-09 16:02:11 +02:00
Sem van der Hoeven
11772f33b7 finished displaying of data of data page 25 (0x19) 2020-09-09 16:00:19 +02:00
Sem van der Hoeven
53735b3cad added cadence and accumulated power 2020-09-09 15:17:13 +02:00
fabjuuuh
149c327f7e BikeSimulater Start 2020-09-09 15:02:10 +02:00
Sem van der Hoeven
fafc3e38d3 Merge branch 'DataConverter' of https://github.com/SemvdH/Proftaak-RH-B4 into DataConverter 2020-09-09 14:58:14 +02:00
Sem van der Hoeven
3de18d7c23 added read for byte 1 of page 25 2020-09-09 14:58:10 +02:00
shinichi
bd40a117ec done with data page 0x10
byte 7 isn't checked
2020-09-09 14:57:23 +02:00
shinichi
650f308cf5 wip 2020-09-09 14:49:40 +02:00
shinichi
c5863e9026 Merge branch 'BLEReceiver' into develop 2020-09-09 13:45:15 +02:00
shinichi
8d9985ac89 BLEreceiver running bool 2020-09-09 13:44:50 +02:00
shinichi
87abee1207 error handling 2020-09-09 13:43:59 +02:00
shinichi
3e3a0cf4c4 wip
lunch break
2020-09-09 12:27:37 +02:00
fabjuuuh
9c55b545dd Things 2020-09-09 12:26:00 +02:00
fabjuuuh
b52926cc5a Merge remote-tracking branch 'origin/develop' into simulation 2020-09-09 12:12:09 +02:00
shinichi
261048c2df added Main 2020-09-09 11:56:29 +02:00
shinichi
8dce607028 added IDataconverter interface 2020-09-09 11:35:54 +02:00
shinichi
213a098356 basic class layout 2020-09-09 11:30:02 +02:00