rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

uncrustify

Browse Source
This commit is contained in:
Philippe Renon 2017-01-11 09:00:23 +01:00
parent 479282137e
commit fe9658a27b
6 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/pios/inc/pios_rfm22b_priv.h
View File

@ -212,7 +212,7 @@ struct pios_rfm22b_dev {
pios_com_callback tx_out_cb;
uint32_t tx_out_context;
uint8_t last_stream_sent;
uint8_t last_stream_sent;
// The Aux COM callback functions.
pios_com_callback aux_rx_in_cb;
uint32_t aux_rx_in_context;

44
flight/targets/boards/coptercontrol/pios_board.h
View File

@ -59,57 +59,57 @@
// ------------------------
// BOOTLOADER_SETTINGS
// ------------------------
#define BOARD_READABLE TRUE
#define BOARD_WRITABLE TRUE
#define MAX_DEL_RETRYS 3
#define BOARD_READABLE TRUE
#define BOARD_WRITABLE TRUE
#define MAX_DEL_RETRYS 3
// ------------------------
// WATCHDOG_SETTINGS
// ------------------------
#define PIOS_WATCHDOG_TIMEOUT 250
#define PIOS_WDG_REGISTER BKP_DR4
#define PIOS_WDG_ACTUATOR 0x0001
#define PIOS_WDG_STABILIZATION 0x0002
#define PIOS_WDG_ATTITUDE 0x0004
#define PIOS_WDG_MANUAL 0x0008
#define PIOS_WDG_AUTOTUNE 0x0010
#define PIOS_WATCHDOG_TIMEOUT 250
#define PIOS_WDG_REGISTER BKP_DR4
#define PIOS_WDG_ACTUATOR 0x0001
#define PIOS_WDG_STABILIZATION 0x0002
#define PIOS_WDG_ATTITUDE 0x0004
#define PIOS_WDG_MANUAL 0x0008
#define PIOS_WDG_AUTOTUNE 0x0010
// ------------------------
// TELEMETRY
// ------------------------
#define TELEM_QUEUE_SIZE 10
#define TELEM_QUEUE_SIZE 10
// ------------------------
// PIOS_LED
// ------------------------
#define PIOS_LED_HEARTBEAT 0
#define PIOS_LED_HEARTBEAT 0
// -------------------------
// System Settings
// -------------------------
#define PIOS_MASTER_CLOCK 72000000
#define PIOS_MASTER_CLOCK 72000000
// -------------------------
// Interrupt Priorities
// -------------------------
#define PIOS_IRQ_PRIO_LOW 12 // lower than RTOS
#define PIOS_IRQ_PRIO_MID 8 // higher than RTOS
#define PIOS_IRQ_PRIO_HIGH 5 // for SPI, ADC, I2C etc...
#define PIOS_IRQ_PRIO_HIGHEST 4 // for USART etc...
#define PIOS_IRQ_PRIO_LOW 12 // lower than RTOS
#define PIOS_IRQ_PRIO_MID 8 // higher than RTOS
#define PIOS_IRQ_PRIO_HIGH 5 // for SPI, ADC, I2C etc...
#define PIOS_IRQ_PRIO_HIGHEST 4 // for USART etc...
// ------------------------
// PIOS_I2C
// See also pios_board.c
// ------------------------
#define PIOS_I2C_MAX_DEVS 1
#define PIOS_I2C_MAX_DEVS 1
extern uint32_t pios_i2c_flexi_adapter_id;
#define PIOS_I2C_MAIN_ADAPTER (pios_i2c_flexi_adapter_id)
#define PIOS_I2C_ESC_ADAPTER (pios_i2c_flexi_adapter_id)
#define PIOS_I2C_BMP085_ADAPTER (pios_i2c_flexi_adapter_id)
#define PIOS_I2C_MAIN_ADAPTER (pios_i2c_flexi_adapter_id)
#define PIOS_I2C_ESC_ADAPTER (pios_i2c_flexi_adapter_id)
#define PIOS_I2C_BMP085_ADAPTER (pios_i2c_flexi_adapter_id)
// ------------------------
// PIOS_BMP085
// ------------------------
#define PIOS_BMP085_OVERSAMPLING 3
#define PIOS_BMP085_OVERSAMPLING 3
// -------------------------
// SPI

10
flight/targets/boards/oplinkmini/pios_board.h
View File

@ -138,15 +138,15 @@
// -------------------------
// System Settings
// -------------------------
#define PIOS_MASTER_CLOCK 72000000
#define PIOS_MASTER_CLOCK 72000000
// -------------------------
// Interrupt Priorities
// -------------------------
#define PIOS_IRQ_PRIO_LOW 12 // lower than RTOS
#define PIOS_IRQ_PRIO_MID 8 // higher than RTOS
#define PIOS_IRQ_PRIO_HIGH 5 // for SPI, ADC, I2C etc...
#define PIOS_IRQ_PRIO_HIGHEST 4 // for USART etc...
#define PIOS_IRQ_PRIO_LOW 12 // lower than RTOS
#define PIOS_IRQ_PRIO_MID 8 // higher than RTOS
#define PIOS_IRQ_PRIO_HIGH 5 // for SPI, ADC, I2C etc...
#define PIOS_IRQ_PRIO_HIGHEST 4 // for USART etc...
// ------------------------
// PIOS_I2C

10
ground/gcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
View File

@ -131,11 +131,11 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
// Show satellite constellations in a separate color
// The UBX SVID numbers are defined in appendix A of u-blox8-M8_ReceiverDescrProtSpec_(UBX-13003221)_Public.pdf
// GPS = default
// SBAS 120-158, QZSS 193-197
// BeiDou 33-64, 159-163
// GLONASS 65-96, 255 if unidentified
// Galileo 211-246
// GPS = default
// SBAS 120-158, QZSS 193-197
// BeiDou 33-64, 159-163
// GLONASS 65-96, 255 if unidentified
// Galileo 211-246
if ((prn > 119 && prn < 159) || (prn > 192 && prn < 198)) {
if (snr) {
satIcons[index]->setElementId("satellite-sbas");

12
ground/gcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
View File

@ -106,13 +106,13 @@ void GpsSnrWidget::drawSat(int index)
// Show satellite constellations in a separate color
// The UBX SVID numbers are defined in appendix A of u-blox8-M8_ReceiverDescrProtSpec_(UBX-13003221)_Public.pdf
// GPS = default
// SBAS 120-158, QZSS 193-197
// BeiDou 33-64, 159-163
// GLONASS 65-96, 255 if unidentified
// Galileo 211-246
// GPS = default
// SBAS 120-158, QZSS 193-197
// BeiDou 33-64, 159-163
// GLONASS 65-96, 255 if unidentified
// Galileo 211-246
if ((prn > 119 && prn < 159) || (prn > 192 && prn < 198)) {
boxes[index]->setBrush(QColor("#fd700b")); // orange
boxes[index]->setBrush(QColor("#fd700b")); // orange
} else if ((prn > 64 && prn < 97) || 255 == prn) {
boxes[index]->setBrush(QColor("Cyan"));
} else if ((prn > 32 && prn < 65) || (prn > 158 && prn < 164)) {

6
ground/uavobjgenerator/generators/arduino/uavobjectgeneratorarduino.cpp
View File

@ -34,11 +34,11 @@ bool UAVObjectGeneratorArduino::generate(UAVObjectParser *parser, QString templa
fieldTypeStrC << "int8_t" << "int16_t" << "int32_t" << "uint8_t"
<< "uint16_t" << "uint32_t" << "float" << "uint8_t";
arduinoCodePath = QDir(templatepath + QString(ARDUINO_CODE_DIR));
arduinoOutputPath = QDir(outputpath);
arduinoCodePath = QDir(templatepath + QString(ARDUINO_CODE_DIR));
arduinoOutputPath = QDir(outputpath);
arduinoOutputPath.mkpath(arduinoOutputPath.absolutePath());
arduinoIncludeTemplate = readFile(arduinoCodePath.absoluteFilePath("inc/uavobject.h.template"));
arduinoIncludeTemplate = readFile(arduinoCodePath.absoluteFilePath("inc/uavobject.h.template"));
if (arduinoIncludeTemplate.isNull()) {
cerr << "Error: Could not open arduino template files." << endl;