From 887b0464092bc32b1b2dca52274f856e67bfdcf3 Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 20 May 2019 16:32:02 +0800 Subject: [PATCH] Periodic ADC with multi-input parameter --- .../simple_peripheral/cc26xx/app/headstage/headstage.h | 2 +- .../simple_peripheral/cc26xx/app/headstage/impedance_meter.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h index 08938455a..c27bea2f2 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h @@ -916,7 +916,7 @@ static void DAC_outputV(uint8_t command, uint8_t v1, uint8_t v2); // input parameter static uint16_t VoltOrigin = 0; static uint16_t VoltFinal = 0; -static uint8_t Step = 10; // 10 ~= 3.05 mv ~= 3 mv +static uint8_t Step = 10; // 10 = 0x0A ~= 3.05 mv ~= 3 mv static uint8_t StepTime = 24; // 0x30 = 2'd48 ~= 2 second static uint8_t PeriodicCounter = 0; diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h index 8efcaec7e..b04fa07a6 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h @@ -427,8 +427,8 @@ static void IVCurve_T(){ } // prepare the next output volt - if(ramp0 + Step < ramp0){ - if(ramp1 + 1 < ramp1){ + if( (ramp0 + Step) < ramp0){ + if( (ramp1 + 1) < ramp1){ ramp0 = (uint8_t) (VoltFinal & 0x00FF); ramp1 = (uint8_t) ((VoltFinal>>8) & 0x00FF); return;