diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-01-03 16:55:03 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-01-03 16:55:03 +0300 |
| commit | 167b0b80065188a63e414db2e6bcac5404b16b94 (patch) | |
| tree | 1b51efa6e1b9557bc00164dfd6b440c69cdb5daf | |
| parent | 12b2fdb36ff52dd373352e4a895cdc9361dc45d6 (diff) | |
RRF 3.0 release
Minor improvements to reading thermistors on Duet 3
| -rw-r--r-- | src/Heating/Sensors/Thermistor.cpp | 8 | ||||
| -rw-r--r-- | src/Version.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Heating/Sensors/Thermistor.cpp b/src/Heating/Sensors/Thermistor.cpp index f54f8a14..c63208ed 100644 --- a/src/Heating/Sensors/Thermistor.cpp +++ b/src/Heating/Sensors/Thermistor.cpp @@ -125,12 +125,12 @@ void Thermistor::Poll() noexcept if (tempFilterValid && vrefFilter.IsValid() && vssaFilter.IsValid()) { # ifdef DUET3 - // Duet 3 MB6HC board revisions 0.6 and 1.0 have the series resistor connected to VrefP, not VrefMon. + // Duet 3 MB6HC board revisions 0.5, 0.6 and 1.0 have the series resistor connected to VrefP, not VrefMon. // So Extrapolate the reading for VrefP. We also allow offsets to be added. const int32_t rawAveragedVssaReading = vssaFilter.GetSum()/(vssaFilter.NumAveraged() >> Thermistor::AdcOversampleBits); const int32_t rawAveragedVrefReading = vrefFilter.GetSum()/(vrefFilter.NumAveraged() >> Thermistor::AdcOversampleBits); - const int32_t averagedVssaReading = rawAveragedVssaReading + adcLowOffset; - const int32_t averagedVrefReading = ((rawAveragedVrefReading - rawAveragedVssaReading) * (4715.0/4700.0)) + rawAveragedVssaReading + adcHighOffset; + const int32_t averagedVssaReading = rawAveragedVssaReading + (2 * adcLowOffset); + const int32_t averagedVrefReading = ((rawAveragedVrefReading - rawAveragedVssaReading) * 4715)/4700 + rawAveragedVssaReading + (2 * adcHighOffset); # else const int32_t averagedVssaReading = vssaFilter.GetSum()/(vssaFilter.NumAveraged() >> Thermistor::AdcOversampleBits); const int32_t averagedVrefReading = vrefFilter.GetSum()/(vrefFilter.NumAveraged() >> Thermistor::AdcOversampleBits); @@ -139,7 +139,7 @@ void Thermistor::Poll() noexcept // VREF is the measured voltage at VREF less the drop of a 15 ohm resistor. // VSSA is the voltage measured across the VSSA fuse. We assume the same 15 ohms maximum resistance for the fuse. // Assume a maximum ADC reading offset of 100. - constexpr int32_t maxDrop = (OversampledAdcRange * 15)/MinVrefLoadR + (100 << Thermistor::AdcOversampleBits); + constexpr int32_t maxDrop = ((OversampledAdcRange * 15)/(int32_t)MinVrefLoadR) + (100 << Thermistor::AdcOversampleBits); if (averagedVrefReading < OversampledAdcRange - maxDrop) { diff --git a/src/Version.h b/src/Version.h index dca02c4d..9ccca243 100644 --- a/src/Version.h +++ b/src/Version.h @@ -20,7 +20,7 @@ #endif #ifndef DATE -# define DATE "2020-01-03b1" +# define DATE "2020-01-03b3" #endif #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d" |