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

-style

Browse Source
This commit is contained in:
resistancelion
2025-01-30 18:33:30 +02:00
parent e346a7793e
commit 157769b099
10 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/BSP/Miniware/Vendor/CMSIS/Include/arm_math.h vendored
View File

@@ -495,7 +495,7 @@ static __INLINE q63_t mult32x64(q63_t x, q31_t y) { return ((((q63_t)(x & 0x0000
/* /*
#if defined (ARM_MATH_CM0_FAMILY) && defined ( __CC_ARM ) #if defined (ARM_MATH_CM0_FAMILY) && defined ( __CC_ARM )
#define __CLZ __clz #define __CLZ __clz
#endif #endif
*/ */
/* note: function can be removed when all toolchain support __CLZ for Cortex-M0 */ /* note: function can be removed when all toolchain support __CLZ for Cortex-M0 */
#if defined(ARM_MATH_CM0_FAMILY) && ((defined(__ICCARM__))) #if defined(ARM_MATH_CM0_FAMILY) && ((defined(__ICCARM__)))

2
source/Core/BSP/Sequre/Vendor/CMSIS/Include/arm_math.h vendored
View File

@@ -495,7 +495,7 @@ static __INLINE q63_t mult32x64(q63_t x, q31_t y) { return ((((q63_t)(x & 0x0000
/* /*
#if defined (ARM_MATH_CM0_FAMILY) && defined ( __CC_ARM ) #if defined (ARM_MATH_CM0_FAMILY) && defined ( __CC_ARM )
#define __CLZ __clz #define __CLZ __clz
#endif #endif
*/ */
/* note: function can be removed when all toolchain support __CLZ for Cortex-M0 */ /* note: function can be removed when all toolchain support __CLZ for Cortex-M0 */
#if defined(ARM_MATH_CM0_FAMILY) && ((defined(__ICCARM__))) #if defined(ARM_MATH_CM0_FAMILY) && ((defined(__ICCARM__)))

4
source/Core/Drivers/Font.h
View File

@@ -356,7 +356,7 @@
0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x2b, 0x09, 0x07, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x2b, 0x09, 0x07, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x02, 0x01,
} }
}; };
#else #else
#if defined(MODEL_TS100) || defined(MODEL_Pinecil) || defined(MODEL_Pinecilv2) #if defined(MODEL_TS100) || defined(MODEL_Pinecil) || defined(MODEL_Pinecilv2)
const uint8_t buttonA[] = { const uint8_t buttonA[] = {
// width = 42 // width = 42
@@ -580,6 +580,6 @@
#endif #endif
}; };
#endif #endif
// clang-format on // clang-format on
#endif /* FONT_H_ */ #endif /* FONT_H_ */

18
source/Core/Threads/GUIThread.cpp
View File

@@ -45,13 +45,13 @@ OperatingMode guiHandleDraw(void) {
OLED::clearScreen(); // Clear ready for render pass OLED::clearScreen(); // Clear ready for render pass
bool d = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); bool d = getSettingValue(SettingsOptions::ReverseButtonNavEnabled);
bool e = getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled); bool e = getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled);
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
bool f = currentOperatingMode == OperatingMode::TemperatureAdjust; bool f = currentOperatingMode == OperatingMode::TemperatureAdjust;
// Read button state // Read button state
ButtonState buttons = getButtonState((e && f) || (d && !e && !f) || (d && e && !f)); ButtonState buttons = getButtonState((e && f) || (d && !e && !f) || (d && e && !f));
#else #else
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
#endif #endif
// Enforce screen on if buttons pressed, movement, hot tip etc // Enforce screen on if buttons pressed, movement, hot tip etc
if (buttons != BUTTON_NONE) { if (buttons != BUTTON_NONE) {
OLED::setDisplayState(OLED::DisplayState::ON); OLED::setDisplayState(OLED::DisplayState::ON);
@@ -117,11 +117,11 @@ OperatingMode guiHandleDraw(void) {
newMode = gui_SolderingSleepingMode(buttons, &context); newMode = gui_SolderingSleepingMode(buttons, &context);
break; break;
case OperatingMode::TemperatureAdjust: case OperatingMode::TemperatureAdjust:
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
newMode = gui_solderingTempAdjust(getButtonState(), &context); newMode = gui_solderingTempAdjust(getButtonState(), &context);
#else #else
newMode = gui_solderingTempAdjust(getButtonState(e), &context); newMode = gui_solderingTempAdjust(getButtonState(e), &context);
#endif #endif
break; break;
case OperatingMode::DebugMenuReadout: case OperatingMode::DebugMenuReadout:
newMode = showDebugMenu(buttons, &context); newMode = showDebugMenu(buttons, &context);
@@ -130,11 +130,11 @@ OperatingMode guiHandleDraw(void) {
newMode = performCJCC(buttons, &context); newMode = performCJCC(buttons, &context);
break; break;
case OperatingMode::SettingsMenu: case OperatingMode::SettingsMenu:
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
newMode = gui_SettingsMenu(getButtonState(), &context); newMode = gui_SettingsMenu(getButtonState(), &context);
#else #else
newMode = gui_SettingsMenu(getButtonState(d), &context); newMode = gui_SettingsMenu(getButtonState(d), &context);
#endif #endif
break; break;
case OperatingMode::InitialisationDone: case OperatingMode::InitialisationDone:
newMode = handle_post_init_state(); newMode = handle_post_init_state();

10
source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp
View File

@@ -8,19 +8,19 @@ extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) { void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
bool isFlipped = OLED::getRotation(); bool isFlipped = OLED::getRotation();
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled);
#endif #endif
bool tipDisconnected = isTipDisconnected(); bool tipDisconnected = isTipDisconnected();
// Flip and switch buttons accordingly // Flip and switch buttons accordingly
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? (isReverse ? buttonBF : buttonAF) : (isReverse ? buttonB : buttonA)); OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? (isReverse ? buttonBF : buttonAF) : (isReverse ? buttonB : buttonA));
OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB)); OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB));
#else #else
OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? buttonAF : buttonA); OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? buttonAF : buttonA);
OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? buttonBF : buttonB); OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? buttonBF : buttonB);
#endif #endif
if ((tipTemp > 55) || tipDisconnected) { if ((tipTemp > 55) || tipDisconnected) {
// draw temp over the start soldering button // draw temp over the start soldering button

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

@@ -7,19 +7,19 @@ extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) { void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
bool isFlipped = OLED::getRotation(); bool isFlipped = OLED::getRotation();
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled);
#endif #endif
bool tipDisconnected = isTipDisconnected(); bool tipDisconnected = isTipDisconnected();
// Flip and switch buttons accordingly // Flip and switch buttons accordingly
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? (isReverse ? buttonBF : buttonAF) : (isReverse ? buttonB : buttonA)); OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? (isReverse ? buttonBF : buttonAF) : (isReverse ? buttonB : buttonA));
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB)); OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB));
#else #else
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? buttonAF : buttonA); OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? buttonAF : buttonA);
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? buttonBF : buttonB); OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? buttonBF : buttonB);
#endif #endif
if ((tipTemp > 55) || tipDisconnected) { if ((tipTemp > 55) || tipDisconnected) {
// draw temp over the start soldering button // draw temp over the start soldering button

6
source/Core/Threads/UI/logic/utils/shouldDeviceShutdown.cpp
View File

@@ -17,11 +17,11 @@ bool shouldShutdown(void) {
} }
} }
} }
#ifdef REVERSE_NAV_EVERYWHERE #ifdef REVERSE_NAV_EVERYWHERE
if (getButtonState(getSettingValue(SettingsOptions::ReverseButtonNavEnabled) == BUTTON_B_LONG) { // allow also if back button is pressed long if (getButtonState(getSettingValue(SettingsOptions::ReverseButtonNavEnabled) == BUTTON_B_LONG) { // allow also if back button is pressed long
#else #else
if (getButtonState() == BUTTON_B_LONG) { // allow also if back button is pressed long if (getButtonState() == BUTTON_B_LONG) { // allow also if back button is pressed long
#endif #endif
return true; return true;
} }
return false; return false;