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

format fix (all but one) (#1889)

Browse Source
This commit is contained in:
discip
2024-02-29 01:10:48 +01:00
committed by Ben V. Brown
parent d4c1805e3c
commit dcfb0b9fb2
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
#include "ui_drawing.hpp"
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
if (OLED::getRotation()) {
OLED::setCursor(48, 0);
@@ -53,4 +53,4 @@ void ui_draw_soldering_profile_advanced(TemperatureType_t tipTemp, TemperatureTy
OLED::printNumber(phaseTimeGoal % 60, 2, FontStyle::SMALL, false);
}
}
}
}

2
source/Core/Threads/UI/logic/SolderingProfile.cpp
View File

@@ -126,7 +126,7 @@ OperatingMode gui_solderingProfileMode(const ButtonState buttons, guiContext *cx
// Draw in the screen details
if (getSettingValue(SettingsOptions::DetailedSoldering)) {
ui_draw_soldering_profile_advanced(tipTemp, profileCurrentTargetTemp, phaseElapsedSeconds, cxt->scratch_state.state1,cxt->scratch_state.state2);
ui_draw_soldering_profile_advanced(tipTemp, profileCurrentTargetTemp, phaseElapsedSeconds, cxt->scratch_state.state1, cxt->scratch_state.state2);
ui_draw_soldering_power_status(false);
} else {
ui_draw_soldering_basic_status(false);

4
source/Core/Threads/UI/logic/USBPDDebug_FS2711.cpp
View File

@@ -9,13 +9,13 @@ OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
// Print out the USB-PD state
// Basically this is like the Debug menu, but instead we want to print out the PD status
uint16_t *screen = &(cxt->scratch_state.state1);
if (*screen > 7) {
*screen = 0;
}
if (*screen == 0) {
// Print the PD Debug state
fs2711_state_t state = FS2711::debug_get_state();
fs2711_state_t state = FS2711::debug_get_state();
ui_draw_usb_pd_debug_state(0, state.pdo_num);
} else {

10
source/Core/Threads/UI/logic/USBPDDebug_FUSB.cpp
View File

@@ -10,17 +10,17 @@ OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
if ((*screen) == 0) {
// Print the PD state machine
uint8_t vbusState=0;
if (USBPowerDelivery::fusbPresent()) {
uint8_t vbusState = 0;
if (USBPowerDelivery::fusbPresent()) {
if (USBPowerDelivery::negotiationComplete() || (xTaskGetTickCount() > (TICKS_SECOND * 10))) {
if (!USBPowerDelivery::isVBUSConnected()) {
vbusState=2;
vbusState = 2;
} else {
vbusState=1;
vbusState = 1;
}
}
}
ui_draw_usb_pd_debug_state(vbusState,USBPowerDelivery::getStateNumber());
ui_draw_usb_pd_debug_state(vbusState, USBPowerDelivery::getStateNumber());
} else {
// Print out the Proposed power options one by one
auto lastCaps = USBPowerDelivery::getLastSeenCapabilities();

2
source/Core/Threads/UI/logic/USBPDDebug_HUSB238.cpp
View File

@@ -14,7 +14,7 @@ OperatingMode showPDDebug(const ButtonState buttons, guiContext *cxt) {
if (*screen == 0) {
// Print the PD Debug state
uint16_t temp = hub238_debug_state();
ui_draw_usb_pd_debug_state( 0,temp);
ui_draw_usb_pd_debug_state(0, temp);
} else {
// Print out the Proposed power options one by one