Nicolae Marton / Mbed 2 deprecated TDP3_MovementControl

Dependencies:   mbed

Committer:
Nicolaemf
Date:
Mon Oct 15 10:29:32 2018 +0000
Revision:
6:b476699ac7d4
Parent:
5:56de8fa841e2
Parent:
4:9827e5952222
Child:
11:5e955cf303ab
merge resolved;

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Nicolaemf 0:30183794e491 1 #include "mbed.h"
Nicolaemf 1:9c7329b9c23f 2 //hello guys, this is a test
Nicolaemf 4:9827e5952222 3
Nicolaemf 4:9827e5952222 4 //merge conflict for the win
Nicolaemf 4:9827e5952222 5
Nicolaemf 0:30183794e491 6 DigitalOut myled(LED1);
Nicolaemf 0:30183794e491 7
quickeman 3:c9e7b856026c 8 // This is the main() function
quickeman 5:56de8fa841e2 9 // hello
Nicolaemf 0:30183794e491 10 int main() {
Nicolaemf 0:30183794e491 11 while(1) {
Nicolaemf 0:30183794e491 12 myled = 1;
quickeman 2:55e5c2c48913 13 wait(10);
Nicolaemf 0:30183794e491 14 myled = 0;
Nicolaemf 1:9c7329b9c23f 15 wait(100);
Nicolaemf 0:30183794e491 16 }
Nicolaemf 0:30183794e491 17 }