Diff: main.cpp

Revision:

80:7a4856c596fc

Parent:

79:5f24cfd685d8

Child:

81:30d699e951a8

Child:

84:5b4466dd2326

--- a/main.cpp	Tue Jun 20 16:49:19 2017 +0000
+++ b/main.cpp	Thu Aug 03 17:38:02 2017 +0000
@@ -24,6 +24,7 @@
 DigitalOut status_0(D0);
 DigitalOut status_1(D1);
 DigitalOut status_3(D3);
+DigitalOut Start_sync(D4);//
 DigitalIn sw2(SW2);//Button 2
 DigitalIn sw3(SW3);//Button 3
 
@@ -90,12 +91,22 @@
     pc.baud(230400);
     
     //pc.printf("High: %x Mid: %x Low: %x",SIM->UIDH,SIM->UIDML,SIM->UIDL);
-    if(SIM->UIDH == 0x12ffff && SIM->UIDML == 0x4e453103 && SIM->UIDL == 0x60010030) probe_number = 1;
-    if(SIM->UIDH == 0x19ffff && SIM->UIDML == 0x4d441504 && SIM->UIDL == 0x90110031) probe_number = 2;
-    if(SIM->UIDH == 0x10ffff && SIM->UIDML == 0x4e453105 && SIM->UIDL == 0x100b0031) probe_number = 3;
-    if(SIM->UIDH == 0x14ffff && SIM->UIDML == 0x4e453154 && SIM->UIDL == 0x5009002b) probe_number = 4;
-    if(SIM->UIDH == 0x2effff && SIM->UIDML == 0x4e453154 && SIM->UIDL == 0x1004001e) probe_number = 5;
     
+    if(SIM->UIDH == 0x2effff && SIM->UIDML == 0x4e453154 && SIM->UIDL == 0x1004001e) probe_number = 1;
+    else if(SIM->UIDH == 0x1cffff && SIM->UIDML == 0x4e453215 && SIM->UIDL == 0x700b0003) probe_number = 2;
+    else if(SIM->UIDH == 0x2effff && SIM->UIDML == 0x4e453215 && SIM->UIDL == 0x700b0021) probe_number = 3;
+    else if(SIM->UIDH == 0x14ffff && SIM->UIDML == 0x4e453154 && SIM->UIDL == 0x5009002b) probe_number = 4;
+    else if(SIM->UIDH == 0x12ffff && SIM->UIDML == 0x4e453103 && SIM->UIDL == 0x60010030) probe_number = 5;
+    else if(SIM->UIDH == 0x10ffff && SIM->UIDML == 0x4e453105 && SIM->UIDL == 0x100b0031) probe_number = 6;
+    else if(SIM->UIDH == 0x19ffff && SIM->UIDML == 0x4d441504 && SIM->UIDL == 0x90110031) probe_number = 7;//this FRDM board had a bad usb connection
+    else
+    {
+        pc.printf("FRDM BOARD NOT RECOGNIZED.  Here is the new ID:\n\r");
+        pc.printf("High: %x Mid: %x Low: %x\n\r",SIM->UIDH,SIM->UIDML,SIM->UIDL);
+        probe_number = 6;
+    }
+    pc.printf("PROBE #%d",probe_number);
+    wait(1.0f);
     /*
     while(!pc.readable())
     {