Fix clang-format code style mismatches

This commit is contained in:
jonasius
2024-06-06 23:35:12 +02:00
parent f5d6d8b1af
commit 8514edfdea
3 changed files with 11 additions and 11 deletions

View File

@@ -1,10 +1,10 @@
#include "BSP.h" #include "BSP.h"
#include "BSP_Power.h" #include "BSP_Power.h"
#include "FS2711.hpp"
#include "Pins.h" #include "Pins.h"
#include "QC3.h" #include "QC3.h"
#include "Settings.h" #include "Settings.h"
#include "USBPD.h" #include "USBPD.h"
#include "FS2711.hpp"
#include "configuration.h" #include "configuration.h"
void power_check() { void power_check() {
@@ -27,16 +27,16 @@ void power_check() {
#endif #endif
} }
bool getIsPoweredByDCIN() { bool getIsPoweredByDCIN() {
#if POW_PD_EXT == 2 && defined(POW_DC) #if POW_PD_EXT == 2 && defined(POW_DC)
if (!FS2711::has_run_selection()) { if (!FS2711::has_run_selection()) {
return true; return true;
} else if(FS2711::debug_get_state().source_voltage > 0) { } else if (FS2711::debug_get_state().source_voltage > 0) {
return false; return false;
} else { } else {
return true; return true;
} }
#else #else
return false; return false;
#endif #endif
} }

View File

@@ -8,7 +8,7 @@
#include "Utils.h" #include "Utils.h"
#include "configuration.h" #include "configuration.h"
#if defined(TEMP_uV_LOOKUP_S60) #if defined(TEMP_uV_LOOKUP_S60)
TemperatureType_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return (tipuVDelta * 50) / 485; } TemperatureType_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) { return (tipuVDelta * 50) / 485; }
#elif defined(TEMP_uV_LOOKUP_S99) #elif defined(TEMP_uV_LOOKUP_S99)
// 42.85 uV / K -> 1/42.85 K/uV = 20/857 // 42.85 uV / K -> 1/42.85 K/uV = 20/857

View File

@@ -144,8 +144,8 @@
#define POWER_LIMIT_STEPS 5 #define POWER_LIMIT_STEPS 5
#define OP_AMP_GAIN_STAGE 536 #define OP_AMP_GAIN_STAGE 536
#define TEMP_uV_LOOKUP_S60 #define TEMP_uV_LOOKUP_S60
#define USB_PD_VMAX 12 // Maximum voltage for PD to negotiate #define USB_PD_VMAX 12 // Maximum voltage for PD to negotiate
#define USB_PD_TIMEOUT 1 // Default Timeout for USB-PD Protocol negotiation in x100ms #define USB_PD_TIMEOUT 1 // Default Timeout for USB-PD Protocol negotiation in x100ms
#define HARDWARE_MAX_WATTAGE_X10 600 #define HARDWARE_MAX_WATTAGE_X10 600
@@ -176,8 +176,8 @@
#define POWER_LIMIT_STEPS 5 #define POWER_LIMIT_STEPS 5
#define OP_AMP_GAIN_STAGE 536 #define OP_AMP_GAIN_STAGE 536
#define TEMP_uV_LOOKUP_S60 #define TEMP_uV_LOOKUP_S60
#define USB_PD_VMAX 20 // Maximum voltage for PD to negotiate #define USB_PD_VMAX 20 // Maximum voltage for PD to negotiate
#define USB_PD_TIMEOUT 1 // Default Timeout for USB-PD Protocol negotiation in x100ms #define USB_PD_TIMEOUT 1 // Default Timeout for USB-PD Protocol negotiation in x100ms
#define HARDWARE_MAX_WATTAGE_X10 600 #define HARDWARE_MAX_WATTAGE_X10 600
@@ -208,8 +208,8 @@
#define POWER_LIMIT_STEPS 5 #define POWER_LIMIT_STEPS 5
#define OP_AMP_GAIN_STAGE 237 // Two sequential op-amps 1st: 1+(9k29/997R)=10.31 2nd: 1+(22k/1k)=23 -> 10.31*23=237 #define OP_AMP_GAIN_STAGE 237 // Two sequential op-amps 1st: 1+(9k29/997R)=10.31 2nd: 1+(22k/1k)=23 -> 10.31*23=237
#define TEMP_uV_LOOKUP_S99 #define TEMP_uV_LOOKUP_S99
#define USB_PD_VMAX 20 // Maximum voltage for PD to negotiate #define USB_PD_VMAX 20 // Maximum voltage for PD to negotiate
#define USB_PD_TIMEOUT 2 // Default Timeout for USB-PD Protocol negotiation in x100ms #define USB_PD_TIMEOUT 2 // Default Timeout for USB-PD Protocol negotiation in x100ms
#define HARDWARE_MAX_WATTAGE_X10 1300 #define HARDWARE_MAX_WATTAGE_X10 1300