segway_self balancing robot 4180 project
Dependencies: mbed mbed-rtos LSM9DS1_Library
Diff: main.cpp
- Revision:
- 3:a9e77d6c56f8
- Parent:
- 1:5afff7819c5e
- Parent:
- 2:d57d50a20cdb
- Child:
- 4:e9036eff403f
--- a/main.cpp Thu Apr 09 20:32:46 2020 +0000
+++ b/main.cpp Thu Apr 09 20:35:18 2020 +0000
@@ -1,6 +1,10 @@
#include "mbed.h"
+<<<<<<< working copy
DigitalOut myled(LED3);
+=======
+DigitalOut myled(LED4);
+>>>>>>> merge rev
int main() {
while(1) {
