test ADC_TEST

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteADC.h

@@ -150,7 +150,8 @@ static void ADCChannelSelect(uint8_t ADCChannel){
         // AINp is AIN1; AINn is GND
         // AIN1, which is a volt measure
         case ADC_CH_VOLT :{
-            ADC_write(CMD_VOLT_MEASURE);
+//            ADC_write(CMD_VOLT_MEASURE);
+            ADC_write(CMD_BATTERY_MEASURE);
             break;
         }
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_batt.h

@@ -42,20 +42,25 @@ static void headstage_battery_volt(){
 
 static void EliteADCBattery(){
     static uint8_t ADCSwitch = 0;
-
-    if(ADCSwitch == 0){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 1){ /**read V**/
-        ReadBatVolt(spi_ADC_rxbuf);
-        ADCSwitch++;
-    }
-    else if(ADCSwitch == 2){ /**read V(buffer)**/
-        headstage_battery_volt();
-        batteryCheck_flag = false;
+    if(INSTRUCTION.eliteFxn == ADC_TEST){
         ADCSwitch = 0;
+    }else{
+        if(ADCSwitch == 0){ /**read V**/
+            ReadBatVolt(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 1){ /**read V**/
+            ReadBatVolt(spi_ADC_rxbuf);
+            ADCSwitch++;
+        }
+        else if(ADCSwitch == 2){ /**read V(buffer)**/
+            headstage_battery_volt();
+            batteryCheck_flag = false;
+            ADCSwitch = 0;
+        }
     }
+
+
 }
 
 #endif  // HEADSTAGE_BATT_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h

@@ -990,7 +990,7 @@ static void update_ZM_instruction(uint8 *ins) {
                 }
             }
 
-            ADCChannelSelect(ins[4]);
+            ADCChannelSelect(ins[3]);
             CPUdelay(10);
             ADC_read(spi_ADC_rxbuf);
 
@@ -1000,7 +1000,7 @@ static void update_ZM_instruction(uint8 *ins) {
             }
 
             // decode ADC measure value
-            ADCRealValue = DecodeADCValue(ins[3], ins[4], spi_ADC_rxbuf);
+            ADCRealValue = DecodeADCValue(ins[4], ins[3], spi_ADC_rxbuf);
 
             // test ADC output through CIS
             if (ins[3] == ADC_CH_VOLT) {

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c

@@ -648,7 +648,7 @@ static void SimpleBLEPeripheral_taskFxn(UArg a0, UArg a1) {
                         uint16_t bat = ((uint16_t)(NotifyVoltBat[2]) << 8 & 0xFF00 ) |
                                        ((uint16_t)(NotifyVoltBat[3]) & 0x00FF);
                         if( bat < 768 && bat > 20){
-                            PIN15_setOutputValue(enable_5v, 0);
+//                            PIN15_setOutputValue(enable_5v, 0);
                         }
 
                     }