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 missing confirmation after the advanced cal

Browse Source
This commit is contained in:
Ben V. Brown
2018-09-27 21:22:12 +10:00
parent 0c7be326e5
commit 4317a79bf4
3 changed files with 13 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workspace/TS100/inc/Translation.h
View File

@@ -22,6 +22,7 @@ extern const char* SettingsDescriptions[];
extern const char* SettingsMenuEntries[4];
extern const char* SettingsMenuEntriesDescriptions[4];
extern const char* SettingsCalibrationDone;
extern const char* SettingsCalibrationWarning;
extern const char* SettingsResetWarning;
extern const char* UVLOWarningString;
@@ -50,6 +51,4 @@ extern const char SettingAutoChar;
extern const char SettingFastChar;
extern const char SettingSlowChar;
#endif /* TRANSLATION_H_ */

27
workspace/TS100/src/Translation.cpp
View File

@@ -26,17 +26,12 @@ const char* SettingsDescriptions[] = {
/* VoltageCalibration */ "VIN Calibration. Buttons adjust, long press to exit",
/* AdvancedSoldering */ "Display detailed information while soldering",
/* ScrollingSpeed */ "Speed this text scrolls past at",
#ifdef PIDSETTINGS
/* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems",
#endif
#ifdef PIDSETTINGS
/* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems",
#endif
#ifdef PIDSETTINGS
/* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems",
#endif
};
/* Tip Model */"Tip Model selection ",
/* Simple Calibration Mode */"Simple Calibration using Hot water",
/* Advanced Calibration Mode */"Advanced calibration using thermocouple on the tip"
};
const char* SettingsCalibrationDone = "Calibration done!";
const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
const char* SettingsResetWarning = "Are you sure you want to reset settings to default values?";
const char* UVLOWarningString = "DC LOW";
@@ -80,15 +75,9 @@ const char* SettingsShortNames[][2] = {
/* VoltageCalibration */ { "Calibrate", "input voltage?" },
/* AdvancedSoldering */ { "Detailed", "solder screen" },
/* ScrollingSpeed */ { "Scrolling", "Speed" },
#ifdef PIDSETTINGS
/* PidSettingsP */ { "PID", "P" },
#endif
#ifdef PIDSETTINGS
/* PidSettingsI */ { "PID", "I" },
#endif
#ifdef PIDSETTINGS
/* PidSettingsD */ { "PID", "D" },
#endif
/* The Tip model being selected */{"Tip","Model"},
/* Simple Calibration */{"Simple","Calibration"},
/* Advanced Calibration */{"Advanced","Calibration"},
};
const char* SettingsMenuEntries[4] = {

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

@@ -31,15 +31,7 @@ static void settings_setAdvancedIDLEScreens(void);
static void settings_displayAdvancedIDLEScreens(void);
static void settings_setScrollSpeed(void);
static void settings_displayScrollSpeed(void);
#ifdef PIDSETTINGS
static void settings_setPIDP(void);
static void settings_displayPIDP(void);
static void settings_setPIDI(void);
static void settings_displayPIDI(void);
static void settings_setPIDD(void);
static void settings_displayPIDD(void);
#endif
static void settings_setDisplayRotation(void);
static void settings_displayDisplayRotation(void);
static void settings_setBoostModeEnabled(void);
@@ -522,33 +514,6 @@ static void settings_displayBoostTemp(void) {
lcd.printNumber(systemSettings.BoostTemp, 3);
}
#ifdef PIDSETTINGS
static void settings_setPIDP(void) {
systemSettings.PID_P++;
systemSettings.PID_P %= 100;
}
static void settings_displayPIDP(void) {
printShortDescription(17, 6);
lcd.printNumber(systemSettings.PID_P, 2);
}
static void settings_setPIDI(void) {
systemSettings.PID_I++;
systemSettings.PID_I %= 100;
}
static void settings_displayPIDI(void) {
printShortDescription(18, 6);
lcd.printNumber(systemSettings.PID_I, 2);
}
static void settings_setPIDD(void) {
systemSettings.PID_D++;
systemSettings.PID_D %= 100;
}
static void settings_displayPIDD(void) {
printShortDescription(19, 6);
lcd.printNumber(systemSettings.PID_D, 2);
}
#endif
static void settings_setAutomaticStartMode(void) {
systemSettings.autoStartMode++;
systemSettings.autoStartMode %= 2;
@@ -725,11 +690,12 @@ static void calibration_enterAdvancedCal(void) {
//The tip now has a known ADC offset
//Head up until it is at 350C
//Then let the user adjust the gain value until it converges
systemSettings.customTipGain = 120;
systemSettings.customTipGain = 160; // start safe and high
bool exit = false;
while (exit == false) {
//Set tip to 350C
setTipType(Tip_Custom,systemSettings.customTipGain);
currentlyActiveTemperatureTarget = ctoTipMeasurement(350);
//Check if user has pressed button to change the gain
ButtonState buttons = getButtonState();
@@ -773,6 +739,8 @@ static void calibration_enterAdvancedCal(void) {
lcd.refresh();
GUIDelay();
}
// Wait for the user to confirm the exit message that the calibration is done
userConfirmation(SettingsCalibrationDone);
}
}