Skip to content

Commit 61f3f4a

Browse files
committed
Format
1 parent 161d992 commit 61f3f4a

6 files changed

Lines changed: 20 additions & 21 deletions

File tree

source/Core/BSP/MHP30/Setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void Setup_HAL() {
4343
MX_IWDG_Init();
4444
HAL_ADC_Start(&hadc2);
4545
HAL_ADCEx_MultiModeStart_DMA(&hadc1, ADCReadings,
46-
(ADC_SAMPLES * ADC_CHANNELS)); // start DMA of normal readings
46+
(ADC_SAMPLES * ADC_CHANNELS)); // start DMA of normal readings
4747
// HAL_ADCEx_InjectedStart(&hadc1); // enable injected readings
4848
// HAL_ADCEx_InjectedStart(&hadc2); // enable injected readings
4949
}

source/Core/BSP/Pinecil/Debug.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ void log_system_state(int32_t PWMWattsx10) {
2424
// 3+1+3+1+3+1+3+1+5+2 = 23, so sizing at 32 for now
2525

2626
outputLength = snprintf(uartOutputBuffer, uartOutputBufferLength, "%lu,%u,%li,%u,%lu\r\n",
27-
TipThermoModel::getTipInC(false), // Tip temp in C
28-
getHandleTemperature(0), // Handle temp in C X10
29-
PWMWattsx10, // Output Wattage
30-
pendingPWM, // PWM
31-
TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true) // Tip temp in uV
32-
);
27+
TipThermoModel::getTipInC(false), // Tip temp in C
28+
getHandleTemperature(0), // Handle temp in C X10
29+
PWMWattsx10, // Output Wattage
30+
pendingPWM, // PWM
31+
TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true) // Tip temp in uV
32+
);
3333

3434
// Now print this out the uart via IRQ (DMA cant be used as oled has it)
3535
currentOutputPos = 0;

source/Core/BSP/Pinecilv2/Debug.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ void log_system_state(int32_t PWMWattsx10) {
2020
// 3+1+3+1+3+1+3+1+5+2 = 23, so sizing at 32 for now
2121

2222
outputLength = snprintf(uartOutputBuffer, uartOutputBufferLength, "%lu,%u,%li,%u,%lu\r\n", //
23-
TipThermoModel::getTipInC(false), // Tip temp in C
24-
getHandleTemperature(0), // Handle temp in C X10
25-
PWMWattsx10, // Output Wattage
26-
pendingPWM, // PWM
27-
TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true) // Tip temp in uV
28-
);
23+
TipThermoModel::getTipInC(false), // Tip temp in C
24+
getHandleTemperature(0), // Handle temp in C X10
25+
PWMWattsx10, // Output Wattage
26+
pendingPWM, // PWM
27+
TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true) // Tip temp in uV
28+
);
2929

3030
// Now print this out the uart via IRQ (DMA cant be used as oled has it)
3131
currentOutputPos = 0;

source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/ble/ble_stack/host/gatt.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,8 +2365,8 @@ static void read_included_uuid_cb(struct bt_conn *conn, u8_t err, const void *pd
23652365
}
23662366

23672367
attr = (&(struct bt_gatt_attr){
2368-
.uuid = BT_UUID_GATT_INCLUDE,
2369-
.user_data = &value,
2368+
.uuid = BT_UUID_GATT_INCLUDE,
2369+
.user_data = &value,
23702370
});
23712371
attr->handle = params->_included.attr_handle;
23722372

@@ -2465,8 +2465,8 @@ static u16_t parse_include(struct bt_conn *conn, const void *pdu, struct bt_gatt
24652465
}
24662466

24672467
attr = (&(struct bt_gatt_attr){
2468-
.uuid = BT_UUID_GATT_INCLUDE,
2469-
.user_data = &value,
2468+
.uuid = BT_UUID_GATT_INCLUDE,
2469+
.user_data = &value,
24702470
});
24712471
attr->handle = handle;
24722472

source/Core/BSP/Pinecilv2/bl_mcu_sdk/drivers/bl702_driver/std_drv/src/bl702_adc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
*/
7777
static intCallback_Type *adcIntCbfArra[ADC_INT_ALL] = {NULL};
7878
ADC_Gain_Coeff_Type adcGainCoeffCal = {
79-
.adcGainCoeffEnable = DISABLE,
80-
.adcgainCoeffVal = 0,
81-
.coe = 1,
79+
.adcGainCoeffEnable = DISABLE,
80+
.adcgainCoeffVal = 0,
81+
.coe = 1,
8282
};
8383

8484
/*@} end of group ADC_Private_Variables */

source/Core/Src/Settings.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ bool sanitiseSettings();
2929
// char (*__kaboom)[sizeof(systemSettingsType)] = 1; // Uncomment to print size at compile time
3030
volatile systemSettingsType systemSettings;
3131

32-
3332
#ifdef BLE_ENABLED
3433
static int16_t bleValueOnEntry = -1;
3534

0 commit comments

Comments
 (0)