me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update TipThermoModel.cpp

Browse Source
This commit is contained in:
Ben V. Brown
2020-12-29 10:48:52 +11:00
parent d8d6897ea9
commit 1c0e51b1d0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workspace/TS100/Core/Drivers/TipThermoModel.cpp
View File

@@ -41,19 +41,21 @@ uint32_t TipThermoModel::convertTipRawADCTouV(uint16_t rawADC) {
//Now to divide this down by the gain //Now to divide this down by the gain
valueuV /= OP_AMP_GAIN_STAGE; valueuV /= OP_AMP_GAIN_STAGE;
//Remove uV tipOffset if (systemSettings.CalibrationOffset) {
if (valueuV >= systemSettings.CalibrationOffset) //Remove uV tipOffset
valueuV -= systemSettings.CalibrationOffset; if (valueuV >= systemSettings.CalibrationOffset)
else valueuV -= systemSettings.CalibrationOffset;
valueuV = 0; else
valueuV = 0;
}
// Bias removal (Compensating for a temperature related non-linearity // Bias removal (Compensating for a temperature related non-linearity
// This uses the target temperature for the tip to calculate a compensation value for temperature related bias // This uses the target temperature for the tip to calculate a compensation value for temperature related bias
// This is not entirely ideal as this means we will be wrong on heat up, but will settle to the correct value // This is not entirely ideal as this means we will be wrong on heat up, but will settle to the correct value
// This will cause us to underread on the heatup until we reach the target temp // This will cause us to underread on the heatup until we reach the target temp
// Compensation (uV)== ((((80+150*(target_temp_c_x10-1000)/3000)*33000)/4096)*100)/GAIN // Compensation (uV)== ((((80+150*(target_temp_c_x10-1000)/3000)*vddRailmVX10)/4096)*100)/GAIN
// Reordered with Wolframalpha // Reordered with Wolframalpha
if (currentTempTargetDegC > 0) { if (currentTempTargetDegC > 0) {
uint32_t compensation = (20625 * ((currentTempTargetDegC*10) + 600)) / 512; uint32_t compensation = (20625 * ((currentTempTargetDegC * 10) + 600)) / 512;
compensation /= OP_AMP_GAIN_STAGE; compensation /= OP_AMP_GAIN_STAGE;
if (valueuV > compensation) { if (valueuV > compensation) {
valueuV -= compensation; valueuV -= compensation;