rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/laurent/OP-1362_make_ts_errors' into next

Browse Source
This commit is contained in:
Fredrik Larson 2014-08-29 06:53:43 +10:00
commit ed85e026b1
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/qssp.cpp
View File

@ -21,7 +21,7 @@
// Make larger sized integers from smaller sized integers
#define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb))
#define MAKEWORD32(uw, lw) ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw)))
#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))
#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)))
// Used to extract smaller integers from larger sized intergers

2
ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/ssp.cpp
View File

@ -91,7 +91,7 @@
// Make larger sized integers from smaller sized integers
#define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb))
#define MAKEWORD32(uw, lw) ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw)))
#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))
#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)))
// Used to extract smaller integers from larger sized intergers

2
ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry.cpp
View File

@ -147,7 +147,7 @@ template<typename Scalar> void geometry(void)
t1.setIdentity();
t1.linear() = q1.toRotationMatrix();
v0 << 50, 2, 1;//= ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
v0 << 50, 2, 1; // = ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
t0.scale(v0);
t1.prescale(v0);

2
ground/openpilotgcs/src/libs/eigen/test/eigen2/eigen2_geometry_with_eigen2_prefix.cpp
View File

@ -149,7 +149,7 @@ template<typename Scalar> void geometry(void)
t1.setIdentity();
t1.linear() = q1.toRotationMatrix();
v0 << 50, 2, 1;//= ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
v0 << 50, 2, 1; // = ei_random_matrix<Vector3>().cwiseProduct(Vector3(10,2,0.5));
t0.scale(v0);
t1.prescale(v0);

6
ground/openpilotgcs/src/libs/utils/filesearch.cpp
View File

@ -45,7 +45,7 @@ static inline QString msgCanceled(const QString &searchTerm, int numMatches, int
{
return QCoreApplication::translate("Utils::FileSearch",
"%1: canceled. %n occurrences found in %2 files.",
0, numMatches).
NULL, numMatches).
arg(searchTerm).arg(numFilesSearched);
}
@ -53,7 +53,7 @@ static inline QString msgFound(const QString &searchTerm, int numMatches, int nu
{
return QCoreApplication::translate("Utils::FileSearch",
"%1: %n occurrences found in %2 files.",
0, numMatches).
NULL, numMatches).
arg(searchTerm).arg(numFilesSearched);
}
@ -61,7 +61,7 @@ static inline QString msgFound(const QString &searchTerm, int numMatches, int nu
{
return QCoreApplication::translate("Utils::FileSearch",
"%1: %n occurrences found in %2 of %3 files.",
0, numMatches).
NULL, numMatches).
arg(searchTerm).arg(numFilesSearched).arg(filesSize);
}

1
ground/openpilotgcs/src/libs/utils/xmlconfig.h
View File

@ -38,6 +38,7 @@
#include <QObject>
class XMLCONFIG_EXPORT XmlConfig : QObject {
Q_OBJECT
public:
static const QSettings::Format XmlSettingsFormat;

2
ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp
View File

@ -47,7 +47,7 @@
// Make larger sized integers from smaller sized integers
#define MAKEWORD16(ub, lb) ((uint16_t)0x0000 | ((uint16_t)(ub) << 8) | (uint16_t)(lb))
#define MAKEWORD32(uw, lw) ((uint32_t)(0x0UL | ((uint32_t)(uw) << 16) | (uint32_t)(lw)))
#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0))
#define MAKEWORD32B(b3, b2, b1, b0) ((uint32_t)((uint32_t)(b3) << 24) | ((uint32_t)(b2) << 16) | ((uint32_t)(b1) << 8) | ((uint32_t)(b0)))
// Used to extract smaller integers from larger sized intergers