song zhao / smartball_project_test_board

to cai

Dependencies:   BLE_API nRF51822

Fork of BLE_NODE_TEST by Yihui Xiong

Diff: battery.h

Revision:
11:22480ac31879
Parent:
9:05f0b5a3a70a
--- a/battery.h	Wed Oct 29 06:23:47 2014 +0000
+++ b/battery.h	Thu Nov 27 09:30:36 2014 +0000
@@ -8,14 +8,14 @@
 class Battery {
 public:
     Battery(PinName pin) {
-        _pin = pin;
+        uint32_t n = (uint32_t) pin;
+        channel = 1 << (1 + n);
     }
     
     float read() {
         uint32_t pre_enable_register = NRF_ADC->ENABLE;
         uint32_t pre_config_register = NRF_ADC->CONFIG;
-        uint32_t pin = (uint32_t) _pin;
-        uint32_t channel = 1 << (1 + pin);
+        
         
         NRF_ADC->ENABLE = ADC_ENABLE_ENABLE_Enabled;
         NRF_ADC->CONFIG = (ADC_CONFIG_RES_10bit << ADC_CONFIG_RES_Pos) |
@@ -37,7 +37,7 @@
     }
     
 private:
-    PinName _pin;
+    uint32_t channel;
 };
 
 #endif // __BATTERY_H__