Merge branch 'omega-dev' of github.com:Omega-Numworks/Omega into omega-dev

This commit is contained in:
Quentin Guidée
2020-01-12 01:47:15 +01:00

View File

@@ -1,15 +1,14 @@
#include <ion/led.h>
#include <ion/battery.h>
#include <ion/usb.h>
#include <apps/global_preferences.h>
#include <ion/exam_mode.h>
namespace Ion {
namespace LED {
KDColor updateColorWithPlugAndCharge() {
KDColor ledColor = getColor();
if (!GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) { // If exam mode is on, we do not update the LED with the plugged/charging state
if (ExamMode::FetchExamMode() == 0) { // If exam mode is on, we do not update the LED with the plugged/charging state
if (USB::isPlugged()) {
ledColor = Battery::isCharging() ? KDColorOrange : KDColorGreen;
} else {