diff --git a/source/Core/BSP/MHP30/configuration.h b/source/Core/BSP/MHP30/configuration.h index a94ae98f..db9fc832 100644 --- a/source/Core/BSP/MHP30/configuration.h +++ b/source/Core/BSP/MHP30/configuration.h @@ -147,7 +147,7 @@ #define MIN_BOOST_TEMP_F 300 // The min settable temp for boost mode °F #define NO_DISPLAY_ROTATE // Disable OLED rotation by accel #define SLEW_LIMIT 50 // Limit to 3.0 Watts per 64ms pid loop update rate slew rate - +#define TIPTYPE_MHP30 1 // It's own special tip #define ACCEL_SC7 #define ACCEL_MSA diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h index 9eab3628..3c298389 100644 --- a/source/Core/BSP/Miniware/configuration.h +++ b/source/Core/BSP/Miniware/configuration.h @@ -233,6 +233,8 @@ #define I2C_SOFT_BUS_2 1 #define LIS_ORI_FLIP #define OLED_FLIP +#define TIPTYPE_TS80 1 // Only one tip type so far + #endif /* TS80(P) */ #ifdef MODEL_TS80 diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index 9ec30d6d..30b2c17c 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -132,13 +132,13 @@ typedef enum { T12_6_2_OHM, // Short Tips manufactured by Pine64 T12_4_OHM, // Longer tip but low resistance for PTS200 #endif -#ifdef TIPTYE_TS80 - TS80_4_5_OHM, // TS80(P) default tips -// We do not know of other tuning tips (?yet?) -#endif -#ifdef TIPTYPE_JBC - JBC_210_2_5_OHM, // Small JBC tips as used in the S60/S60P -#endif + // #ifdef TIPTYPE_TS80 + // TS80_4_5_OHM, // TS80(P) default tips + // // We do not know of other tuning tips (?yet?) + // #endif + // #ifdef TIPTYPE_JBC + // JBC_210_2_5_OHM, // Small JBC tips as used in the S60/S60P + // #endif TIP_TYPE_MAX, // Max value marker } tipType_t; uint8_t getUserSelectedTipResistance(); // returns the resistance matching the selected tip type or 0 for auto diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp index 11693992..47c4c799 100644 --- a/source/Core/Src/Settings.cpp +++ b/source/Core/Src/Settings.cpp @@ -55,61 +55,61 @@ typedef struct { static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = { //{ min, max, increment, default} - { MIN_TEMP_C, MAX_TEMP_F, 5, SOLDERING_TEMP}, // SolderingTemp - { MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp - { 0, 15, 1, SLEEP_TIME}, // SleepTime - { 0, 4, 1, CUT_OUT_SETTING}, // MinDCVoltageCells - { 24, 38, 1, RECOM_VOL_CELL}, // MinVoltageCells - { 90, QC_VOLTAGE_MAX, 2, 90}, // QCIdealVoltage - { 0, MAX_ORIENTATION_MODE, 1, ORIENTATION_MODE}, // OrientationMode - { 0, 9, 1, SENSITIVITY}, // Sensitivity - { 0, 1, 1, ANIMATION_LOOP}, // AnimationLoop - { 0, settingOffSpeed_t::MAX_VALUE - 1, 1, ANIMATION_SPEED}, // AnimationSpeed - { 0, 3, 1, AUTO_START_MODE}, // AutoStartMode - { 0, 60, 1, SHUTDOWN_TIME}, // ShutdownTime - { 0, 1, 1, COOLING_TEMP_BLINK}, // CoolingTempBlink - { 0, 1, 1, DETAILED_IDLE}, // DetailedIDLE - { 0, 1, 1, DETAILED_SOLDERING}, // DetailedSoldering - { 0, (uint16_t)(HasFahrenheit ? 1 : 0), 1, TEMPERATURE_INF}, // TemperatureInF - { 0, 1, 1, DESCRIPTION_SCROLL_SPEED}, // DescriptionScrollSpeed - { 0, 2, 1, LOCKING_MODE}, // LockingMode - { 0, 99, 1, POWER_PULSE_DEFAULT}, // KeepAwakePulse - { 1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT}, // KeepAwakePulseWait - { 1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration - { 360, 900, 1, VOLTAGE_DIV}, // VoltageDiv - { 0, MAX_TEMP_F, 10, BOOST_TEMP}, // BoostTemp - {MIN_CALIBRATION_OFFSET, 2500, 1, CALIBRATION_OFFSET}, // CalibrationOffset - { 0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT}, // PowerLimit - { 0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE}, // ReverseButtonTempChangeEnabled - { 5, TEMP_CHANGE_LONG_STEP_MAX, 5, TEMP_CHANGE_LONG_STEP}, // TempChangeLongStep - { 1, TEMP_CHANGE_SHORT_STEP_MAX, 1, TEMP_CHANGE_SHORT_STEP}, // TempChangeShortStep - { 0, 9, 1, 7}, // HallEffectSensitivity - { 0, 9, 1, 0}, // AccelMissingWarningCounter - { 0, 9, 1, 0}, // PDMissingWarningCounter - { 0, 0xFFFF, 0, 41431 /*EN*/}, // UILanguage - { 0, 50, 1, 20}, // PDNegTimeout - { 0, 1, 1, 0}, // OLEDInversion - { MIN_BRIGHTNESS, MAX_BRIGHTNESS, BRIGHTNESS_STEP, DEFAULT_BRIGHTNESS}, // OLEDBrightness - { 0, 6, 1, 1}, // LOGOTime - { 0, 1, 1, 0}, // CalibrateCJC - { 0, 1, 1, 0}, // BluetoothLE - { 0, 2, 1, 1}, // USBPDMode - { 1, 5, 1, 4}, // ProfilePhases - { MIN_TEMP_C, MAX_TEMP_F, 5, 90}, // ProfilePreheatTemp - { 1, 10, 1, 1}, // ProfilePreheatSpeed - { MIN_TEMP_C, MAX_TEMP_F, 5, 130}, // ProfilePhase1Temp - { 10, 180, 5, 90}, // ProfilePhase1Duration - { MIN_TEMP_C, MAX_TEMP_F, 5, 140}, // ProfilePhase2Temp - { 10, 180, 5, 30}, // ProfilePhase2Duration - { MIN_TEMP_C, MAX_TEMP_F, 5, 165}, // ProfilePhase3Temp - { 10, 180, 5, 30}, // ProfilePhase3Duration - { MIN_TEMP_C, MAX_TEMP_F, 5, 140}, // ProfilePhase4Temp - { 10, 180, 5, 30}, // ProfilePhase4Duration - { MIN_TEMP_C, MAX_TEMP_F, 5, 90}, // ProfilePhase5Temp - { 10, 180, 5, 30}, // ProfilePhase5Duration - { 1, 10, 1, 2}, // ProfileCooldownSpeed - { 0, 12, 1, 0}, // HallEffectSleepTime - { 0, tipType_t::TIP_TYPE_MAX - 1, 1, 0}, // SolderingTipType + { MIN_TEMP_C, MAX_TEMP_F, 5, SOLDERING_TEMP}, // SolderingTemp + { MIN_TEMP_C, MAX_TEMP_F, 5, 150}, // SleepTemp + { 0, 15, 1, SLEEP_TIME}, // SleepTime + { 0, 4, 1, CUT_OUT_SETTING}, // MinDCVoltageCells + { 24, 38, 1, RECOM_VOL_CELL}, // MinVoltageCells + { 90, QC_VOLTAGE_MAX, 2, 90}, // QCIdealVoltage + { 0, MAX_ORIENTATION_MODE, 1, ORIENTATION_MODE}, // OrientationMode + { 0, 9, 1, SENSITIVITY}, // Sensitivity + { 0, 1, 1, ANIMATION_LOOP}, // AnimationLoop + { 0, settingOffSpeed_t::MAX_VALUE - 1, 1, ANIMATION_SPEED}, // AnimationSpeed + { 0, 3, 1, AUTO_START_MODE}, // AutoStartMode + { 0, 60, 1, SHUTDOWN_TIME}, // ShutdownTime + { 0, 1, 1, COOLING_TEMP_BLINK}, // CoolingTempBlink + { 0, 1, 1, DETAILED_IDLE}, // DetailedIDLE + { 0, 1, 1, DETAILED_SOLDERING}, // DetailedSoldering + { 0, (uint16_t)(HasFahrenheit ? 1 : 0), 1, TEMPERATURE_INF}, // TemperatureInF + { 0, 1, 1, DESCRIPTION_SCROLL_SPEED}, // DescriptionScrollSpeed + { 0, 2, 1, LOCKING_MODE}, // LockingMode + { 0, 99, 1, POWER_PULSE_DEFAULT}, // KeepAwakePulse + { 1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT}, // KeepAwakePulseWait + { 1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration + { 360, 900, 1, VOLTAGE_DIV}, // VoltageDiv + { 0, MAX_TEMP_F, 10, BOOST_TEMP}, // BoostTemp + {MIN_CALIBRATION_OFFSET, 2500, 1, CALIBRATION_OFFSET}, // CalibrationOffset + { 0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT}, // PowerLimit + { 0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE}, // ReverseButtonTempChangeEnabled + { 5, TEMP_CHANGE_LONG_STEP_MAX, 5, TEMP_CHANGE_LONG_STEP}, // TempChangeLongStep + { 1, TEMP_CHANGE_SHORT_STEP_MAX, 1, TEMP_CHANGE_SHORT_STEP}, // TempChangeShortStep + { 0, 9, 1, 7}, // HallEffectSensitivity + { 0, 9, 1, 0}, // AccelMissingWarningCounter + { 0, 9, 1, 0}, // PDMissingWarningCounter + { 0, 0xFFFF, 0, 41431 /*EN*/}, // UILanguage + { 0, 50, 1, 20}, // PDNegTimeout + { 0, 1, 1, 0}, // OLEDInversion + { MIN_BRIGHTNESS, MAX_BRIGHTNESS, BRIGHTNESS_STEP, DEFAULT_BRIGHTNESS}, // OLEDBrightness + { 0, 6, 1, 1}, // LOGOTime + { 0, 1, 1, 0}, // CalibrateCJC + { 0, 1, 1, 0}, // BluetoothLE + { 0, 2, 1, 1}, // USBPDMode + { 1, 5, 1, 4}, // ProfilePhases + { MIN_TEMP_C, MAX_TEMP_F, 5, 90}, // ProfilePreheatTemp + { 1, 10, 1, 1}, // ProfilePreheatSpeed + { MIN_TEMP_C, MAX_TEMP_F, 5, 130}, // ProfilePhase1Temp + { 10, 180, 5, 90}, // ProfilePhase1Duration + { MIN_TEMP_C, MAX_TEMP_F, 5, 140}, // ProfilePhase2Temp + { 10, 180, 5, 30}, // ProfilePhase2Duration + { MIN_TEMP_C, MAX_TEMP_F, 5, 165}, // ProfilePhase3Temp + { 10, 180, 5, 30}, // ProfilePhase3Duration + { MIN_TEMP_C, MAX_TEMP_F, 5, 140}, // ProfilePhase4Temp + { 10, 180, 5, 30}, // ProfilePhase4Duration + { MIN_TEMP_C, MAX_TEMP_F, 5, 90}, // ProfilePhase5Temp + { 10, 180, 5, 30}, // ProfilePhase5Duration + { 1, 10, 1, 2}, // ProfileCooldownSpeed + { 0, 12, 1, 0}, // HallEffectSleepTime + { 0, (tipType_t::TIP_TYPE_MAX - 1) > 0 ? (tipType_t::TIP_TYPE_MAX - 1) : 0, 1, 0}, // SolderingTipType }; static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength));