02/07/15
Dependencies: mbed
main.cpp@54:9322b1b76e13, 2015-07-16 (annotated)
- Committer:
- aidanPJG
- Date:
- Thu Jul 16 14:22:47 2015 +0000
- Revision:
- 54:9322b1b76e13
- Parent:
- 53:10f4f519ba69
- Child:
- 55:58e9836f5ad1
Got UserInput class working. It now uses 2 separate methods. It is compatible with calculate method as well.
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
ADAMSTRUTT | 17:d9fb4a3780c7 | 1 | #include "mbed.h" |
ADAMSTRUTT | 17:d9fb4a3780c7 | 2 | #include "Calculate.h" |
ADAMSTRUTT | 17:d9fb4a3780c7 | 3 | #include "Distance.h" |
ADAMSTRUTT | 35:085a674c9fdf | 4 | #include "Data.h" |
aidanPJG | 48:e9578f56534a | 5 | #include "UserInput.h" |
ADAMSTRUTT | 20:0b2279011691 | 6 | //#include "Counter.h |
ADAMSTRUTT | 35:085a674c9fdf | 7 | |
aidanPJG | 25:bab86a12e9ad | 8 | Serial pc(USBTX, USBRX); // tx, rx |
ADAMSTRUTT | 17:d9fb4a3780c7 | 9 | |
ADAMSTRUTT | 20:0b2279011691 | 10 | int main(void) |
aidanPJG | 7:d6f78ba7c5f7 | 11 | { |
aidanPJG | 50:d794595c6868 | 12 | initialise(); //used to create the Datalog file |
aidanPJG | 54:9322b1b76e13 | 13 | // calculate(5,3); //testing |
aidanPJG | 54:9322b1b76e13 | 14 | |
aidanPJG | 54:9322b1b76e13 | 15 | int pins = inputNoOfPins(); |
aidanPJG | 54:9322b1b76e13 | 16 | double distance = inputDistance(); |
aidanPJG | 54:9322b1b76e13 | 17 | calculate(distance,pins); |
ADAMSTRUTT | 17:d9fb4a3780c7 | 18 | } |