Commit 57fc4421 authored by PDSantos's avatar PDSantos

Fixed Compiler Error C2864 - only static const integral data members can be...

Fixed Compiler Error C2864 - only static const integral data members can be initialized within a class
parent 066ce669
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
* as the previous one created unless one calls deleteSettings in the code after * as the previous one created unless one calls deleteSettings in the code after
* creating the UAS. * 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(), UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
uasId(id), uasId(id),
links(new QList<LinkInterface*>()), links(new QList<LinkInterface*>()),
......
...@@ -56,8 +56,8 @@ public: ...@@ -56,8 +56,8 @@ public:
UAS(MAVLinkProtocol* protocol, int id = 0); UAS(MAVLinkProtocol* protocol, int id = 0);
~UAS(); ~UAS();
static const float lipoFull = 4.2f; ///< 100% charged voltage static const float lipoFull; ///< 100% charged voltage
static const float lipoEmpty = 3.5f; ///< Discharged voltage static const float lipoEmpty; ///< Discharged voltage
/* MANAGEMENT */ /* MANAGEMENT */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment