![](/media/cache/img/default_profile.jpg.50x50_q85.jpg)
testing forking
Fork of ConsolTest by
Calculate.cpp@5:ddbc9c48480d, 2015-07-01 (annotated)
- Committer:
- aidanPJG
- Date:
- Wed Jul 01 13:51:02 2015 +0000
- Revision:
- 5:ddbc9c48480d
- Parent:
- 4:e61cd14ec4f0
- Child:
- 6:b1490f657b21
closer;
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
aidanPJG | 4:e61cd14ec4f0 | 1 | #include "Calculate.h" |
aidanPJG | 4:e61cd14ec4f0 | 2 | #include <iostream> |
aidanPJG | 4:e61cd14ec4f0 | 3 | |
aidanPJG | 5:ddbc9c48480d | 4 | float calculate() |
aidanPJG | 5:ddbc9c48480d | 5 | { |
aidanPJG | 5:ddbc9c48480d | 6 | |
aidanPJG | 5:ddbc9c48480d | 7 | float speed = 2.34E+22f; |
aidanPJG | 5:ddbc9c48480d | 8 | return speed; |
aidanPJG | 5:ddbc9c48480d | 9 | } |
aidanPJG | 5:ddbc9c48480d | 10 | |
aidanPJG | 5:ddbc9c48480d | 11 | float progression(bool Sensor1, bool Sensor2, bool Sensor3, bool sensor4, float radius) |
aidanPJG | 5:ddbc9c48480d | 12 | { |
aidanPJG | 5:ddbc9c48480d | 13 | float distance = 2.34E+22f; |
aidanPJG | 5:ddbc9c48480d | 14 | |
aidanPJG | 5:ddbc9c48480d | 15 | return distance; |
aidanPJG | 4:e61cd14ec4f0 | 16 | } |