Merge pull request #344 from geeksville/master

lora32 again
This commit is contained in:
Kevin Hester 2020-08-27 14:56:18 -07:00 committed by GitHub
commit a5341d766e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -38,7 +38,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
float v = getBattVoltage() / 1000; float v = getBattVoltage() / 1000;
if (v < 2.1) if (v < 2.1)
return -1; return -1; // If voltage is super low assume no battery installed
return 100 * (v - 3.27) / (4.2 - 3.27); return 100 * (v - 3.27) / (4.2 - 3.27);
} }
@ -59,7 +59,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
/** /**
* return true if there is a battery installed in this unit * return true if there is a battery installed in this unit
*/ */
virtual bool isBatteryConnect() { return true; } virtual bool isBatteryConnect() { return getBattVoltage() != -1; }
} analogLevel; } analogLevel;
bool Power::analogInit() bool Power::analogInit()