Merge from origin

2021-03-14 19:42:57 -07:00
parent 8505a0f260 8f5251583f
commit c62863b1dc
134 changed files with 5901 additions and 1456 deletions
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -120,7 +120,7 @@ class AnalogBatteryLevel : public HasBatteryLevel

    /// If we see a battery voltage higher than physics allows - assume charger is pumping
    /// in power
-    virtual bool isVBUSPlug() { return getBattVoltage() > chargingVolt; }
+    virtual bool isVBUSPlug() { return getBattVoltage() > 1000 * chargingVolt; }

    /// Assume charging if we have a battery and external power is connected.
    /// we can't be smart enough to say 'full'?