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

LP-72 Uncrustify after rebase

Browse Source
This commit is contained in:
Laurent Lalanne 2016-05-22 16:23:58 +02:00
parent 57bc1725c1
commit afb32d3090
4 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/libraries/alarms.c
View File

@ -360,7 +360,7 @@ size_t AlarmString(SystemAlarmsData *alarm, char *buffer, size_t buffer_size, Sy
}
int current_len = strlen(current_msg);
if ((pos + current_len + 1) > buffer_size) {
break;
}

77
flight/modules/UAVOMSPBridge/UAVOMSPBridge.c
View File

@ -227,18 +227,18 @@ static const char msp_pidnames[] = "ROLL;"
#define MSP_ANALOG_CURRENT (1 << 1)
struct msp_bridge {
uintptr_t com;
uintptr_t com;
uint8_t sensors;
uint8_t analog;
uint8_t sensors;
uint8_t analog;
UAVObjHandle current_pid_bank;
msp_state state;
uint8_t cmd_size;
uint8_t cmd_id;
uint8_t cmd_i;
uint8_t checksum;
msp_state state;
uint8_t cmd_size;
uint8_t cmd_id;
uint8_t cmd_i;
uint8_t checksum;
union {
uint8_t data[0];
// Specific packed data structures go here.
@ -489,13 +489,13 @@ static void msp_send_analog(struct msp_bridge *m)
data.status.rssi = ((rssi - OPLINK_LOW_RSSI) * 1023) / (OPLINK_HIGH_RSSI - OPLINK_LOW_RSSI);
} else {
#endif /* PIOS_INCLUDE_OPLINKRCVR */
uint8_t quality;
ReceiverStatusQualityGet(&quality);
uint8_t quality;
ReceiverStatusQualityGet(&quality);
// MSP RSSI's range is 0-1023
data.status.rssi = (quality * 1023) / 100;
// MSP RSSI's range is 0-1023
data.status.rssi = (quality * 1023) / 100;
#ifdef PIOS_INCLUDE_OPLINKRCVR
}
}
#endif /* PIOS_INCLUDE_OPLINKRCVR */
if (data.status.rssi > 1023) {
@ -674,14 +674,14 @@ static void msp_send_pidnames(struct msp_bridge *m)
static void pid_native2msp(const float *native, msp_pid_t *piditem, float scale, unsigned numelem)
{
for(unsigned i = 0; i < numelem; ++i) {
for (unsigned i = 0; i < numelem; ++i) {
piditem->values[i] = lroundf(native[i] * scale);
}
}
static void pid_msp2native(const msp_pid_t *piditem, float *native, float scale, unsigned numelem)
{
for(unsigned i = 0; i < numelem; ++i) {
for (unsigned i = 0; i < numelem; ++i) {
native[i] = (float)piditem->values[i] / scale;
}
}
@ -699,23 +699,24 @@ static UAVObjHandle get_current_pid_bank_handle()
StabilizationSettingsFlightModeMapOptions flightModeMap[STABILIZATIONSETTINGS_FLIGHTMODEMAP_NUMELEM];
StabilizationSettingsFlightModeMapGet(flightModeMap);
switch(flightModeMap[fm])
{
case STABILIZATIONSETTINGS_FLIGHTMODEMAP_BANK1:
return StabilizationSettingsBank1Handle();
case STABILIZATIONSETTINGS_FLIGHTMODEMAP_BANK2:
return StabilizationSettingsBank2Handle();
case STABILIZATIONSETTINGS_FLIGHTMODEMAP_BANK3:
return StabilizationSettingsBank3Handle();
switch (flightModeMap[fm]) {
case STABILIZATIONSETTINGS_FLIGHTMODEMAP_BANK1:
return StabilizationSettingsBank1Handle();
case STABILIZATIONSETTINGS_FLIGHTMODEMAP_BANK2:
return StabilizationSettingsBank2Handle();
case STABILIZATIONSETTINGS_FLIGHTMODEMAP_BANK3:
return StabilizationSettingsBank3Handle();
}
return 0;
}
static void msp_send_pid(struct msp_bridge *m)
{
m->current_pid_bank = get_current_pid_bank_handle();
StabilizationBankData bankData;
UAVObjGetData(m->current_pid_bank, &bankData);
@ -736,7 +737,7 @@ static void msp_send_pid(struct msp_bridge *m)
static void msp_set_pid(struct msp_bridge *m)
{
if(m->current_pid_bank == 0) {
if (m->current_pid_bank == 0) {
return;
}
@ -752,18 +753,18 @@ static void msp_set_pid(struct msp_bridge *m)
pid_msp2native(&m->cmd_data.piditems[PIDAYAW], (float *)&bankData.YawPI, 10, 2);
UAVObjSetData(m->current_pid_bank, &bankData);
bool needSave = true;
if(needSave) {
if (needSave) {
FlightStatusArmedOptions armed;
FlightStatusArmedGet(&armed);
if(armed == FLIGHTSTATUS_ARMED_DISARMED) {
if (armed == FLIGHTSTATUS_ARMED_DISARMED) {
UAVObjSave(m->current_pid_bank, 0);
}
}
msp_send(m, MSP_SET_PID, 0, 0); // send ack.
}
@ -806,10 +807,10 @@ static void msp_send_alarms(__attribute__((unused)) struct msp_bridge *m)
sizeof(data.alarm.msg), SYSTEMALARMS_ALARM_CRITICAL, &state); // Include only CRITICAL and ERROR
// NOTE: LP alarm severity levels and MSP levels do not match. ERROR and CRITICAL are swapped.
// So far, MW-OSD code (MSP consumer) does not make difference between ALARM_ERROR and ALARM_CRITICAL.
// ALARM_WARN should be blinking if thats the highest severity level at the moment.
// There might be other types of MSP consumers.
// So far, MW-OSD code (MSP consumer) does not make difference between ALARM_ERROR and ALARM_CRITICAL.
// ALARM_WARN should be blinking if thats the highest severity level at the moment.
// There might be other types of MSP consumers.
switch (state) {
case SYSTEMALARMS_ALARM_WARNING:
data.alarm.state = ALARM_WARN;

10
flight/pios/inc/pios_usb_defs.h
View File

@ -358,9 +358,9 @@ enum usb_product_ids {
USB_PRODUCT_ID_OPLINK = 0x415C,
USB_PRODUCT_ID_CC3D = 0x415D,
USB_PRODUCT_ID_REVOLUTION = 0x415E,
USB_PRODUCT_ID_SPARKY2 = 0x415E,
USB_PRODUCT_ID_OSD = 0x4194,
USB_PRODUCT_ID_SPARE = 0x4195,
USB_PRODUCT_ID_SPARKY2 = 0x415E,
USB_PRODUCT_ID_OSD = 0x4194,
USB_PRODUCT_ID_SPARE = 0x4195,
} __attribute__((packed));
enum usb_op_board_ids {
@ -369,8 +369,8 @@ enum usb_op_board_ids {
USB_OP_BOARD_ID_OPLINK = 3,
USB_OP_BOARD_ID_COPTERCONTROL = 4,
USB_OP_BOARD_ID_REVOLUTION = 5,
USB_OP_BOARD_ID_SPARKY2 = 5,
USB_OP_BOARD_ID_OSD = 6,
USB_OP_BOARD_ID_SPARKY2 = 5,
USB_OP_BOARD_ID_OSD = 6,
} __attribute__((packed));
enum usb_op_board_modes {

3
ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp
View File

@ -620,8 +620,9 @@ QSGNode *OSGViewport::updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNode
if (!node) {
node = QQuickFramebufferObject::updatePaintNode(node, nodeData);
QSGSimpleTextureNode *n = static_cast<QSGSimpleTextureNode *>(node);
if (n)
if (n) {
n->setTextureCoordinatesTransform(QSGSimpleTextureNode::MirrorVertically);
}
return node;
}
return QQuickFramebufferObject::updatePaintNode(node, nodeData);