Handle one tip type
Some checks are pending
CI / check_shell (push) Waiting to run
CI / check_readme (push) Waiting to run
CI / build (MHP30) (push) Waiting to run
CI / build (Pinecil) (push) Waiting to run
CI / build (Pinecilv2) (push) Waiting to run
CI / build (S60) (push) Waiting to run
CI / build (S60P) (push) Waiting to run
CI / build (T55) (push) Waiting to run
CI / build (TS100) (push) Waiting to run
CI / build (TS101) (push) Waiting to run
CI / build (TS80) (push) Waiting to run
CI / build (TS80P) (push) Waiting to run
CI / build_multi-lang (Pinecil) (push) Waiting to run
CI / build_multi-lang (Pinecilv2) (push) Waiting to run
CI / upload_metadata (push) Blocked by required conditions
CI / tests (push) Waiting to run
CI / check_c-cpp (push) Waiting to run
CI / check_python (push) Waiting to run

This commit is contained in:
Ben V. Brown
2024-09-22 18:28:58 +10:00
parent f0dc731fbf
commit 8b63292d72
4 changed files with 65 additions and 63 deletions

View File

@@ -147,7 +147,7 @@
#define MIN_BOOST_TEMP_F 300 // The min settable temp for boost mode °F #define MIN_BOOST_TEMP_F 300 // The min settable temp for boost mode °F
#define NO_DISPLAY_ROTATE // Disable OLED rotation by accel #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 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_SC7
#define ACCEL_MSA #define ACCEL_MSA

View File

@@ -233,6 +233,8 @@
#define I2C_SOFT_BUS_2 1 #define I2C_SOFT_BUS_2 1
#define LIS_ORI_FLIP #define LIS_ORI_FLIP
#define OLED_FLIP #define OLED_FLIP
#define TIPTYPE_TS80 1 // Only one tip type so far
#endif /* TS80(P) */ #endif /* TS80(P) */
#ifdef MODEL_TS80 #ifdef MODEL_TS80

View File

@@ -132,13 +132,13 @@ typedef enum {
T12_6_2_OHM, // Short Tips manufactured by Pine64 T12_6_2_OHM, // Short Tips manufactured by Pine64
T12_4_OHM, // Longer tip but low resistance for PTS200 T12_4_OHM, // Longer tip but low resistance for PTS200
#endif #endif
#ifdef TIPTYE_TS80 // #ifdef TIPTYPE_TS80
TS80_4_5_OHM, // TS80(P) default tips // TS80_4_5_OHM, // TS80(P) default tips
// We do not know of other tuning tips (?yet?) // // We do not know of other tuning tips (?yet?)
#endif // #endif
#ifdef TIPTYPE_JBC // #ifdef TIPTYPE_JBC
JBC_210_2_5_OHM, // Small JBC tips as used in the S60/S60P // JBC_210_2_5_OHM, // Small JBC tips as used in the S60/S60P
#endif // #endif
TIP_TYPE_MAX, // Max value marker TIP_TYPE_MAX, // Max value marker
} tipType_t; } tipType_t;
uint8_t getUserSelectedTipResistance(); // returns the resistance matching the selected tip type or 0 for auto uint8_t getUserSelectedTipResistance(); // returns the resistance matching the selected tip type or 0 for auto

View File

@@ -109,7 +109,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
{ 10, 180, 5, 30}, // ProfilePhase5Duration { 10, 180, 5, 30}, // ProfilePhase5Duration
{ 1, 10, 1, 2}, // ProfileCooldownSpeed { 1, 10, 1, 2}, // ProfileCooldownSpeed
{ 0, 12, 1, 0}, // HallEffectSleepTime { 0, 12, 1, 0}, // HallEffectSleepTime
{ 0, tipType_t::TIP_TYPE_MAX - 1, 1, 0}, // SolderingTipType { 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)); static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength));