Kevin Kent / Mbed 2 deprecated XVHE_HID

IVSC Project

Dependencies:   USBDevice mbed

Files at this revision

API Documentation at this revision

Revision 2:d0778c36d28d, committed 2012-11-28

Comitter:
kevinkent
Date:
Wed Nov 28 19:14:21 2012 +0000
Parent:
1:82f2ef52759e
Child:
3:0072c2a81472
Commit message:
Fixed fall thru on main case structure.
; Reported hanging after some msgs.

Changed in this revision

DigiPot.cpp Show annotated file Show diff for this revision Revisions of this file
Max5250.cpp Show annotated file Show diff for this revision Revisions of this file
Relay.cpp 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
main.h Show annotated file Show diff for this revision Revisions of this file 
--- a/DigiPot.cpp	Wed Nov 14 20:01:50 2012 +0000
+++ b/DigiPot.cpp	Wed Nov 28 19:14:21 2012 +0000
@@ -1,12 +1,13 @@
 //
 #include "DigiPot.h"
-#include "mbed.h"
 #include "MCP4651.h"
 
+Serial dbg1(USBTX,USBRX);
+
 // Enable pins for PCA9
 BusOut Pbus(p14,p13,p12,p11);
 
-Serial dbg(USBTX, USBRX);
+//Serial dbg(USBTX, USBRX);
 
 MCP4651 Chip1(p9, p10, 0x1);
 MCP4651 Chip2(p9, p10, 0x2);
@@ -54,12 +55,12 @@
 //  Decode the HID report and set the pots
 int SetResist( uint8_t *data) {
     int wiper = 0, value = 0;
-    dbg.printf("data[0] = %d\n",data[0]);
-    dbg.printf("data[1] = %d\n",data[1]);
-    dbg.printf("data[2] = %d\n",data[2]);
-    dbg.printf("data[3] = %d\n",data[3]);
-    dbg.printf("data[4] = %d\n",data[4]);
-    dbg.printf("data[5] = %d\n",data[5]);
+    dbg1.printf("data[0] = %d\n",data[0]);
+    dbg1.printf("data[1] = %d\n",data[1]);
+    dbg1.printf("data[2] = %d\n",data[2]);
+    dbg1.printf("data[3] = %d\n",data[3]);
+    dbg1.printf("data[4] = %d\n",data[4]);
+    dbg1.printf("data[5] = %d\n",data[5]);
     if (data[0] != 3) return(1);
     if (data[1] == 0) return(1); // Zero = bus disable
     if (data[3] == 0) return(1); // Zero disallowed
@@ -70,32 +71,32 @@
     switch (data[3]) {
         case 1:
             Chip1.SetValue(wiper, value);
-            dbg.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
+            dbg1.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
             break;
         case 2:
             Chip2.SetValue(wiper, value);
-            dbg.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
+            dbg1.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
             break;
         case 3:
             Chip3.SetValue(wiper, value);
-            dbg.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
+            dbg1.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
             break;
         case 4:
             Chip4.SetValue(wiper, value);
-            dbg.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
+            dbg1.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
             break;
         case 5:
             Chip5.SetValue(wiper, value);
-            dbg.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
+            dbg1.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
             break;
         case 6:
             Chip6.SetValue(wiper, value);
-            dbg.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
+            dbg1.printf("Set Pbus = %d, Chip = %d, Pot = %d, Value = %d\n", data[1], data[3], wiper, value);
             break;
         default:
             break;
        }
-    dbg.printf("got here\n");
+    dbg1.printf("Resistor Set Done\n");
     data[0] = 0;
     Pbus = 0;
     return(0);

--- a/Max5250.cpp	Wed Nov 14 20:01:50 2012 +0000
+++ b/Max5250.cpp	Wed Nov 28 19:14:21 2012 +0000
@@ -3,7 +3,7 @@
 
  SPI spi(p5, NC, p7); 
  DigitalOut cs(p8);
- Serial dbg1(USBTX, USBRX);
+ Serial dbg3(USBTX, USBRX);
  
 int DAC_Setup(void) {
     spi.format(16,0);
@@ -25,7 +25,7 @@
     cmd = (data[1] << 12);
     cmd += (data[2] << 10);
     cmd += (data[3] << 2);
-    dbg1.printf("cmd = %0x\n", cmd);
+    dbg3.printf("cmd = %0x\n", cmd);
     
     cs = 0;
     spi.write(cmd);

--- a/Relay.cpp	Wed Nov 14 20:01:50 2012 +0000
+++ b/Relay.cpp	Wed Nov 28 19:14:21 2012 +0000
@@ -1,6 +1,7 @@
 #include "mbed.h"
 #include "Relay.h"
 
+Serial dbg2(USBTX,USBRX);
 DigitalOut v13_en(p15);
 DigitalOut v18_en(p16);
 DigitalOut Ext_Sw(p17);
@@ -21,15 +22,19 @@
     switch (data[1]) {
         case 1:
             v13_en = data[2];
+            dbg2.printf("13.8V = %d\n",data[2]);
             break;
         case 2:
             v18_en = data[2];
+            dbg2.printf("18V = %d\n",data[2]);
             break;
         case 3:
             Hpco = data[2];
+            dbg2.printf("HPCO = %d\n",data[2]);
             break;
         case 4:
             Ext_Sw = data[2];
+            dbg2.printf("Ext SW = %d\n",data[2]);
             break;
         default:
             break;

--- a/main.cpp	Wed Nov 14 20:01:50 2012 +0000
+++ b/main.cpp	Wed Nov 28 19:14:21 2012 +0000
@@ -1,10 +1,11 @@
 #include "mbed.h"
+#include "main.h"
 #include "USBHID.h"
 #include "DigiPot.h"
 #include "Max5250.h"
 #include "Relay.h"
 
- Serial pc(USBTX,USBRX);
+
  USBHID hid;
  HID_REPORT recv, xmit;
  BusOut leds(LED1,LED2,LED3,LED4);
@@ -42,6 +43,7 @@
         case 3:
            pc.printf("Going to Resistor set\n");
             SetResist(recv.data);
+            break;
         case 4:
            pc.printf("Going to DAC set\n");
             SetDAC(recv.data);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.h	Wed Nov 28 19:14:21 2012 +0000
@@ -0,0 +1,5 @@
+//main.h
+
+ Serial pc(USBTX,USBRX);
+
+ 
\ No newline at end of file