Diff: main.cpp

Revision:

8:c06ce18ad746

Parent:

7:78e7984909f4

Child:

9:4b45cc112a16

diff -r 78e7984909f4 -r c06ce18ad746 main.cpp
--- a/main.cpp	Thu Jan 19 14:49:36 2017 +0000
+++ b/main.cpp	Thu Jan 19 15:28:54 2017 +0000
@@ -8,20 +8,18 @@
 '#00': print analog input voltages on all pins (deafault printout on startup)
 '#01': print analog input voltage on pin PTE20
 '#02': print analog input voltage on pin PTB0 
-'#03': print analog input voltage on pin PTE21
-'#04': print analog input voltage on pin PTB1
-'#05': print analog input voltage on pin PTE22
-'#06': print analog input voltage on pin PTB2
-'#07': print analog input voltage on pin PTE23
-'#08': print analog input voltage on pin PTB3
-'#09': print analog input voltage on pin PTE29
-'#10': print analog input voltage on pin PTC2
-'#11': print analog input voltage on pin PTE30
-'#12': print analog input voltage on pin PTC1
-'#13': print analog input voltage on pin PTC0
-'#14': print analog input voltage on pin PTD1
-'#15': print analog input voltage on pin PTD5
-'#16': print analog input voltage on pin PTD6
+'#03': print analog input voltage on pin PTB1
+'#04': print analog input voltage on pin PTE22
+'#05': print analog input voltage on pin PTB2
+'#06': print analog input voltage on pin PTE23
+'#07': print analog input voltage on pin PTB3
+'#08': print analog input voltage on pin PTE29
+'#09': print analog input voltage on pin PTC2
+'#10': print analog input voltage on pin PTE30
+'#11': print analog input voltage on pin PTC1
+'#12': print analog input voltage on pin PTC0
+'#13': print analog input voltage on pin PTD5
+'#14': print analog input voltage on pin PTD6
 */
 
 #include "mbed.h"
@@ -30,24 +28,23 @@
 Serial serial(USBTX, USBRX);
 Timer timer;
 
-//IMPORTANT NOTE: PTA1 and PTA2 ARE RESERVED FOR SERIAL COMMUNICATION VIA SDA USB!!! DO NOT USE FOR SENSOR/ACTUATOR I/O!!!
+//IMPORTANT NOTE: PTA1 and PTA2 ARE RESERVED FOR SERIAL COMMUNICATION VIA SDA USB!!! DO NOT USE FOR SENSOR/ACTUATOR I/O!!! PTD1 IS USED FOR ON BOARD LED
+//PTE21 should be 16 bit ADC but doesnt work as ADC on mbed. Instead PTE21 reads whatever analog reading is input to PTE29
 //Analog inputs : 0-3.3V
 AnalogIn pin1(PTE20);//works as 16 bit ADC
 AnalogIn pin2(PTB0); //works as 12 bit ADC
-AnalogIn pin3(PTE21);//should be 16 bit ADC but doesnt work as ADC on mbed. Instead PTE21 reads whatever analog reading is input to PTE29
-AnalogIn pin4(PTB1); //works as 12 bit ADC
-AnalogIn pin5(PTE22);//works as 12 bit ADC
-AnalogIn pin6(PTB2);//works as 12 bit ADC
-AnalogIn pin7(PTE23);//works as 12 bit ADC
-AnalogIn pin8(PTB3); //works as 12 bit ADC
-AnalogIn pin9(PTE29);//works as 12 bit ADC
-AnalogIn pin10(PTC2);//works as 12 bit ADC
-AnalogIn pin11(PTE30);//works as 12 bit ADC
-AnalogIn pin12(PTC1);//works as 12 bit ADC
-AnalogIn pin13(PTC0);//works as 12 bit ADC
-AnalogIn pin14(PTD1);// doesnt work. Seems to be stuck at 3.3V
-AnalogIn pin15(PTD5);//works as 12 bit ADC
-AnalogIn pin16(PTD6);//works as 12 bit ADC
+AnalogIn pin3(PTB1); //works as 12 bit ADC
+AnalogIn pin4(PTE22);//works as 12 bit ADC
+AnalogIn pin5(PTB2);//works as 12 bit ADC
+AnalogIn pin6(PTE23);//works as 12 bit ADC
+AnalogIn pin7(PTB3); //works as 12 bit ADC
+AnalogIn pin8(PTE29);//works as 12 bit ADC
+AnalogIn pin9(PTC2);//works as 12 bit ADC
+AnalogIn pin10(PTE30);//works as 12 bit ADC
+AnalogIn pin11(PTC1);//works as 12 bit ADC
+AnalogIn pin12(PTC0);//works as 12 bit ADC
+AnalogIn pin13(PTD5);//works as 12 bit ADC
+AnalogIn pin14(PTD6);//works as 12 bit ADC
 
 //Built in LEDs
 PwmOut rLed(LED_RED);
