GroupA
/
Lab_6_WaG
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:
- 27:a07b27cc6d13
- Parent:
- 25:896dbc85907e
- Parent:
- 26:3006f5abc0a5
- Child:
- 28:0736dfa41aab
--- a/main.cpp Thu Mar 22 15:29:58 2018 +0000
+++ b/main.cpp Thu Mar 22 15:37:20 2018 +0000
@@ -26,9 +26,13 @@
DigitalIn jog_cw(UI_JOG_RIGHT_BUTTON);
DigitalIn jog_ccw(UI_JOG_LEFT_BUTTON);
DigitalIn my_button(USER_BUTTON);
+<<<<<<< local
DigitalIn start_button(UI_START_BUTTON);
DigitalIn cal_button(UI_CAL_BUTTON);
DigitalIn station_select(UI_STATION_SELECT);
+=======
+BusOut mux_select(MUX_S0, MUX_S1, MUX_S2, MUX_S3);
+>>>>>>> other
struct spi_cfg as1107{
SPI_AS1107_ID,