song zhao / smartball_project_test_board

to cai

Dependencies:   BLE_API nRF51822

Fork of BLE_NODE_TEST by Yihui Xiong

Diff: main.cpp

Revision:
11:22480ac31879
Parent:
9:05f0b5a3a70a
--- a/main.cpp	Wed Oct 29 06:23:47 2014 +0000
+++ b/main.cpp	Thu Nov 27 09:30:36 2014 +0000
@@ -33,6 +33,7 @@
 DigitalOut  green(p17);
 InterruptIn button(p30);
 Battery     battery(p5);
+AnalogIn    vcc(p6);
 
 BLEDevice  ble;
 UARTService *uartServicePtr;
@@ -40,7 +41,7 @@
 
 BusOut outputGrove(p3, p4);
 BusIn  inputGrove(p1, p2);
-BusIn  charge(p6, p7);
+BusIn  charge(p29, p28);
 
 volatile bool button_event = false;
 
@@ -84,9 +85,10 @@
     
     outputGrove = output;
     
-    button_event = true;
     uartServicePtr->printf("battery:%3.2fV\n", battery.read());
     
+    uartServicePtr->printf("vcc:%3.2fV\n", vcc.read() * 1.2 * 12.2 / 2.2);
+    
     
     input = inputGrove;
     uartServicePtr->printf("o->i:%d->%d\n", output, input);