wisetop/past-project-past_code_cc2650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Elite_OBJ_Version' into Elite_OBJ_Version

Browse Source
This commit is contained in:
weiting2
2019-11-01 10:16:23 +08:00
parent d8a567c607 776d8074b1
commit ddc51481b8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/EliteIVCurve.h
+3 -2
View File
@@ -28,13 +28,14 @@ static uint16_t VoltScan(WorkMode *WorkModeData) {
static uint16_t OneWayVoltScan(IVMode *IV) {
static uint16_t DACOutCode;
// IV->SetVOrigin((struct VoltOutPara *) IV, INSTRUCTION.VoltOrigin);
IV->SetVStop((struct VoltOutPara *) IV, 12345);
// IV->SetStep((struct VoltOutPara *) IV, 12345);
// IV->SetStep((struct VoltOutPara *) IV, INSTRUCTION.Step);
// IV->SetStepTime((struct VoltOutPara *) IV, INSTRUCTION.StepTime);
// reset origin volt at the begin
if (DACReset) {
DACUserCode = IV->GetVOrigin((struct VoltOutPara *) IV);
// DACUserCode = IV->GetVOrigin((struct VoltOutPara *) IV);
DACUserCode = IV->_VOrigin;
DACOutCode = Usercode_Correction_to_DAC(DACUserCode);
DACReset = false;
simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/impedance_meter.h
+1 -1
View File
@@ -143,7 +143,7 @@ static void EliteDACControl(WorkMode *WorkModeData) {
DACCode2Real2Notify(VoltScan(WorkModeData));
// WorkModeData->IV->SetVOrigin((struct VoltOutPara *) WorkModeData->IV, 12345);
uint16_t DACUserCode = WorkModeData->IV->GetVStop((struct VoltOutPara *) WorkModeData->IV);
uint16_t DACUserCode = WorkModeData->IV->GetStep((struct VoltOutPara *) WorkModeData->IV);
// uint16_t DACUserCode = WorkModeData->IV->_VOrigin;
NotifyImpedance[0] = (uint8_t) ((int32_t) DACUserCode >> 24);
NotifyImpedance[1] = (uint8_t) (((int32_t)DACUserCode & 0x00FF0000) >> 16);