added rpi3 overclock support

rockaddicted · Mar 12, 2016 · 8ec52cb · 8ec52cb
1 parent 7bc9e67
commit 8ec52cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,3 +13,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Multithreaded list loading and writing
 - Added favorite system
 - Switched a and b buttons functions
+- Added support for RPI3 overclock (only none)
diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
@@ -175,12 +175,12 @@ GuiMenu::GuiMenu(Window *window) : GuiComponent(window), mMenu(window, _("MAIN M
                      overclock_choice->add(_("TURBO (1000Mhz)"), "turbo", currentOverclock == "turbo");
                      overclock_choice->add(_("HIGH (950Mhz)"), "high", currentOverclock == "high");
                      overclock_choice->add(_("NONE (700Mhz)"), "none", currentOverclock == "none");
-#else
+#else if RPI_VERSION == 2
                      std::string currentOverclock = Settings::getInstance()->getString("Overclock");
                      overclock_choice->add(_("EXTREM (1100Mhz)"), "rpi2-extrem", currentOverclock == "rpi2-extrem");
                      overclock_choice->add(_("TURBO (1050Mhz)+"), "rpi2-turbo", currentOverclock == "rpi2-turbo");
                      overclock_choice->add(_("HIGH (1050Mhz)"), "rpi2-high", currentOverclock == "rpi2-high");
-                     overclock_choice->add(_("NONE (900Mhz)"), "none-rpi2", currentOverclock == "none-rpi2");
+                     overclock_choice->add(_("NONE (900Mhz)"), "none", currentOverclock == "none");
 #endif
 #else
                      overclock_choice->add(_("NONE"), "none", true);

diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
@@ -87,15 +87,7 @@ void Settings::setDefaults() {
     mStringMap["INPUT P2"] = "DEFAULT";
     mStringMap["INPUT P3"] = "DEFAULT";
     mStringMap["INPUT P4"] = "DEFAULT";
-#ifdef RPI_VERSION
-    #if RPI_VERSION == 2
-        mStringMap["Overclock"] = "none-rpi2";
-    #else
-        mStringMap["Overclock"] = "none";
-    #endif
-#else
     mStringMap["Overclock"] = "none";
-#endif
     mStringMap["UpdateCommand"] = "/recalbox/scripts/recalbox-upgrade.sh";
     mStringMap["UpdateServer"] = "recalbox.com";
     mStringMap["VersionFile"] = "/recalbox/recalbox.version";