me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mask drawing for 96x16

Browse Source
This commit is contained in:
Ben V. Brown
2024-03-20 20:52:55 +11:00
parent d8d96634b0
commit 976d90cbad
21 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/BSP/MHP30/configuration.h
View File

@@ -151,7 +151,7 @@
#define ACCEL_MSA #define ACCEL_MSA
#define PROFILE_SUPPORT #define PROFILE_SUPPORT
#define OLED_96x16 1
#define POW_PD 1 #define POW_PD 1
#define POW_PD_EXT 0 #define POW_PD_EXT 0
#define USB_PD_EPR_WATTAGE 0 /*No EPR*/ #define USB_PD_EPR_WATTAGE 0 /*No EPR*/

1
source/Core/BSP/Miniware/configuration.h
View File

@@ -276,6 +276,7 @@
#else #else
#define FLASH_LOGOADDR (0x08000000 + (62 * 1024)) #define FLASH_LOGOADDR (0x08000000 + (62 * 1024))
#define SETTINGS_START_PAGE (0x08000000 + (63 * 1024)) #define SETTINGS_START_PAGE (0x08000000 + (63 * 1024))
#define OLED_96x16 1
#endif /* TS101 */ #endif /* TS101 */
#endif /* CONFIGURATION_H_ */ #endif /* CONFIGURATION_H_ */

13
source/Core/BSP/Pinecil/configuration.h
View File

@@ -145,14 +145,15 @@
#define MIN_BOOST_TEMP_C 250 // The min settable temp for boost mode °C #define MIN_BOOST_TEMP_C 250 // The min settable temp for boost mode °C
#define MIN_BOOST_TEMP_F 480 // The min settable temp for boost mode °F #define MIN_BOOST_TEMP_F 480 // The min settable temp for boost mode °F
#define OLED_96x16 1
#define POW_PD 1 #define POW_PD 1
#define USB_PD_EPR_WATTAGE 0 /*No EPR (Yet?) */ #define USB_PD_EPR_WATTAGE 0 /*No EPR (Yet?) */
#define POW_PD_EXT 0 #define POW_PD_EXT 0
#define POW_QC 1 #define POW_QC 1
#define POW_DC 1 #define POW_DC 1
#define POW_QC_20V 1 #define POW_QC_20V 1
#define ENABLE_QC2 1 #define ENABLE_QC2 1
#define MAG_SLEEP_SUPPORT 1 #define MAG_SLEEP_SUPPORT 1
#define TEMP_TMP36 #define TEMP_TMP36
#define ACCEL_BMA #define ACCEL_BMA
#define ACCEL_SC7 #define ACCEL_SC7

1
source/Core/BSP/Pinecilv2/configuration.h
View File

@@ -155,6 +155,7 @@
#define ENABLE_QC2 1 #define ENABLE_QC2 1
#define MAG_SLEEP_SUPPORT 1 #define MAG_SLEEP_SUPPORT 1
#define DEVICE_HAS_VALIDATION_SUPPORT #define DEVICE_HAS_VALIDATION_SUPPORT
#define OLED_96x16 1
#define TEMP_NTC #define TEMP_NTC
#define ACCEL_BMA #define ACCEL_BMA
#define CUSTOM_MAX_TEMP_C 1 // Uses custom max temp lookup #define CUSTOM_MAX_TEMP_C 1 // Uses custom max temp lookup

2
source/Core/Threads/UI/drawing/mono_96x16/draw_cjc_sampling.cpp
View File

@@ -1,5 +1,6 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void ui_draw_cjc_sampling(const uint8_t num_dots) { void ui_draw_cjc_sampling(const uint8_t num_dots) {
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::print(translatedString(Tr->CJCCalibrating), FontStyle::SMALL); OLED::print(translatedString(Tr->CJCCalibrating), FontStyle::SMALL);
@@ -9,3 +10,4 @@ void ui_draw_cjc_sampling(const uint8_t num_dots) {
OLED::print(SmallSymbolDot, FontStyle::SMALL); OLED::print(SmallSymbolDot, FontStyle::SMALL);
} }
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_debug_menu.cpp
View File

@@ -2,6 +2,7 @@
#include "TipThermoModel.h" #include "TipThermoModel.h"
#include "main.hpp" #include "main.hpp"
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
extern osThreadId GUITaskHandle; extern osThreadId GUITaskHandle;
extern osThreadId MOVTaskHandle; extern osThreadId MOVTaskHandle;
extern osThreadId PIDTaskHandle; extern osThreadId PIDTaskHandle;
@@ -90,3 +91,4 @@ void ui_draw_debug_menu(const uint8_t item_number) {
break; break;
} }
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_detailed.cpp
View File

