Skip to content

Commit df796c8

Browse files
committed
uncrustify
1 parent 1e4c9d4 commit df796c8

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

flight/pios/common/pios_board_io.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ void PIOS_BOARD_IO_Configure_GCS_RCVR()
545545
void PIOS_BOARD_IO_Configure_OPLink_RCVR()
546546
{
547547
uint32_t pios_oplinkrcvr_id;
548+
548549
OPLinkReceiverInitialize();
549550
#if defined(PIOS_INCLUDE_RFM22B)
550551
PIOS_OPLinkRCVR_Init(&pios_oplinkrcvr_id, pios_rfm22b_id);

flight/pios/common/pios_ms56xx.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
#define POW2(x) (1 << x)
3535

3636
// Command addresses
37-
#define MS56XX_RESET 0x1E
38-
#define MS56XX_CALIB_ADDR 0xA2 /* First sample is factory stuff */
39-
#define MS56XX_CALIB_LEN 16
40-
#define MS56XX_ADC_READ 0x00
41-
#define MS56XX_PRES_ADDR 0x40
42-
#define MS56XX_TEMP_ADDR 0x50
37+
#define MS56XX_RESET 0x1E
38+
#define MS56XX_CALIB_ADDR 0xA2 /* First sample is factory stuff */
39+
#define MS56XX_CALIB_LEN 16
40+
#define MS56XX_ADC_READ 0x00
41+
#define MS56XX_PRES_ADDR 0x40
42+
#define MS56XX_TEMP_ADDR 0x50
4343

4444
// Option to change the interleave between Temp and Pressure conversions
4545
// Undef for normal operation
@@ -128,7 +128,7 @@ const PIOS_SENSORS_Driver PIOS_MS56xx_Driver = {
128128
*/
129129
void PIOS_MS56xx_Init(const struct pios_ms56xx_cfg *cfg, int32_t i2c_device)
130130
{
131-
i2c_id = i2c_device;
131+
i2c_id = i2c_device;
132132

133133
ms56xx_address = cfg->address;
134134
version = cfg->version;
@@ -262,14 +262,14 @@ int32_t PIOS_MS56xx_ReadADC(void)
262262
// Offset and sensitivity at actual temperature
263263
if (version == MS56XX_VERSION_5611) {
264264
// OFF = OFFT1 + TCO * dT = C2 * 2^16 + (C4 * dT) / 2^7
265-
Offset = ((int64_t)CalibData.C[1]) * POW2(16) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(7) - Offset2;
265+
Offset = ((int64_t)CalibData.C[1]) * POW2(16) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(7) - Offset2;
266266
// SENS = SENST1 + TCS * dT = C1 * 2^15 + (C3 * dT) / 2^8
267-
Sens = ((int64_t)CalibData.C[0]) * POW2(15) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(8) - Sens2;
267+
Sens = ((int64_t)CalibData.C[0]) * POW2(15) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(8) - Sens2;
268268
} else {
269269
// OFF = OFFT1 + TCO * dT = C2 * 2^17 + (C4 * dT) / 2^6
270-
Offset = ((int64_t)CalibData.C[1]) * POW2(17) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(6) - Offset2;
270+
Offset = ((int64_t)CalibData.C[1]) * POW2(17) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(6) - Offset2;
271271
// SENS = SENST1 + TCS * dT = C1 * 2^16 + (C3 * dT) / 2^7
272-
Sens = ((int64_t)CalibData.C[0]) * POW2(16) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(7) - Sens2;
272+
Sens = ((int64_t)CalibData.C[0]) * POW2(16) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(7) - Sens2;
273273
}
274274

275275
// Temperature compensated pressure (10…1200mbar with 0.01mbar resolution)
@@ -516,10 +516,11 @@ bool PIOS_MS56xx_driver_poll(__attribute__((unused)) uintptr_t context)
516516
}
517517

518518
/* Poll the pressure sensor and return the temperature and pressure. */
519-
bool PIOS_MS56xx_Read(float *temperature, float *pressure) {
519+
bool PIOS_MS56xx_Read(float *temperature, float *pressure)
520+
{
520521
if (PIOS_MS56xx_driver_poll(0)) {
521522
*temperature = results.temperature;
522-
*pressure = results.sample;
523+
*pressure = results.sample;
523524
return true;
524525
}
525526
return false;

flight/pios/common/pios_oplinkrcvr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <pios_oplinkrcvr_priv.h>
3939

4040
// Put receiver in failsafe if not updated within timeout
41-
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
41+
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
4242

4343
/* Provide a RCVR driver */
4444
static int32_t PIOS_OPLinkRCVR_Get(uint32_t rcvr_id, uint8_t channel);

flight/targets/boards/revolution/pios_board.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/**
32
******************************************************************************
43
* @addtogroup OpenPilotSystem OpenPilot System

flight/targets/boards/sparky2/pios_board.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/**
32
******************************************************************************
43
* @addtogroup OpenPilotSystem OpenPilot System

0 commit comments

Comments
 (0)