wn/ModbusThermometer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more cali fixes

Browse Source
This commit is contained in:
hg
2014-11-20 23:06:27 +01:00
parent 0ef4d84e89
commit 329c9ac970
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ModbusThermometer.cpp
View File

@ -135,12 +135,16 @@ void loop() {
switch (calibrationState) { switch (calibrationState) {
case e_CAL_IDLE: case e_CAL_IDLE:
for (uint8_t i = 0; i < NUM_OF_CHANNELS; i++) {
ads1210[i].setCalOffset(0.0);
ads1210[i].setCalFactor(1.0);
}
calibrationState = e_CAL_RUNNING; calibrationState = e_CAL_RUNNING;
break; break;
case e_CAL_RUNNING: case e_CAL_RUNNING:
calibrationCycleCnt++; calibrationCycleCnt++;
for (uint8_t i = 0; i < NUM_OF_CHANNELS; i++) { for (uint8_t i = 0; i < NUM_OF_CHANNELS; i++) {
calibrationValueSum[i] += ads1210[i].getRRaw(); calibrationValueSum[i] += ads1210[i].getR();
} }
if (calibrationCycleCnt >= CALIBRATION_CYCLES) { if (calibrationCycleCnt >= CALIBRATION_CYCLES) {
calibrationState = e_CAL_SET; calibrationState = e_CAL_SET;

2
ads1210.cpp
View File

@ -94,7 +94,7 @@ void ADS1210::exec() {
m_u = (((float)m_value) / ((float)vMax)) * U_REF; m_u = (((float)m_value) / ((float)vMax)) * U_REF;
m_rRaw = ((((float)vMax) / ((float)m_value)) - 1.0) * R_REF; m_rRaw = ((((float)vMax) / ((float)m_value)) - 1.0) * R_REF;
m_r = (m_rRaw + m_calOffset) * m_calFactor; m_r = (m_rRaw - m_calOffset) * m_calFactor;
} }
} }