Aidan Gallagher
testing forking
Fork of
ConsolTest
by 
Pipeline Technology Centre
Diff: Calculate.cpp
- Revision:
- 5:ddbc9c48480d
- Parent:
- 4:e61cd14ec4f0
- Child:
- 6:b1490f657b21
diff -r e61cd14ec4f0 -r ddbc9c48480d Calculate.cpp
--- a/Calculate.cpp Wed Jul 01 11:02:10 2015 +0000
+++ b/Calculate.cpp Wed Jul 01 13:51:02 2015 +0000
@@ -1,7 +1,16 @@
#include "Calculate.h"
#include <iostream>
-void Calculate() {
- std::cout << "Ohai from another .cpp file!";
- std::cin.get();
+float calculate()
+{
+
+ float speed = 2.34E+22f;
+ return speed;
+}
+
+float progression(bool Sensor1, bool Sensor2, bool Sensor3, bool sensor4, float radius)
+{
+ float distance = 2.34E+22f;
+
+ return distance;
}
\ No newline at end of file