diff --git a/workspace/TS100/Core/Inc/Settings.h b/workspace/TS100/Core/Inc/Settings.h index dfaeb501..4460ff67 100644 --- a/workspace/TS100/Core/Inc/Settings.h +++ b/workspace/TS100/Core/Inc/Settings.h @@ -40,16 +40,14 @@ typedef struct { uint16_t voltageDiv; // Voltage divisor factor uint16_t BoostTemp; // Boost mode set point for the iron uint16_t CalibrationOffset; // This stores the temperature offset for this tip - // in the iron. - uint8_t PID_P; // PID P Term - uint8_t PID_I; // PID I Term - uint8_t PID_D; // PID D Term - uint8_t version; // Used to track if a reset is needed on firmware upgrade + // in the iron. + uint8_t customTipGain; // Tip gain value if custom tuned, or 0 if using a // tipType param #ifdef MODEL_TS80 uint8_t pidPowerLimit; #endif + uint8_t version; // Used to track if a reset is needed on firmware upgrade uint32_t padding; // This is here for in case we are not an even divisor so // that nothing gets cut off } systemSettingsType; diff --git a/workspace/TS100/Core/Src/Settings.cpp b/workspace/TS100/Core/Src/Settings.cpp index 962a0916..c196890f 100644 --- a/workspace/TS100/Core/Src/Settings.cpp +++ b/workspace/TS100/Core/Src/Settings.cpp @@ -104,18 +104,15 @@ void resetSettings() { 0; // Blink the temperature on the cooling screen when its > 50C systemSettings.temperatureInF = 0; // default to 0 systemSettings.descriptionScrollSpeed = 0; // default to slow - systemSettings.PID_P = 42; // PID tuning constants - systemSettings.PID_I = 50; - systemSettings.PID_D = 15; #ifdef MODEL_TS100 - systemSettings.CalibrationOffset = 800; // the adc offset in uV + systemSettings.CalibrationOffset = 650; // the adc offset in uV #endif #ifdef MODEL_TS80 systemSettings.pidPowerLimit=24; // Sets the max pwm power limit - systemSettings.CalibrationOffset = 800; // the adc offset in uV + systemSettings.CalibrationOffset = 650; // the adc offset in uV #endif saveSettings(); // Save defaults }