diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h index f4fc40835..e2a47b44d 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteCCMode.h @@ -162,6 +162,8 @@ static void CC_Plot(CCMode *CC){ InputNotify(NOTIFY_CURRENT, CC->_MeasureData); + + CC_Vscan(CC); OneWayVoltScan(); // read Volt @@ -222,20 +224,17 @@ static void CC_Vscan(CCMode *CC){ } Iin = CC->_MeasureData * 20; //[50pA] nA => 50pA deltaI = Iin - Iset; - deltaV = -5 * deltaI; + deltaV = -1 * (deltaI / 1000); //-5 * deltaI / 5000 //pV=> 5nV + Vset = Vset + deltaV; //[5nV] } if(!VscanReset){ Iin = CC->_MeasureData * 20; //[50pA] nA => 50pA deltaI = Iin - Iset; - deltaV = -5 * deltaI; + deltaV = -1 * (deltaI / 1000); //-5 * deltaI / 5000 //pV=> 5nV Vset = Vset + deltaV; //[5nV] } - -// int32_t RealV; -// RealV = (int32_t)(Vset / 500);//[1uV] -// InputNotify(NOTIFY_VOLT, RealV); } diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h index 4646ca0fe..bc3832a25 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteDeviceCorrection.h @@ -29,7 +29,7 @@ */ -#define BOARD_7C8C +#define BOARD_ANGUS typedef struct _formula{ diff --git a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h index 7ccd50c15..d06bfec47 100644 --- a/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h +++ b/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite_version.h @@ -5,8 +5,8 @@ #define VERSION_DATE_YEAR 20 #define VERSION_DATE_MONTH 5 #define VERSION_DATE_DAY 28 -#define VERSION_DATE_HOUR 15 -#define VERSION_DATE_MINUTE 25 +#define VERSION_DATE_HOUR 17 +#define VERSION_DATE_MINUTE 34 // this is NOT the version hash !! // it's the last version hash 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 c7b062b9f..9b3238a01 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 @@ -957,6 +957,7 @@ static void update_ZM_instruction(uint8 *ins) { INSTRUCTION.VoltLimit = ((uint16_t) ins[4] << 8) | ((uint16_t) ins[5]); INSTRUCTION.ConstantCurrent = ( (uint32_t) (ins[6])<<24 | (uint32_t) (ins[7])<<16 | (uint32_t) (ins[8])<<8 | (uint32_t) (ins[9]) ); INSTRUCTION.NotifyRate = 100; +// INSTRUCTION.VscanRate = 100; // if(!INSTRUCTION.Charge){ // INSTRUCTION.VoltConstant = 50000;