mirror of
https://github.com/Ralim/IronOS.git
synced 2025-02-26 07:53:55 +00:00
Implement getUserSelectedTipResistance() as stub
This commit is contained in:
@@ -379,8 +379,6 @@ uint8_t preStartChecksDone() {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIP_TYPE_SUPPORT
|
|
||||||
// new version for models supporting tips of different length/resistance
|
|
||||||
uint8_t getTipResistanceX10() {
|
uint8_t getTipResistanceX10() {
|
||||||
#ifdef TIP_RESISTANCE_SENSE_Pin
|
#ifdef TIP_RESISTANCE_SENSE_Pin
|
||||||
// Return tip resistance in x10 ohms
|
// Return tip resistance in x10 ohms
|
||||||
@@ -398,17 +396,6 @@ uint8_t getTipResistanceX10() {
|
|||||||
return user_selected_tip;
|
return user_selected_tip;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#else /* no tip type support: legacy version */
|
|
||||||
uint8_t getTipResistanceX10() {
|
|
||||||
#ifdef TIP_RESISTANCE_SENSE_Pin
|
|
||||||
// Return tip resistance in x10 ohms
|
|
||||||
// We can measure this using the op-amp
|
|
||||||
return lastTipResistance;
|
|
||||||
#else
|
|
||||||
return TIP_RESISTANCE;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif /* TIP_TYPE_SUPPORT */
|
|
||||||
|
|
||||||
#ifdef TIP_RESISTANCE_SENSE_Pin
|
#ifdef TIP_RESISTANCE_SENSE_Pin
|
||||||
bool isTipShorted() { return tipShorted; }
|
bool isTipShorted() { return tipShorted; }
|
||||||
|
|||||||
@@ -143,11 +143,16 @@ typedef enum {
|
|||||||
// #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
|
|
||||||
#else
|
#else
|
||||||
typedef enum { TIP_TYPE_MAX = 0 } tipType_t;
|
typedef enum {
|
||||||
|
TIP_TYPE_AUTO = 0, // value for the default case
|
||||||
|
TIP_TYPE_MAX = 0, // marker for settings when not supported
|
||||||
|
} tipType_t;
|
||||||
#endif /* TIP_TYPE_SUPPORT */
|
#endif /* TIP_TYPE_SUPPORT */
|
||||||
|
|
||||||
|
// returns the resistance matching the selected tip type or 0 for auto and when not supported
|
||||||
|
uint8_t getUserSelectedTipResistance();
|
||||||
|
|
||||||
// Settings wide operations
|
// Settings wide operations
|
||||||
void saveSettings();
|
void saveSettings();
|
||||||
bool loadSettings();
|
bool loadSettings();
|
||||||
|
|||||||
@@ -374,4 +374,6 @@ uint8_t getUserSelectedTipResistance() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
uint8_t getUserSelectedTipResistance() { return tipType_t::TIP_TYPE_AUTO; }
|
||||||
#endif /* TIP_TYPE_SUPPORT */
|
#endif /* TIP_TYPE_SUPPORT */
|
||||||
|
|||||||
Reference in New Issue
Block a user