GroupA
/
WaG_final
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: mbed
Diff: main.cpp
- Revision:
- 45:54d18ab80fd1
- Parent:
- 43:3b7f326aa096
- Parent:
- 44:4c2ba5bbba67
- Child:
- 46:85c4b722baa7
--- a/main.cpp Thu Mar 29 16:28:06 2018 +0000
+++ b/main.cpp Thu Mar 29 20:02:25 2018 +0000
@@ -19,6 +19,7 @@
#include "utility.h"
#include "analog.h"
#include "laser.h"
+#include "wag.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -35,8 +36,9 @@
DigitalOut laser(LZR_ENABLE);
AnalogIn mux_out (MUX_OUT);
BusOut mux_select(MUX_S0, MUX_S1, MUX_S2, MUX_S3);
-
-
+DigitalIn station_select(UI_STATION_SELECT); //station variable (1 == STATION_A, 2 == STATION_B)
+int station = -1;
+int *cal_status = NOT_CALIBRATED;
struct spi_cfg as1107{
SPI_AS1107_ID,
@@ -76,5 +78,11 @@
lzr_off();
wait(0.5);
}
+<<<<<<< local
lzr_init();
+=======
+
+ // determine if the wag is connected to station A or station B
+ station = station_select.read();
+>>>>>>> other
}
\ No newline at end of file