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

Fix clang-format code style mismatches

Browse Source
This commit is contained in:
jonasius
2024-06-19 22:24:05 +02:00
parent b772e1dc26
commit c8c36d29bf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/Core/Drivers/FS2711.cpp
View File

@@ -1,9 +1,9 @@
#include "FS2711.hpp" #include "FS2711.hpp"
#include "FS2711_defines.h" #include "FS2711_defines.h"
#include "I2CBB2.hpp" #include "I2CBB2.hpp"
#include "configuration.h"
#include "Settings.h" #include "Settings.h"
#include "Utils.h" #include "Utils.h"
#include "configuration.h"
#if POW_PD_EXT == 2 #if POW_PD_EXT == 2
#include "BSP.h" #include "BSP.h"
#include "cmsis_os.h" #include "cmsis_os.h"
@@ -35,10 +35,10 @@ void FS2711::start() {
enable_protocol(false); enable_protocol(false);
// PDNegTimeout is in 100ms, so x100 for ms // PDNegTimeout is in 100ms, so x100 for ms
osDelay(getSettingValue(SettingsOptions::PDNegTimeout)*100); osDelay(getSettingValue(SettingsOptions::PDNegTimeout) * 100);
select_protocol(FS2711_PROTOCOL_PD); select_protocol(FS2711_PROTOCOL_PD);
enable_protocol(true); enable_protocol(true);
osDelay(getSettingValue(SettingsOptions::PDNegTimeout)*100); osDelay(getSettingValue(SettingsOptions::PDNegTimeout) * 100);
} }
uint8_t FS2711::selected_protocol() { return i2c_read(FS2711_REG_SELECT_PROTOCOL); } uint8_t FS2711::selected_protocol() { return i2c_read(FS2711_REG_SELECT_PROTOCOL); }
@@ -162,11 +162,11 @@ void FS2711::negotiate() {
if (getSettingValue(SettingsOptions::USBPDMode) == 1) { if (getSettingValue(SettingsOptions::USBPDMode) == 1) {
tip_resistance += 5; tip_resistance += 5;
} }
#ifdef MODEL_HAS_DCDC #ifdef MODEL_HAS_DCDC
// If this device has step down DC/DC inductor to smooth out current spikes // If this device has step down DC/DC inductor to smooth out current spikes
// We can instead ignore resistance and go for max voltage we can accept; and rely on the DC/DC regulation to keep under current limit // We can instead ignore resistance and go for max voltage we can accept; and rely on the DC/DC regulation to keep under current limit
tip_resistance = 255; // (Push to 25.5 ohms to effectively disable this check) tip_resistance = 255; // (Push to 25.5 ohms to effectively disable this check)
#endif #endif
uint16_t pdo_min_mv = 0, pdo_max_mv = 0, pdo_max_curr = 0, pdo_type = 0; uint16_t pdo_min_mv = 0, pdo_max_mv = 0, pdo_max_curr = 0, pdo_type = 0;

6
source/Core/Threads/OperatingModes/utils/SolderingCommon.cpp
View File

@@ -135,9 +135,9 @@ int8_t getPowerSourceNumber(void) {
#endif #endif
#if POW_PD_EXT == 2 #if POW_PD_EXT == 2
if (FS2711::has_run_selection()) { if (FS2711::has_run_selection()) {
poweredbyPD = true; poweredbyPD = true;
// FS2711IC has VBUS always connected // FS2711IC has VBUS always connected
pdHasVBUSConnected = true; pdHasVBUSConnected = true;
} }
#endif #endif
if (poweredbyPD) { if (poweredbyPD) {