Diff: main.cpp

Revision:

3:85bd3daf17ff

Parent:

2:730476ff1e87

Child:

4:573208af69ba

--- a/main.cpp	Sun Oct 23 07:13:18 2016 +0000
+++ b/main.cpp	Wed Oct 26 12:38:47 2016 +0000
@@ -9,14 +9,16 @@
 // 2016.10.23
 // 2016.10.23 changed
 Serial pc(SERIAL_TX, SERIAL_RX);
- 
+
 DigitalOut myled(LED3);
-AnalogIn adc(A0);
+AnalogIn adc1(A0);
+AnalogIn adc2(A1);
+AnalogIn adc3(A5);
 
 #define DO A4
 #define DI A6
 #define CS D9
-#define DC A1
+#define DC D11
 #define RST D7
 
 class SPIPreInit : public SPI
@@ -27,31 +29,37 @@
         frequency(2000000);
     };
 };
- 
+
 SPIPreInit mySpi(DI,NC,DO);
 Adafruit_SSD1306_Spi oled(mySpi,DC,RST,CS,64,128);
 
- 
- 
-int main() {
-  int i = 1;
-  int x =0;
-  oled.clearDisplay();
-  oled.setTextSize(2);
-  while(1) { 
-  
-  
-  x++;
-  oled.printf("%d %2.3f V\r\n", x, adc.read()*3300/1000);
-  oled.display();
-  wait(0.5);
-  pc.printf("%d %2.3f V\r\n", i++, adc.read()*3300/1000);
-  myled = !myled;
-  if(x>3) {
-  oled.setTextCursor(0,0);
-  oled.clearDisplay();
-  x=0;
-  }
-  }
+
+
+int main()
+{
+    int x=0;
+
+
+    oled.clearDisplay();
+    oled.setTextSize(2);
+    while(1) {
+        x++;
+        oled.printf("X %2.3f V\r\n",adc1.read()*3300/1000);
+        oled.printf("Y %2.3f V\r\n",adc2.read()*3300/1000);
+        oled.printf("Z %2.3f V\r\n",adc3.read()*3300/1000);
+
+        oled.display();
+        wait(0.5);
+
+        pc.printf("X %2.3f V\r\n", adc1.read()*3300/1000);
+        pc.printf("Y %2.3f V\r\n", adc2.read()*3300/1000);
+        pc.printf("Z %2.3f V\r\n", adc3.read()*3300/1000);
+
+//  myled = !myled;
+        if(x>0) {
+            oled.setTextCursor(0,0);
+            oled.clearDisplay();
+            x=0;
+        }
+    }
 }
- 
\ No newline at end of file