@@ -64,7 +61,7 @@
 
 //other globals
 char charCCIn[3];
-int decCCIn;
+int decCCIn=0; //by default, output all analog pins on startup
 int updatePeriodMs = 1000;
 
 void ledConfirmSent()//Light up blue LED 10%
@@ -89,49 +86,43 @@
     }
     if (pinNum == 0 || pinNum == 2) {
         serial.printf("%s%03.1f%s\r\n", "#PTB0: ", 3.3f*pin2.read(), "V");
-    }
+    }    
     if (pinNum == 0 || pinNum == 3) {
-        serial.printf("%s%03.1f%s\r\n", "#PTE21: ", 3.3f*pin3.read(), "V");
+        serial.printf("%s%03.1f%s\r\n", "#PTB1: ", 3.3f*pin4.read(), "V");
     }
     if (pinNum == 0 || pinNum == 4) {
-        serial.printf("%s%03.1f%s\r\n", "#PTB1: ", 3.3f*pin4.read(), "V");
-    }
-    if (pinNum == 0 || pinNum == 5) {
         serial.printf("%s%03.1f%s\r\n", "#PTE22: ", 3.3f*pin5.read(), "V");
     }
+    if (pinNum == 0 || pinNum == 5) {
+        serial.printf("%s%03.1f%s\r\n", "#PTB2: ", 3.3f*pin6.read(), "V");
+    }
     if (pinNum == 0 || pinNum == 6) {
-        serial.printf("%s%03.1f%s\r\n", "#PTB2: ", 3.3f*pin6.read(), "V");
+        serial.printf("%s%03.1f%s\r\n", "#PTE23: ", 3.3f*pin7.read(), "V");
     }
     if (pinNum == 0 || pinNum == 7) {
-        serial.printf("%s%03.1f%s\r\n", "#PTE23: ", 3.3f*pin7.read(), "V");
+        serial.printf("%s%03.1f%s\r\n", "#PTB3: ", 3.3f*pin8.read(), "V");
     }
     if (pinNum == 0 || pinNum == 8) {
-        serial.printf("%s%03.1f%s\r\n", "#PTB3: ", 3.3f*pin8.read(), "V");
-    }
-    if (pinNum == 0 || pinNum == 9) {
         serial.printf("%s%03.1f%s\r\n", "#PTE29: ", 3.3f*pin9.read(), "V");
     }
+    if (pinNum == 0 || pinNum == 9) {
+        serial.printf("%s%03.1f%s\r\n", "#PTC2: ", 3.3f*pin10.read(), "V");
+    }
     if (pinNum == 0 || pinNum == 10) {
-        serial.printf("%s%03.1f%s\r\n", "#PTC2: ", 3.3f*pin10.read(), "V");
+        serial.printf("%s%03.1f%s\r\n", "#PTE30: ", 3.3f*pin11.read(), "V");
     }
     if (pinNum == 0 || pinNum == 11) {
-        serial.printf("%s%03.1f%s\r\n", "#PTE30: ", 3.3f*pin11.read(), "V");
+        serial.printf("%s%03.1f%s\r\n", "#PTC1: ", 3.3f*pin12.read(), "V");
     }
     if (pinNum == 0 || pinNum == 12) {
-        serial.printf("%s%03.1f%s\r\n", "#PTC1: ", 3.3f*pin12.read(), "V");
+        serial.printf("%s%03.1f%s\r\n", "#PTC0: ", 3.3f*pin13.read(), "V");
     }
     if (pinNum == 0 || pinNum == 13) {
-        serial.printf("%s%03.1f%s\r\n", "#PTC0: ", 3.3f*pin13.read(), "V");
+        serial.printf("%s%03.1f%s\r\n", "#PTD5: ", 3.3f*pin14.read(), "V");
     }
     if (pinNum == 0 || pinNum == 14) {
-        serial.printf("%s%03.1f%s\r\n", "#PTD1: ", 3.3f*pin14.read(), "V");
-    }
-    if (pinNum == 0 || pinNum == 15) {
-        serial.printf("%s%03.1f%s\r\n", "#PTD5: ", 3.3f*pin15.read(), "V");
-    }
-    if (pinNum == 0 || pinNum == 16) {
-        serial.printf("%s%03.1f%s\r\n", "#PTD6: ", 3.3f*pin16.read(), "V");
-    }
+        serial.printf("%s%03.1f%s\r\n", "#PTD6: ", 3.3f*pin15.read(), "V");
+    }    
     ledConfirmSent();
 }
 
@@ -139,7 +130,7 @@
 {
     if (rxBuffer[0] !='#') {
         serial.printf("%s\r\n", "Input format should be '#XX'. First input character should be '#'");
-        serial.printf("%s\r\n", "followed by XX where XX goes from '00' to '16'");
+        serial.printf("%s\r\n", "followed by XX where XX goes from '00' to '14'");
     }
     for (int i = 0; i < 2; i++) {
         charCCIn[i] = rxBuffer[i+1];