diff options
| author | Ben V. Brown <[email protected]> | 2024-11-01 12:20:33 +1100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-11-01 12:20:33 +1100 |
| commit | a0a779fabacc9bb488745de94ad68d5d5415115f (patch) | |
| tree | 8790b11af1997f9b8ff4306f78ee6d2de6cecd4a /source/Core/Threads | |
| parent | 150aa0db13542e75b39c782813aecd990e149af1 (diff) | |
| download | IronOS-a0a779fabacc9bb488745de94ad68d5d5415115f.tar.gz IronOS-a0a779fabacc9bb488745de94ad68d5d5415115f.zip | |
Custom tip type selection (#1977)
* Minor doc updates
* pydoc
* Draft tip selection menu
* Start linking in manual tip resistance
* Enable on Pinecilv1 / TS10x
* Fixup drawing tip type
* Update Settings.cpp
* Rename JBC type
* Add translations
* Handle one tip type
* Refactor header includes
* Fixup translation_IT.json
* Fixing up includes
* Format
* Apply suggestions from code review
Co-authored-by: discip <[email protected]>
* Update Documentation/Hardware.md
Co-authored-by: discip <[email protected]>
---------
Co-authored-by: = <=>
Co-authored-by: discip <[email protected]>
Diffstat (limited to 'source/Core/Threads')
| -rw-r--r-- | source/Core/Threads/UI/drawing/ui_drawing.hpp | 13 | ||||
| -rw-r--r-- | source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source/Core/Threads/UI/drawing/ui_drawing.hpp b/source/Core/Threads/UI/drawing/ui_drawing.hpp index ecfc1ec1..4f88aa7d 100644 --- a/source/Core/Threads/UI/drawing/ui_drawing.hpp +++ b/source/Core/Threads/UI/drawing/ui_drawing.hpp @@ -3,6 +3,7 @@ #include "Buttons.hpp" #include "OLED.hpp" #include "OperatingModeUtilities.h" +#include "Settings.h" #include "configuration.h" #include <stdbool.h> #include <stdint.h> @@ -21,13 +22,13 @@ void ui_draw_soldering_power_status(bool boost_mode_on); void ui_draw_soldering_basic_status(bool boostModeOn); void ui_draw_soldering_detailed_sleep(TemperatureType_t tipTemp); void ui_draw_soldering_basic_sleep(TemperatureType_t tipTemp); -void ui_draw_soldering_profile_advanced(TemperatureType_t tipTemp, TemperatureType_t profileCurrentTargetTemp, uint32_t phaseElapsedSeconds, uint32_t phase,const uint32_t phaseTimeGoal); +void ui_draw_soldering_profile_advanced(TemperatureType_t tipTemp, TemperatureType_t profileCurrentTargetTemp, uint32_t phaseElapsedSeconds, uint32_t phase, const uint32_t phaseTimeGoal); -//Temp change +// Temp change void ui_draw_temperature_change(void); -//USB-PD debug -void ui_draw_usb_pd_debug_state(const uint16_t vbus_sense_state, const uint8_t stateNumber) ; -void ui_draw_usb_pd_debug_pdo(const uint8_t entry_num, const uint16_t min_voltage, const uint16_t max_voltage, const uint16_t current_a_x100, const uint16_t wattage) ; +// USB-PD debug +void ui_draw_usb_pd_debug_state(const uint16_t vbus_sense_state, const uint8_t stateNumber); +void ui_draw_usb_pd_debug_pdo(const uint8_t entry_num, const uint16_t min_voltage, const uint16_t max_voltage, const uint16_t current_a_x100, const uint16_t wattage); // Utils void printVoltage(void); -#endif // UI_DRAWING_UI_DRAWING_HPP_
\ No newline at end of file +#endif // UI_DRAWING_UI_DRAWING_HPP_ diff --git a/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h b/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h index 1bd0835e..519bdad3 100644 --- a/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h +++ b/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h @@ -2,6 +2,7 @@ #define OPERATING_MODE_UTILITIES_H_ #include "Buttons.hpp" #include "OLED.hpp" +#include "Settings.h" #include <stdbool.h> void GUIDelay(); // @@ -14,4 +15,4 @@ void printVoltage(void); // bool checkForUnderVoltage(void); // uint16_t min(uint16_t a, uint16_t b); // void printCountdownUntilSleep(int sleepThres); // -#endif
\ No newline at end of file +#endif |