Merge pull request Omega-Numworks#390 from quentinguidee/omega-hotfix

[apps/settings] remove LEDS_CHOICE

Makefile

@@ -40,7 +40,6 @@ info:
 	@echo "BUILD_DIR = $(BUILD_DIR)"
 	@echo "PLATFORM" = $(PLATFORM)
 	@echo "DEBUG" = $(DEBUG)
-	@echo "LEDS_CHOICE" = $(LEDS_CHOICE)
 	@echo "EPSILON_GETOPT" = $(EPSILON_GETOPT)
 	@echo "ESCHER_LOG_EVENTS_BINARY" = $(ESCHER_LOG_EVENTS_BINARY)
 	@echo "QUIZ_USE_CONSOLE" = $(QUIZ_USE_CONSOLE)

apps/apps_container.cpp

@@ -374,30 +374,7 @@ void AppsContainer::redrawWindow(bool force) {
 void AppsContainer::activateExamMode(GlobalPreferences::ExamMode examMode) {
   assert(examMode != GlobalPreferences::ExamMode::Off && examMode != GlobalPreferences::ExamMode::Unknown);
   reset();
-  Preferences * preferences = Preferences::sharedPreferences();
-  switch ((int)preferences->colorOfLED()) {
-    case 0:
-      Ion::LED::setColor(KDColorRed);
-      break;
-    case 1:
-      Ion::LED::setColor(KDColorWhite);
-      break;
-    case 2:
-      Ion::LED::setColor(KDColorGreen);
-      break;
-    case 3:
-      Ion::LED::setColor(KDColorBlue);
-      break;
-    case 4:
-      Ion::LED::setColor(KDColorYellow);
-      break;
-    case 5:
-      Ion::LED::setColor(KDColorPurple);
-      break;
-    case 6:
-      Ion::LED::setColor(KDColorOrange);
-      break;
-  }
+  Ion::LED::setColor(KDColorRed);
   /* The Dutch exam mode LED is supposed to be orange but we can only make
    * blink "pure" colors: with RGB leds on or off (as the PWM is used for
    * blinking). The closest "pure" color is Yellow. Moreover, Orange LED is

apps/exam_mode_configuration.h

@@ -8,11 +8,7 @@
 namespace ExamModeConfiguration {
 
 // Settings menu
-#if LEDS_CHOICE
-extern const Shared::SettingsMessageTree s_modelExamChildren[3];
-#else
 extern const Shared::SettingsMessageTree s_modelExamChildren[2];
-#endif
 int numberOfAvailableExamMode();
 GlobalPreferences::ExamMode examModeAtIndex(int index);
 I18n::Message examModeActivationMessage(int index);

apps/exam_mode_configuration_non_official.cpp

@@ -3,19 +3,10 @@
 using namespace Poincare;
 
 constexpr Shared::SettingsMessageTree s_examModeMode[] = {Shared::SettingsMessageTree(I18n::Message::ExamModeModeStandard), Shared::SettingsMessageTree(I18n::Message::ExamModeModeNoSym), Shared::SettingsMessageTree(I18n::Message::ExamModeModeNoSymNoText)};
-#if LEDS_CHOICE
-constexpr Shared::SettingsMessageTree s_ledColorChildren[] = {Shared::SettingsMessageTree(I18n::Message::ColorRed), Shared::SettingsMessageTree(I18n::Message::ColorWhite), Shared::SettingsMessageTree(I18n::Message::ColorGreen), Shared::SettingsMessageTree(I18n::Message::ColorBlue), Shared::SettingsMessageTree(I18n::Message::ColorYellow), Shared::SettingsMessageTree(I18n::Message::ColorPurple), Shared::SettingsMessageTree(I18n::Message::ColorOrange)};
-constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Shared::SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren), Shared::SettingsMessageTree(I18n::Message::ExamModeMode, s_examModeMode), Shared::SettingsMessageTree(I18n::Message::ActivateExamMode)};
-#else
 constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Shared::SettingsMessageTree(I18n::Message::ExamModeMode, s_examModeMode), Shared::SettingsMessageTree(I18n::Message::ActivateExamMode)};
-#endif
 
 int ExamModeConfiguration::numberOfAvailableExamMode() {
-#if LEDS_CHOICE
-  return 3;
-#else
   return 2;
-#endif
 }
 
 GlobalPreferences::ExamMode ExamModeConfiguration::examModeAtIndex(int index) {
@@ -38,24 +29,7 @@ I18n::Message ExamModeConfiguration::examModeActivationWarningMessage(GlobalPref
 
 KDColor ExamModeConfiguration::examModeColor(GlobalPreferences::ExamMode mode) {
   assert(mode == GlobalPreferences::ExamMode::Standard || mode == GlobalPreferences::ExamMode::NoSym || mode == GlobalPreferences::ExamMode::NoSymNoText);
-  Preferences * preferences = Preferences::sharedPreferences();
-
-  switch((int) preferences->colorOfLED()) {
-    case 1:
-      return KDColorWhite;
-    case 2:
-      return KDColorGreen;
-    case 3:
-      return KDColorBlue;
-    case 4:
-      return KDColorYellow;
-    case 5:
-      return KDColorPurple;
-    case 6:
-      return KDColorOrange;
-    default:
-      return KDColorRed;
-  }
+  return KDColorRed;
 }
 
 bool ExamModeConfiguration::appIsForbiddenInExamMode(App::Descriptor::ExaminationLevel appExaminationLevel, GlobalPreferences::ExamMode mode) {

apps/settings/sub_menu/exam_mode_controller.cpp

@@ -19,9 +19,6 @@ ExamModeController::ExamModeController(Responder * parentResponder) :
   m_cell{},
   m_ledController(this),
   m_examModeModeController(this),
-#if LEDS_CHOICE
-  m_ledColorCell(KDFont::LargeFont, KDFont::SmallFont),
-#endif
   m_examModeCell(KDFont::LargeFont, KDFont::SmallFont)
 {
   for (int i = 0; i < k_maxNumberOfCells; i++) {
@@ -38,14 +35,6 @@ bool ExamModeController::handleEvent(Ion::Events::Event event) {
       stack->push(&m_examModeModeController);
       return true;
     } 
-#if LEDS_CHOICE
-    else if (m_messageTreeModel->childAtIndex(selectedRow())->label() == I18n::Message::LEDColor) {
-      (&m_ledController)->setMessageTreeModel(m_messageTreeModel->childAtIndex(selectedRow()));
-      StackViewController * stack = stackController();
-      stack->push(&m_ledController);
-      return true;
-    }
-#endif
     else {
       AppsContainer::sharedAppsContainer()->displayExamModePopUp(examMode());
       return true;
@@ -79,11 +68,6 @@ int ExamModeController::numberOfRows() const {
 HighlightCell * ExamModeController::reusableCell(int index, int type) {
   assert(type == 0);
   assert(index >= 0  && index < 3);
-#if LEDS_CHOICE
-  if (m_messageTreeModel->childAtIndex(index)->label() == I18n::Message::LEDColor) {
-    return &m_ledColorCell;
-  }
-#endif
   if (m_messageTreeModel->childAtIndex(index)->label() == I18n::Message::ExamModeMode) {
     return &m_examModeCell;
   }
@@ -107,13 +91,6 @@ void ExamModeController::willDisplayCellForIndex(HighlightCell * cell, int index
     MessageTableCell * myCell = (MessageTableCell *)cell;
     myCell->setMessage(I18n::Message::ExamModeActive);
   }
-#if LEDS_CHOICE
-  if (thisLabel == I18n::Message::LEDColor) {
-    MessageTableCellWithChevronAndMessage * myTextCell = (MessageTableCellWithChevronAndMessage *)cell;
-    I18n::Message message = (I18n::Message) m_messageTreeModel->childAtIndex(index)->childAtIndex((int)preferences->colorOfLED())->label();
-    myTextCell->setSubtitle(message);
-  }
-#endif
   if (thisLabel == I18n::Message::ExamModeMode) {
     MessageTableCellWithChevronAndMessage * myTextCell = (MessageTableCellWithChevronAndMessage *)cell;
     I18n::Message message = (I18n::Message) m_messageTreeModel->childAtIndex(index)->childAtIndex((uint8_t)GlobalPreferences::sharedGlobalPreferences()->tempExamMode() - 1)->label();

apps/settings/sub_menu/exam_mode_controller.h

@@ -30,9 +30,6 @@ class ExamModeController : public GenericSubController {
   MessageTableCell m_cell[k_maxNumberOfCells];
   PreferencesController m_ledController;
   PreferencesController m_examModeModeController;
-#if LEDS_CHOICE
-  MessageTableCellWithChevronAndMessage m_ledColorCell;
-#endif
   MessageTableCellWithChevronAndMessage m_examModeCell;
 };
 

apps/settings/sub_menu/preferences_controller.cpp

@@ -107,43 +107,6 @@ Layout PreferencesController::layoutForPreferences(I18n::Message message) {
         );
     }
 
-    // LED placeholders
-    case I18n::Message::ColorRed:
-    {
-      const char * text = " ";
-      return LayoutHelper::String(text, strlen(text), k_layoutFont);
-    }
-    case I18n::Message::ColorWhite:
-    {
-      const char * text = " ";
-      return LayoutHelper::String(text, strlen(text), k_layoutFont);
-    }
-    case I18n::Message::ColorBlue:
-    {
-      const char * text = " ";
-      return LayoutHelper::String(text, strlen(text), k_layoutFont);
-    }
-    case I18n::Message::ColorGreen:
-    {
-      const char * text = " ";
-      return LayoutHelper::String(text, strlen(text), k_layoutFont);
-    }
-    case I18n::Message::ColorYellow:
-    {
-      const char * text = " ";
-      return LayoutHelper::String(text, strlen(text), k_layoutFont);
-    }
-    case I18n::Message::ColorPurple:
-    {
-      const char * text = " ";
-      return LayoutHelper::String(text, strlen(text), k_layoutFont);
-    }
-    case I18n::Message::ColorOrange:
-    {
-      const char * text = " ";
-      return LayoutHelper::String(text, strlen(text), k_layoutFont);
-    }
-
     // Exam mode modes
     case I18n::Message::ExamModeModeStandard:
     {
@@ -242,8 +205,6 @@ void PreferencesController::setPreferenceWithValueIndex(I18n::Message message, i
     preferences->setEditionMode((Preferences::EditionMode)valueIndex);
   } else if (message == I18n::Message::ComplexFormat) {
     preferences->setComplexFormat((Preferences::ComplexFormat)valueIndex);
-  } else if (message == I18n::Message::LEDColor) {
-    preferences->setColorOfLED((Preferences::LEDColor)valueIndex);
   } else if (message == I18n::Message::ExamModeMode) {
     GlobalPreferences::sharedGlobalPreferences()->setTempExamMode((GlobalPreferences::ExamMode)((uint8_t)valueIndex + 1));
   } else if (message == I18n::Message::SymbolMultiplication) {
@@ -269,11 +230,6 @@ int PreferencesController::valueIndexForPreference(I18n::Message message) const
   if (message == I18n::Message::ComplexFormat) {
     return (int)preferences->complexFormat();
   }
-#if LEDS_CHOICE
-  if (message == I18n::Message::LEDColor) {
-    return (int)preferences->colorOfLED();
-  }
-#endif
   if (message == I18n::Message::SymbolMultiplication) {
     return (int)preferences->symbolOfMultiplication();
   }

apps/shared.de.i18n

@@ -81,16 +81,8 @@ XStart = "X Startwert"
 Zoom = "Zoom"
 Developers = "Entwickler"
 BetaTesters = "Beta-Tester"
-LEDColor = "LED Farbe"
 ExamModeMode = "Modus"
 ExamModeModeStandard = "Standard "
 ExamModeModeNoSym = "Ohne Symbole "
 ExamModeModeNoSymNoText = "Ohne Symbole & Text "
 ExamModeModeDutch = "Niederländisch "
-ColorRed = "Rot "
-ColorWhite = "Weiss "
-ColorBlue = "Blau "
-ColorGreen = "Grün "
-ColorYellow = "Gelb "
-ColorPurple = "Lila "
-ColorOrange = "Orange "

apps/shared.en.i18n

@@ -81,16 +81,8 @@ XStart = "X start"
 Zoom = "Zoom"
 Developers = "Developers"
 BetaTesters = "Beta testers"
-LEDColor = "LED color"
 ExamModeMode = "Mode"
 ExamModeModeStandard = "Standard "
 ExamModeModeNoSym = "No sym "
 ExamModeModeNoSymNoText = "No sym no text "
 ExamModeModeDutch = "Dutch "
-ColorRed = "Red "
-ColorWhite = "White "
-ColorBlue = "Blue "
-ColorGreen = "Green "
-ColorYellow = "Yellow "
-ColorPurple = "Purple "
-ColorOrange = "Orange "

apps/shared.es.i18n

@@ -81,16 +81,8 @@ XStart = "X inicio"
 Zoom = "Zoom"
 Developers = "Desarrolladores"
 BetaTesters = "Probadores beta"
-LEDColor = "Color del LED"
 ExamModeMode = "Modo"
 ExamModeModeStandard = "Estándar "
 ExamModeModeNoSym = "Sin simbólico "
 ExamModeModeNoSymNoText = "sin simbolismo sin texto "
 ExamModeModeDutch = "Holandés "
-ColorRed = "Rojo "
-ColorWhite = "Blanco "
-ColorBlue = "Azul "
-ColorGreen = "Verde "
-ColorYellow = "Amarillo "
-ColorPurple = "Púrpura "
-ColorOrange = "Naranja "

apps/shared.fr.i18n

@@ -81,16 +81,8 @@ XStart = "X début"
 Zoom = "Zoom"
 Developers = "Développeurs"
 BetaTesters = "Beta testeurs"
-LEDColor = "Couleur LED"
 ExamModeMode = "Mode"
 ExamModeModeStandard = "Standard "
 ExamModeModeNoSym = "Sans symbolique "
 ExamModeModeNoSymNoText = "Sans symbolique ni texte "
 ExamModeModeDutch = "Néerlandais "
-ColorRed = "Rouge "
-ColorWhite = "Blanc "
-ColorBlue = "Bleu "
-ColorGreen = "Vert "
-ColorYellow = "Jaune "
-ColorPurple = "Mauve "
-ColorOrange = "Orange "

apps/shared.hu.i18n

@@ -81,16 +81,8 @@ XStart = "X kezdete"
 Zoom = "Zoom"
 Developers = "Fejlesztök"
 BetaTesters = "Béta tesztelök"
-LEDColor = "LED szín"
 ExamModeMode = "Üzemmód"
 ExamModeModeStandard = "Normál"
 ExamModeModeNoSym = "Nincs sym"
 ExamModeModeNoSymNoText = "Nincs szimbolikus, nincs szöveg "
 ExamModeModeDutch = "Holland "
-ColorRed = "Piros "
-ColorWhite = "Fehér "
-ColorBlue = "Kék "
-ColorGreen = "Zöld "
-ColorYellow = "Sárga "
-ColorPurple = "Lila "
-ColorOrange = "Narancssárga "

apps/shared.it.i18n

@@ -81,16 +81,8 @@ XStart = "X iniziale"
 Zoom = "Zoom"
 Developers = "Developers"
 BetaTesters = "Beta testers"
-LEDColor = "LED color"
 ExamModeMode = "Mode"
 ExamModeModeStandard = "Standard "
 ExamModeModeNoSym = "No sym "
 ExamModeModeNoSymNoText = "No sym no text "
 ExamModeModeDutch = "Dutch "
-ColorRed = "Red "
-ColorWhite = "White "
-ColorBlue = "Blue "
-ColorGreen = "Green "
-ColorYellow = "Yellow "
-ColorPurple = "Purple "
-ColorOrange = "Orange "

apps/shared.nl.i18n

@@ -81,16 +81,8 @@ XStart = "X begin"
 Zoom = "Zoom"
 Developers = "Developers"
 BetaTesters = "Beta testers"
-LEDColor = "LED color"
 ExamModeMode = "Mode"
 ExamModeModeStandard = "Standard "
 ExamModeModeNoSym = "No sym "
 ExamModeModeNoSymNoText = "No sym no text "
 ExamModeModeDutch = "Dutch "
-ColorRed = "Red "
-ColorWhite = "White "
-ColorBlue = "Blue "
-ColorGreen = "Green "
-ColorYellow = "Yellow "
-ColorPurple = "Purple "
-ColorOrange = "Orange "

apps/shared.pt.i18n

@@ -81,16 +81,8 @@ XStart = "X início"
 Zoom = "Zoom"
 Developers = "Desenvolvedores"
 BetaTesters = "Testadores beta"
-LEDColor = "Cor LED"
 ExamModeMode = "Modo"
 ExamModeModeStandard = "Padrão "
 ExamModeModeNoSym = "Sem simbólico "
 ExamModeModeNoSymNoText = "Sem simbólico sem texto "
 ExamModeModeDutch = "Holandês "
-ColorRed = "Vermelho "
-ColorWhite = "Branco "
-ColorBlue = "Azul "
-ColorGreen = "Verde "
-ColorYellow = "Amarelo "
-ColorPurple = "Roxo "
-ColorOrange = "Caranja "

build/config.mak

@@ -14,4 +14,3 @@ EPSILON_TELEMETRY ?= 0
 ESCHER_LOG_EVENTS_BINARY ?= 0
 THEME_NAME ?= omega_light
 THEME_REPO ?= local
-LEDS_CHOICE ?= 0

build/defaults.mak

@@ -2,7 +2,6 @@ HOSTCC = gcc
 HOSTCXX = g++
 PYTHON = python3
 
-SFLAGS += -DLEDS_CHOICE=$(LEDS_CHOICE)
 ifdef USERNAME
   SFLAGS += -DUSERNAME="$(USERNAME)"
 endif