added message, changed UI
This commit is contained in:
@@ -96,12 +96,11 @@ void Battery::SaadcEventHandler(nrfx_saadc_evt_t const* p_event) {
|
||||
lastPercentRemaining = percentRemaining;
|
||||
percentRemaining = newPercent;
|
||||
systemTask->PushMessage(System::Messages::BatteryPercentageUpdated);
|
||||
}
|
||||
|
||||
// warn at 20% battery (wrt. rescaling above)
|
||||
constexpr uint8_t lowBatteryThreshold {20};
|
||||
if (!isPowerPresent && lastPercentRemaining >= lowBatteryThreshold && percentRemaining < lowBatteryThreshold) {
|
||||
systemTask->PushMessage(System::Messages::LowBattery);
|
||||
// warn at 20% battery (wrt. rescaling above)
|
||||
if (!isPowerPresent && BatteryIsLow() && lastPercentRemaining > lowBatteryThreshold) {
|
||||
systemTask->PushMessage(System::Messages::LowBattery);
|
||||
}
|
||||
}
|
||||
|
||||
nrfx_saadc_uninit();
|
||||
|
@@ -17,6 +17,9 @@ namespace Pinetime {
|
||||
uint8_t PercentRemaining() const {
|
||||
return percentRemaining;
|
||||
}
|
||||
bool BatteryIsLow() const {
|
||||
return percentRemaining <= lowBatteryThreshold;
|
||||
}
|
||||
|
||||
uint16_t Voltage() const {
|
||||
return voltage;
|
||||
@@ -51,6 +54,8 @@ namespace Pinetime {
|
||||
void SaadcEventHandler(nrfx_saadc_evt_t const* p_event);
|
||||
static void AdcCallbackStatic(nrfx_saadc_evt_t const* event);
|
||||
|
||||
static constexpr uint8_t lowBatteryThreshold {20};
|
||||
|
||||
bool isReading = false;
|
||||
|
||||
Pinetime::System::SystemTask* systemTask = nullptr;
|
||||
|
Reference in New Issue
Block a user