Browse Source

Made lipoFull and lipoEmpty potentially configurable

QGC4.4
Lorenz Meier 12 years ago
parent
commit
34da19cfc8
  1. 10
      src/uas/UAS.cc
  2. 4
      src/uas/UAS.h

10
src/uas/UAS.cc

@ -39,11 +39,9 @@ @@ -39,11 +39,9 @@
* 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(),
lipoFull(4.2f),
lipoEmpty(3.5f),
uasId(id),
links(new QList<LinkInterface*>()),
unknownPackets(),
@ -3462,8 +3460,8 @@ void UAS::setBattery(BatteryType type, int cells) @@ -3462,8 +3460,8 @@ void UAS::setBattery(BatteryType type, int cells)
case LIION:
break;
case LIPOLY:
fullVoltage = this->cells * UAS::lipoFull;
emptyVoltage = this->cells * UAS::lipoEmpty;
fullVoltage = this->cells * lipoFull;
emptyVoltage = this->cells * lipoEmpty;
break;
case LIFE:
break;

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; ///< 100% charged voltage
static const float lipoEmpty; ///< Discharged voltage
float lipoFull; ///< 100% charged voltage
float lipoEmpty; ///< Discharged voltage
/* MANAGEMENT */

Loading…
Cancel
Save