Diff: main.cpp

Revision:

3:589f800b8980

Parent:

1:c437fef79bc3

diff -r 5d229b5045f9 -r 589f800b8980 main.cpp
--- a/main.cpp	Sun Jun 11 13:10:42 2017 +0000
+++ b/main.cpp	Sun Jun 18 20:01:01 2017 +0000
@@ -1,6 +1,10 @@
 #include "mbed.h"
 #include "mcp3008.h"
 
+#define UART_TRACE  0
+#define UART_CSV_DEVICE0    0
+#define UART_CSV_DEVICE1    1
+
 #define SAMPLING_RATE   (48000)
 #define SAMPLING_PERIOD (1.0f/SAMPLING_RATE)
 
@@ -20,32 +24,49 @@
     MCP3008 mcp3008_0(spiM, D10);
     MCP3008 mcp3008_1(spiM, D9);
     
-    float v0[8];
-    float v1[8];
+    float vf0[8];
+    float vf1[8];
+    
+    uint16_t vi0[8];
+    uint16_t vi1[8];
     
     Ticker t;
     t.attach(&isr, SAMPLING_PERIOD);
 
     for (;;) {
         for (int i = 0; i < 8; i++) {
-            v0[i] = mcp3008_0.read_input(i);
+            vf0[i] = mcp3008_0.read_input(i);
+            vi0[i] = mcp3008_0.read_input_u16(i);
         }        
         for (int i = 0; i < 8; i++) {
-            v1[i] = mcp3008_1.read_input(i);
+            vf1[i] = mcp3008_1.read_input(i);
+            vi1[i] = mcp3008_1.read_input_u16(i);
         }        
         
+#if UART_TRACE
         printf("Device0\t");
         for (int i = 0; i < 8; i++) {
-            printf("%.3f\t", v0[i]);
+            printf("%0.3f(%4d)\t", vf0[i], vi0[i]);
         }
         printf("\r\n");
         printf("Device1\t");
         for (int i = 0; i < 8; i++) {
-            printf("%.3f\t", v1[i]);
+            printf("%0.3f(%4d)\t", vf1[i], vi1[i]);
+        }
+        printf("\r\n");
+#elif UART_CSV_DEVICE0
+        for (int i = 0; i < 8; i++) {
+            printf("%4d,", vi0[i]);
         }
         printf("\r\n");
+#elif UART_CSV_DEVICE1
+        for (int i = 0; i < 8; i++) {
+            printf("%4d,", vi1[i]);
+        }
+        printf("\r\n");
+#endif
         
-        wait(0.2);
+        wait(0.1);
     }
 }
  
\ No newline at end of file