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

LP-72 uncrustify

Browse Source
This commit is contained in:
Cliff Geerdes 2016-05-24 16:09:30 -04:00 committed by Laurent Lalanne
parent fdc8b10ddf
commit 0628949afd
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/pios/stm32f4xx/pios_tim.c
View File

@ -140,7 +140,7 @@ int32_t PIOS_TIM_InitClock(const struct pios_tim_clock_cfg *cfg)
NVIC_InitTypeDef init = cfg->irq.init; NVIC_InitTypeDef init = cfg->irq.init;
init.NVIC_IRQChannel = TIM1_UP_TIM10_IRQn; init.NVIC_IRQChannel = TIM1_UP_TIM10_IRQn;
NVIC_Init(&init); NVIC_Init(&init);
#if !defined (STM32F401xx) && !defined (STM32F411xE) #if !defined(STM32F401xx) && !defined(STM32F411xE)
} else if (cfg->timer == TIM8) { } else if (cfg->timer == TIM8) {
NVIC_InitTypeDef init = cfg->irq.init; NVIC_InitTypeDef init = cfg->irq.init;
init.NVIC_IRQChannel = TIM8_UP_TIM13_IRQn; init.NVIC_IRQChannel = TIM8_UP_TIM13_IRQn;

14
ground/gcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
View File

@ -15,7 +15,7 @@ int main(int argc, char *argv[])
bool use_serial = false; bool use_serial = false;
bool verify; bool verify;
bool debug = false; bool debug = false;
//bool umodereset = false; // bool umodereset = false;
OP_DFU::Actions action = OP_DFU::actionNone; OP_DFU::Actions action = OP_DFU::actionNone;
QString file; QString file;
QString serialport; QString serialport;
@ -27,7 +27,7 @@ int main(int argc, char *argv[])
debug = true; debug = true;
} }
if (args.contains("-ur")) { if (args.contains("-ur")) {
//umodereset = true; // umodereset = true;
} }
standardOutput << "OpenPilot serial firmware uploader tool." << endl; standardOutput << "OpenPilot serial firmware uploader tool." << endl;
if (args.indexOf(PROGRAMFW) + 1 < args.length()) { if (args.indexOf(PROGRAMFW) + 1 < args.length()) {
@ -57,17 +57,17 @@ int main(int argc, char *argv[])
} }
action = OP_DFU::actionProgram; action = OP_DFU::actionProgram;
} else if (args.contains(COMPARECRC) || args.contains(COMPAREALL)) { } else if (args.contains(COMPARECRC) || args.contains(COMPAREALL)) {
//int index; // int index;
if (args.contains(COMPARECRC)) { if (args.contains(COMPARECRC)) {
//index = args.indexOf(COMPARECRC); // index = args.indexOf(COMPARECRC);
action = OP_DFU::actionCompareCrc; action = OP_DFU::actionCompareCrc;
} else { } else {
//index = args.indexOf(COMPAREALL); // index = args.indexOf(COMPAREALL);
action = OP_DFU::actionCompareAll; action = OP_DFU::actionCompareAll;
} }
} else if (args.contains(DOWNLOAD)) { } else if (args.contains(DOWNLOAD)) {
//int index; // int index;
//index = args.indexOf(DOWNLOAD); // index = args.indexOf(DOWNLOAD);
action = OP_DFU::actionDownload; action = OP_DFU::actionDownload;
} else if (args.contains(STATUSREQUEST)) { } else if (args.contains(STATUSREQUEST)) {
action = OP_DFU::actionStatusReq; action = OP_DFU::actionStatusReq;

10
ground/gcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
View File

@ -1119,11 +1119,11 @@ int DFUObject::receiveData(void *data, int size)
} }
} }
#define BOARD_ID_MB 1 #define BOARD_ID_MB 1
#define BOARD_ID_INS 2 #define BOARD_ID_INS 2
#define BOARD_ID_PIP 3 #define BOARD_ID_PIP 3
#define BOARD_ID_CC 4 #define BOARD_ID_CC 4
#define BOARD_ID_REVO 9 #define BOARD_ID_REVO 9
#define BOARD_ID_SPARKY2 0x92 #define BOARD_ID_SPARKY2 0x92
/** /**

8
ground/gcs/src/plugins/ophid/inc/ophid_const.h
View File

@ -31,10 +31,10 @@
#include <QDebug> #include <QDebug>
#ifdef OPHID_DEBUG_ON #ifdef OPHID_DEBUG_ON
#define OPHID_DEBUG(fmt, args ...) qDebug("[DEBUG] " ## fmt, args) #define OPHID_DEBUG(fmt, args ...) qDebug("[DEBUG] "##fmt, args)
#define OPHID_TRACE(fmt, args ...) qDebug("[TRACE] %s:%s:%d: " ## fmt, __FILE__, __func__, __LINE__, args) #define OPHID_TRACE(fmt, args ...) qDebug("[TRACE] %s:%s:%d: "##fmt, __FILE__, __func__, __LINE__, args)
#define OPHID_ERROR(fmt, args ...) qDebug("[ERROR] %s:%s:%d: " ## fmt, __FILE__, __func__, __LINE__, args) #define OPHID_ERROR(fmt, args ...) qDebug("[ERROR] %s:%s:%d: "##fmt, __FILE__, __func__, __LINE__, args)
#define OPHID_WARNING(fmt, args ...) qDebug("[WARNING] " ## fmt, args) #define OPHID_WARNING(fmt, args ...) qDebug("[WARNING] "##fmt, args)
#else #else
#define OPHID_DEBUG(fmt, args ...) #define OPHID_DEBUG(fmt, args ...)
#define OPHID_TRACE(fmt, args ...) #define OPHID_TRACE(fmt, args ...)

4
ground/gcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
View File

@ -9,8 +9,8 @@ public:
QString gitTag; QString gitTag;
QByteArray fwHash; QByteArray fwHash;
QByteArray uavoHash; QByteArray uavoHash;
quint8 boardType; quint8 boardType;
quint8 boardRevision; quint8 boardRevision;
static QString idToBoardName(quint16 id) static QString idToBoardName(quint16 id)
{ {
switch (id) { switch (id) {

10
ground/gcs/src/plugins/uploader/op_dfu.cpp
View File

@ -1084,11 +1084,11 @@ int DFUObject::receiveData(void *data, int size)
} }
} }
#define BOARD_ID_MB 1 #define BOARD_ID_MB 1
#define BOARD_ID_INS 2 #define BOARD_ID_INS 2
#define BOARD_ID_PIP 3 #define BOARD_ID_PIP 3
#define BOARD_ID_CC 4 #define BOARD_ID_CC 4
#define BOARD_ID_REVO 9 #define BOARD_ID_REVO 9
#define BOARD_ID_SPARKY2 0x92 #define BOARD_ID_SPARKY2 0x92
/** /**

4
ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
View File

@ -87,8 +87,8 @@ void RunningDeviceWidget::populate()
devicePic.load(":/uploader/images/gcs-board-cc3d.png"); devicePic.load(":/uploader/images/gcs-board-cc3d.png");
break; break;
case 0x0903: case 0x0903:
// Revo // Revo
// fall through to DF4B // fall through to DF4B
case 0x0904: case 0x0904:
// DiscoveryF4Bare // DiscoveryF4Bare
devicePic.load(":/uploader/images/gcs-board-revo.png"); devicePic.load(":/uploader/images/gcs-board-revo.png");