Diff: JessesLab1/main.cpp

Revision:

51:e12b3635afae

Parent:

47:0efd125c7f2d

Child:

53:1c8235c49b70

--- a/JessesLab1/main.cpp	Sun Jan 24 20:58:34 2016 +0000
+++ b/JessesLab1/main.cpp	Sun Jan 24 16:32:04 2016 -0500
@@ -1,4 +1,4 @@
-/*// <- remove this if you want to code this and comment Georges
+// <- remove this if you want to code this and comment Georges
 #include "mbed.h"
 #include "DebounceIn.h"
 #include "PinDetect.h"
@@ -75,7 +75,7 @@
     return _pins.read();
 }
 
-Nav_Switch myNav( p20, p17, p18, p16, p19); //pin order on Sparkfun breakout
+Nav_Switch myNav( p19, p16, p17, p15, p18); //pin order on Sparkfun breakout
 
 int main()
 {
@@ -102,7 +102,7 @@
 //// Setup the Mpr121:
 //// constructor(i2c object, i2c address of the mpr121)
 //Mpr121 mpr121(&i2c, Mpr121::ADD_VSS);
-// 
+//
 //// Key hit/release interrupt routine
 //void fallInterrupt() {
 //  int key_code=0;
@@ -120,11 +120,11 @@
 //  led2=(key_code>>2) & 0x01;
 //  led1=(key_code>>3) & 0x01;
 //}
-// 
+//
 //int main() {
 //  interrupt.fall(&fallInterrupt);
 //  interrupt.mode(PullUp);
 //  while (1) {}
 //}
 
-*/
\ No newline at end of file
+// */