@@ -1,4 +1,5 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
extern uint8_t buttonAF[sizeof(buttonA)]; extern uint8_t buttonAF[sizeof(buttonA)];
extern uint8_t buttonBF[sizeof(buttonB)]; extern uint8_t buttonBF[sizeof(buttonB)];
@@ -53,3 +54,4 @@ void ui_draw_homescreen_detailed(TemperatureType_t tipTemp) {
OLED::print(SmallSymbolVolts, FontStyle::SMALL); OLED::print(SmallSymbolVolts, FontStyle::SMALL);
} }
} }
#endif

3
source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp
View File

@@ -1,5 +1,6 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
extern uint8_t buttonAF[sizeof(buttonA)]; extern uint8_t buttonAF[sizeof(buttonA)];
extern uint8_t buttonBF[sizeof(buttonB)]; extern uint8_t buttonBF[sizeof(buttonB)];
extern uint8_t disconnectedTipF[sizeof(disconnectedTip)]; extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
@@ -57,3 +58,5 @@ void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
} }
} }
} }
#endif

3
source/Core/Threads/UI/drawing/mono_96x16/draw_power_source_icon.cpp
View File

@@ -1,4 +1,5 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void ui_draw_power_source_icon(void) { void ui_draw_power_source_icon(void) {
#if defined(POW_PD) || defined(POW_QC) || defined(POW_PD_EXT) #if defined(POW_PD) || defined(POW_QC) || defined(POW_PD_EXT)
@@ -44,3 +45,5 @@ void ui_draw_power_source_icon(void) {
} }
#endif #endif
} }
#endif

3
source/Core/Threads/UI/drawing/mono_96x16/draw_profile_advanced.cpp
View File

@@ -1,4 +1,5 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
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) {
// print temperature // print temperature
@@ -54,3 +55,5 @@ void ui_draw_soldering_profile_advanced(TemperatureType_t tipTemp, TemperatureTy
} }
} }
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_soldering_basic_status.cpp
View File

