Pipeline Technology Centre
02/07/15
Dependencies: mbed
main.cpp@41:93e728f291f3, 2015-07-08 (annotated)
- Committer:
- ADAMSTRUTT
- Date:
- Wed Jul 08 10:49:31 2015 +0000
- Revision:
- 41:93e728f291f3
- Parent:
- 39:3527578e78dd
- Parent:
- 40:23008d8111d5
- Child:
- 42:b9055f46cfed
Merge before lunch Wednesday
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" |
| ADAMSTRUTT | 20:0b2279011691 | 5 | //#include "Counter.h |
| ADAMSTRUTT | 35:085a674c9fdf | 6 | |
| aidanPJG | 25:bab86a12e9ad | 7 | Serial pc(USBTX, USBRX); // tx, rx |
| ADAMSTRUTT | 17:d9fb4a3780c7 | 8 | |
| ADAMSTRUTT | 20:0b2279011691 | 9 | int main(void) |
| aidanPJG | 7:d6f78ba7c5f7 | 10 | { |
| ADAMSTRUTT | 41:93e728f291f3 | 11 | <<<<<<< local |
| aidanPJG | 38:da262dc4f90a | 12 | calculate(distance()); |
| ADAMSTRUTT | 41:93e728f291f3 | 13 | ======= |
| ADAMSTRUTT | 40:23008d8111d5 | 14 | data(1,3); |
| ADAMSTRUTT | 41:93e728f291f3 | 15 | >>>>>>> other |
| ADAMSTRUTT | 17:d9fb4a3780c7 | 16 | } |