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

Allow more precise input voltage divider calibration. (#359)

Browse Source 
Finer input voltage calibration

Settings divisor is stored as uint16_t, not uint8_t.

* Allow more precise input voltage divider calibration.

The existing code changed the input voltage by multiple
tenths of a volt per adjustment, which is way too coarse.

This commit simply multiplies the ADC value (and its divisor)
by 4, which allows for finer calibration adjustments.

Unfortunately, for safety reasons this requires a settings
version bump. While old stored divider values can be detected
and multiplied by 4 on startup to update them, if the user
downgrades firmware it will happily read the new higher value
and cause all sorts of problems (which could be either reading
higher *or* lower depending on how getInputVoltageX10's
parameter wraps around in old firmware due to incorrect type.
This commit is contained in:
Kyle Repinski
2018-09-20 01:35:33 -05:00
committed by Ben V. Brown
parent 54ec20cd9f
commit 0c7be326e5
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workspace/TS100/inc/hardware.h
View File

@@ -54,7 +54,7 @@ enum TipType {
uint16_t getHandleTemperature();
uint16_t getTipRawTemp(uint8_t instant);
uint16_t getInputVoltageX10(uint8_t divisor);
uint16_t getInputVoltageX10(uint16_t divisor);
uint16_t getTipInstantTemperature();
uint8_t getTipPWM();
void setTipPWM(uint8_t pulse);

2
workspace/TS100/src/Settings.cpp
View File

@@ -83,7 +83,7 @@ void resetSettings() {
systemSettings.detailedIDLE = 0;// Detailed idle screen (off for first time users)
systemSettings.OrientationMode = 2; //Default to automatic
systemSettings.sensitivity = 7; //Default high sensitivity
systemSettings.voltageDiv = 117; //Default divider from schematic
systemSettings.voltageDiv = 467; //Default divider from schematic
systemSettings.ShutdownTime = 10;//How many minutes until the unit turns itself off
systemSettings.boostModeEnabled = 1;//Default to safe, with no boost mode
systemSettings.BoostTemp = 420; //default to 400C

8
workspace/TS100/src/gui.cpp
View File

@@ -839,10 +839,10 @@ static void settings_setCalibrateVIN(void) {
osDelay(40);
// Cap to sensible values
if (systemSettings.voltageDiv < 90) {
systemSettings.voltageDiv = 90;
} else if (systemSettings.voltageDiv > 130) {
systemSettings.voltageDiv = 130;
if (systemSettings.voltageDiv < 360) {
systemSettings.voltageDiv = 360;
} else if (systemSettings.voltageDiv > 520) {
systemSettings.voltageDiv = 520;
}
}
}

9
workspace/TS100/src/hardware.c
View File

@@ -131,10 +131,11 @@ uint16_t __attribute__ ((long_call, section (".data.ramfuncs"))) getTipRawTemp(
return filterFP >> 9;
}
}
uint16_t getInputVoltageX10(uint8_t divisor) {
//ADC maximum is 16384 == 3.3V at input == 28V at VIN
uint16_t getInputVoltageX10(uint16_t divisor) {
//ADC maximum is 32767 == 3.3V at input == 28.05V at VIN
//Therefore we can divide down from there
//Ideal term is 117
//Multiplying ADC max by 4 for additional calibration options,
//ideal term is 467
#define BATTFILTERDEPTH 64
static uint8_t preFillneeded = 1;
static uint32_t samples[BATTFILTERDEPTH];
@@ -154,7 +155,7 @@ uint16_t getInputVoltageX10(uint8_t divisor) {
sum /= BATTFILTERDEPTH;
if (sum < 50)
preFillneeded = 1;
return sum / divisor;
return sum * 4 / divisor;
}
volatile uint32_t pendingPWM = 0;
uint8_t getTipPWM() {