rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-06 21:54:15 +01:00
Code Issues Releases Activity

uncrustify

Browse Source
This commit is contained in:
Philippe Renon 2017-09-12 22:18:38 +02:00
parent 1e4c9d4009
commit df796c8a19
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/pios/common/pios_board_io.c
View File

@ -545,6 +545,7 @@ void PIOS_BOARD_IO_Configure_GCS_RCVR()
void PIOS_BOARD_IO_Configure_OPLink_RCVR() void PIOS_BOARD_IO_Configure_OPLink_RCVR()
{ {
uint32_t pios_oplinkrcvr_id; uint32_t pios_oplinkrcvr_id;
OPLinkReceiverInitialize(); OPLinkReceiverInitialize();
#if defined(PIOS_INCLUDE_RFM22B) #if defined(PIOS_INCLUDE_RFM22B)
PIOS_OPLinkRCVR_Init(&pios_oplinkrcvr_id, pios_rfm22b_id); PIOS_OPLinkRCVR_Init(&pios_oplinkrcvr_id, pios_rfm22b_id);

27
flight/pios/common/pios_ms56xx.c
View File

@ -34,12 +34,12 @@
#define POW2(x) (1 << x) #define POW2(x) (1 << x)
// Command addresses // Command addresses
#define MS56XX_RESET 0x1E #define MS56XX_RESET 0x1E
#define MS56XX_CALIB_ADDR 0xA2 /* First sample is factory stuff */ #define MS56XX_CALIB_ADDR 0xA2 /* First sample is factory stuff */
#define MS56XX_CALIB_LEN 16 #define MS56XX_CALIB_LEN 16
#define MS56XX_ADC_READ 0x00 #define MS56XX_ADC_READ 0x00
#define MS56XX_PRES_ADDR 0x40 #define MS56XX_PRES_ADDR 0x40
#define MS56XX_TEMP_ADDR 0x50 #define MS56XX_TEMP_ADDR 0x50
// Option to change the interleave between Temp and Pressure conversions // Option to change the interleave between Temp and Pressure conversions
// Undef for normal operation // Undef for normal operation
@ -128,7 +128,7 @@ const PIOS_SENSORS_Driver PIOS_MS56xx_Driver = {
*/ */
void PIOS_MS56xx_Init(const struct pios_ms56xx_cfg *cfg, int32_t i2c_device) void PIOS_MS56xx_Init(const struct pios_ms56xx_cfg *cfg, int32_t i2c_device)
{ {
i2c_id = i2c_device; i2c_id = i2c_device;
ms56xx_address = cfg->address; ms56xx_address = cfg->address;
version = cfg->version; version = cfg->version;
@ -262,14 +262,14 @@ int32_t PIOS_MS56xx_ReadADC(void)
// Offset and sensitivity at actual temperature // Offset and sensitivity at actual temperature
if (version == MS56XX_VERSION_5611) { if (version == MS56XX_VERSION_5611) {
// OFF = OFFT1 + TCO * dT = C2 * 2^16 + (C4 * dT) / 2^7 // OFF = OFFT1 + TCO * dT = C2 * 2^16 + (C4 * dT) / 2^7
Offset = ((int64_t)CalibData.C[1]) * POW2(16) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(7) - Offset2; Offset = ((int64_t)CalibData.C[1]) * POW2(16) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(7) - Offset2;
// SENS = SENST1 + TCS * dT = C1 * 2^15 + (C3 * dT) / 2^8 // SENS = SENST1 + TCS * dT = C1 * 2^15 + (C3 * dT) / 2^8
Sens = ((int64_t)CalibData.C[0]) * POW2(15) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(8) - Sens2; Sens = ((int64_t)CalibData.C[0]) * POW2(15) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(8) - Sens2;
} else { } else {
// OFF = OFFT1 + TCO * dT = C2 * 2^17 + (C4 * dT) / 2^6 // OFF = OFFT1 + TCO * dT = C2 * 2^17 + (C4 * dT) / 2^6
Offset = ((int64_t)CalibData.C[1]) * POW2(17) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(6) - Offset2; Offset = ((int64_t)CalibData.C[1]) * POW2(17) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(6) - Offset2;
// SENS = SENST1 + TCS * dT = C1 * 2^16 + (C3 * dT) / 2^7 // SENS = SENST1 + TCS * dT = C1 * 2^16 + (C3 * dT) / 2^7
Sens = ((int64_t)CalibData.C[0]) * POW2(16) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(7) - Sens2; Sens = ((int64_t)CalibData.C[0]) * POW2(16) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(7) - Sens2;
} }
// Temperature compensated pressure (10…1200mbar with 0.01mbar resolution) // Temperature compensated pressure (10…1200mbar with 0.01mbar resolution)
@ -516,10 +516,11 @@ bool PIOS_MS56xx_driver_poll(__attribute__((unused)) uintptr_t context)
} }
/* Poll the pressure sensor and return the temperature and pressure. */ /* Poll the pressure sensor and return the temperature and pressure. */
bool PIOS_MS56xx_Read(float *temperature, float *pressure) { bool PIOS_MS56xx_Read(float *temperature, float *pressure)
{
if (PIOS_MS56xx_driver_poll(0)) { if (PIOS_MS56xx_driver_poll(0)) {
*temperature = results.temperature; *temperature = results.temperature;
*pressure = results.sample; *pressure = results.sample;
return true; return true;
} }
return false; return false;

2
flight/pios/common/pios_oplinkrcvr.c
View File

@ -38,7 +38,7 @@
#include <pios_oplinkrcvr_priv.h> #include <pios_oplinkrcvr_priv.h>
// Put receiver in failsafe if not updated within timeout // Put receiver in failsafe if not updated within timeout
#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100 #define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
/* Provide a RCVR driver */ /* Provide a RCVR driver */
static int32_t PIOS_OPLinkRCVR_Get(uint32_t rcvr_id, uint8_t channel); static int32_t PIOS_OPLinkRCVR_Get(uint32_t rcvr_id, uint8_t channel);

1
flight/targets/boards/revolution/pios_board.h
View File

@ -1,4 +1,3 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup OpenPilotSystem OpenPilot System * @addtogroup OpenPilotSystem OpenPilot System

1
flight/targets/boards/sparky2/pios_board.h
View File

@ -1,4 +1,3 @@
/** /**
****************************************************************************** ******************************************************************************
* @addtogroup OpenPilotSystem OpenPilot System * @addtogroup OpenPilotSystem OpenPilot System