Browse Source

Fixed Compiler Error C2864 - only static const integral data members can be initialized within a class

QGC4.4
PDSantos 12 years ago
parent
commit
57fc4421e7
  1. 5
      src/uas/UAS.cc
  2. 4
      src/uas/UAS.h

5
src/uas/UAS.cc

@ -38,6 +38,11 @@ @@ -38,6 +38,11 @@
* as the previous one created unless one calls deleteSettings in the code after
* creating the UAS.
*/
const float UAS::lipoFull = 4.2f; ///< 100% charged voltage
const float UAS::lipoEmpty = 3.5f; ///< Discharged voltage
UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
uasId(id),
links(new QList<LinkInterface*>()),

4
src/uas/UAS.h

@ -56,8 +56,8 @@ public: @@ -56,8 +56,8 @@ public:
UAS(MAVLinkProtocol* protocol, int id = 0);
~UAS();
static const float lipoFull = 4.2f; ///< 100% charged voltage
static const float lipoEmpty = 3.5f; ///< Discharged voltage
static const float lipoFull; ///< 100% charged voltage
static const float lipoEmpty; ///< Discharged voltage
/* MANAGEMENT */

Loading…
Cancel
Save