Diff: max32630fthr.cpp

Revision:

10:aee086319400

Parent:

9:760049f68423

diff -r 760049f68423 -r aee086319400 max32630fthr.cpp
--- a/max32630fthr.cpp	Wed Dec 14 22:35:05 2016 +0000
+++ b/max32630fthr.cpp	Wed Dec 14 23:43:17 2016 +0000
@@ -97,11 +97,6 @@
         vddioh(P5_4, m_hdrVio);
         vddioh(P5_5, m_hdrVio);
         vddioh(P5_6, m_hdrVio);
-        
-        if(ADC_Init() == E_NO_ERROR)
-        {
-            rtnVal = 0;
-        }
     }
     
     return rtnVal;
@@ -181,17 +176,14 @@
 int32_t MAX32630FTHR::readMonVoltage(MAX14690::monCfg_t monCfg, float *volts)
 {
     int32_t rtnVal = -1;
-    uint16_t data;
-    
+   
     if(m_max14690.monSet(monCfg, MAX14690::MON_DIV4) == 0)
     {
         wait_ms(1);
-        ADC_StartConvert(ADC_CH_0, 1, 0);
-        if(ADC_GetData(&data) == E_NO_ERROR)
-        {
-            *volts = ((((0x03FF & data) * 4.8F)/1023.0F));
-            rtnVal = m_max14690.monSet(MAX14690::MON_HI_Z, MAX14690::MON_DIV1);
-        }
+        AnalogIn a0(AIN_0);
+        *volts = (a0.read() * 4.8F);
+        rtnVal = m_max14690.monSet(MAX14690::MON_HI_Z, MAX14690::MON_DIV1);
+        wait_ms(1);
     } 
     
     return rtnVal;