@@ -1,5 +1,6 @@
#include "power.hpp" #include "power.hpp"
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void ui_draw_soldering_basic_status(bool boostModeOn) { void ui_draw_soldering_basic_status(bool boostModeOn) {
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
@@ -40,3 +41,4 @@ void ui_draw_soldering_basic_status(bool boostModeOn) {
ui_draw_power_source_icon(); ui_draw_power_source_icon();
} }
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_soldering_power_status.cpp
View File

@@ -1,6 +1,7 @@
#include "power.hpp" #include "power.hpp"
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#include <OperatingModes.h> #include <OperatingModes.h>
#ifdef OLED_96x16
void ui_draw_soldering_power_status(bool boost_mode_on) { void ui_draw_soldering_power_status(bool boost_mode_on) {
if (OLED::getRotation()) { if (OLED::getRotation()) {
@@ -65,3 +66,4 @@ void ui_draw_soldering_power_status(bool boost_mode_on) {
printVoltage(); printVoltage();
OLED::print(SmallSymbolVolts, FontStyle::SMALL); OLED::print(SmallSymbolVolts, FontStyle::SMALL);
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_soldering_sleep_mode.cpp
View File

@@ -1,4 +1,5 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void ui_draw_soldering_detailed_sleep(TemperatureType_t tipTemp) { void ui_draw_soldering_detailed_sleep(TemperatureType_t tipTemp) {
@@ -32,3 +33,4 @@ void ui_draw_soldering_basic_sleep(TemperatureType_t tipTemp) {
OLED::refresh(); OLED::refresh();
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_temperature_change.cpp
View File

@@ -1,4 +1,5 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void ui_draw_temperature_change(void) { void ui_draw_temperature_change(void) {
@@ -19,3 +20,4 @@ void ui_draw_temperature_change(void) {
OLED::print(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled) ? LargeSymbolPlus : LargeSymbolMinus, FontStyle::LARGE); OLED::print(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled) ? LargeSymbolPlus : LargeSymbolMinus, FontStyle::LARGE);
} }
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_tip_temperature.cpp
View File

@@ -2,6 +2,7 @@
#include "OperatingModes.h" #include "OperatingModes.h"
#include "SolderingCommon.h" #include "SolderingCommon.h"
#include "TipThermoModel.h" #include "TipThermoModel.h"
#ifdef OLED_96x16
void ui_draw_tip_temperature(bool symbol, const FontStyle font) { void ui_draw_tip_temperature(bool symbol, const FontStyle font) {
// Draw tip temp handling unit conversion & tolerance near setpoint // Draw tip temp handling unit conversion & tolerance near setpoint
@@ -13,3 +14,4 @@ void ui_draw_tip_temperature(bool symbol, const FontStyle font) {
OLED::printSymbolDeg(font == FontStyle::LARGE ? FontStyle::EXTRAS : font); OLED::printSymbolDeg(font == FontStyle::LARGE ? FontStyle::EXTRAS : font);
} }
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/draw_usb_pd_debug.cpp
View File

@@ -1,4 +1,5 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void ui_draw_usb_pd_debug_state(const uint16_t vbus_sense_state, const uint8_t stateNumber) { void ui_draw_usb_pd_debug_state(const uint16_t vbus_sense_state, const uint8_t stateNumber) {
OLED::setCursor(0, 0); // Position the cursor at the 0,0 (top left) OLED::setCursor(0, 0); // Position the cursor at the 0,0 (top left)
@@ -41,3 +42,4 @@ void ui_draw_usb_pd_debug_pdo(const uint8_t entry_num, const uint16_t min_voltag
OLED::print(SmallSymbolAmps, FontStyle::SMALL); OLED::print(SmallSymbolAmps, FontStyle::SMALL);
} }
} }
#endif

3
source/Core/Threads/UI/drawing/mono_96x16/draw_warning_undervoltage.cpp
View File

@@ -1,5 +1,5 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void ui_draw_warning_undervoltage(void) { void ui_draw_warning_undervoltage(void) {
OLED::clearScreen(); OLED::clearScreen();
@@ -18,3 +18,4 @@ void ui_draw_warning_undervoltage(void) {
GUIDelay(); GUIDelay();
waitForButtonPress(); waitForButtonPress();
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/pre_render_assets.cpp
View File

@@ -1,5 +1,6 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
uint8_t buttonAF[sizeof(buttonA)]; uint8_t buttonAF[sizeof(buttonA)];
uint8_t buttonBF[sizeof(buttonB)]; uint8_t buttonBF[sizeof(buttonB)];
uint8_t disconnectedTipF[sizeof(disconnectedTip)]; uint8_t disconnectedTipF[sizeof(disconnectedTip)];
@@ -15,3 +16,4 @@ void ui_pre_render_assets(void) {
} }
} }
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/printSleepCountdown.cpp
View File

@@ -1,5 +1,6 @@
#include "Buttons.hpp" #include "Buttons.hpp"
#include "OperatingModeUtilities.h" #include "OperatingModeUtilities.h"
#ifdef OLED_96x16
extern TickType_t lastMovementTime; extern TickType_t lastMovementTime;
#ifndef NO_SLEEP_MODE #ifndef NO_SLEEP_MODE
void printCountdownUntilSleep(int sleepThres) { void printCountdownUntilSleep(int sleepThres) {
@@ -18,3 +19,4 @@ void printCountdownUntilSleep(int sleepThres) {
} }
} }
#endif #endif
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/print_voltage.cpp
View File

@@ -1,8 +1,10 @@
#include "ui_drawing.hpp" #include "ui_drawing.hpp"
#ifdef OLED_96x16
void printVoltage(void) { void printVoltage(void) {
uint32_t volt = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0); uint32_t volt = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0);
OLED::printNumber(volt / 10, 2, FontStyle::SMALL); OLED::printNumber(volt / 10, 2, FontStyle::SMALL);
OLED::print(SmallSymbolDot, FontStyle::SMALL); OLED::print(SmallSymbolDot, FontStyle::SMALL);
OLED::printNumber(volt % 10, 1, FontStyle::SMALL); OLED::printNumber(volt % 10, 1, FontStyle::SMALL);
} }
#endif

2
source/Core/Threads/UI/drawing/mono_96x16/show_warning.cpp
View File

@@ -1,6 +1,7 @@
#include "Buttons.hpp" #include "Buttons.hpp"
#include "OperatingModeUtilities.h" #include "OperatingModeUtilities.h"
#include "OperatingModes.h" #include "OperatingModes.h"
#ifdef OLED_96x16
bool warnUser(const char *warning, const ButtonState buttons) { bool warnUser(const char *warning, const ButtonState buttons) {
OLED::clearScreen(); OLED::clearScreen();
OLED::printWholeScreen(warning); OLED::printWholeScreen(warning);
@@ -10,3 +11,4 @@ bool warnUser(const char *warning, const ButtonState buttons) {
} }
return buttons != BUTTON_NONE; return buttons != BUTTON_NONE;
} }
#endif