Integrated, working file (e-button and watchdog not integrated yet)
Dependencies: Watchdog
Revision 10:b5f6337c3a20, committed 2019-06-26
- Comitter:
- JesiMiranda
- Date:
- Wed Jun 26 04:21:41 2019 +0000
- Parent:
- 9:ca11e4db63a7
- Commit message:
- Integrated working file (e-button, and watchdog not integrated yet)
Changed in this revision
Watchdog.lib | Show annotated file Show diff for this revision Revisions of this file |
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
diff -r ca11e4db63a7 -r b5f6337c3a20 Watchdog.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Watchdog.lib Wed Jun 26 04:21:41 2019 +0000 @@ -0,0 +1,1 @@ +https://os.mbed.com/users/nbremond/code/Watchdog/#40f189c7795b
diff -r ca11e4db63a7 -r b5f6337c3a20 main.cpp --- a/main.cpp Fri Apr 19 23:08:27 2019 +0000 +++ b/main.cpp Wed Jun 26 04:21:41 2019 +0000 @@ -1,9 +1,11 @@ #include "wheelchair.h" + QEI wheel (D10, D9, NC, 1200); //Initializes right encoder DigitalIn pt3(D10, PullUp); //Pull up resistors to read analog signals into digital signals DigitalIn pt4(D9, PullUp); + /*added*/ //DigitalIn e_button(D4); //emergency button will start at HIGH @@ -67,7 +69,7 @@ velocity.start(callback(&queue, &EventQueue::dispatch_forever)); //Starts running the velosity thread assistSafe.start(callback(&queue, &EventQueue::dispatch_forever)); //Starts running the velosity thread //ros_com.start(callback(&queue, &EventQueue::dispatch_forever)); //Starts running the velosity thread - pc.printf("After starting\r\n"); + pc.printf("After starting\r\n"); //added // int emerg_button = e_button;