5 files changed, 146 insertions, 1 deletions

diff --git a/apps/features.txt b/apps/features.txt
index 3c0b0a3856..39c8422fbd 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -288,3 +288,7 @@ play_frequency
 #if defined(HAVE_BOOTDATA)
 boot_data
 #endif
+
+#if defined(CONFIG_POWER_SAVING)
+sys_powersaving
+#endif
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index d4e0697667..fa1b5f2c27 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -13647,3 +13647,54 @@
     *: "Disable Touch"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_POWER_SAVING_MENU
+  desc: system clock and voltage settings
+  user: core
+  <source>
+    *: none
+    sys_powersaving: "Power Saving"
+  </source>
+  <dest>
+    *: none
+    sys_powersaving: "Power Saving"
+  </dest>
+  <voice>
+    *: none
+    sys_powersaving: "Power Saving"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CPU
+  desc: system clock and voltage settings
+  user: core
+  <source>
+    *: none
+    sys_powersaving: "CPU"
+  </source>
+  <dest>
+     *: none
+    sys_powersaving: "CPU"
+  </dest>
+  <voice>
+    *: none
+    sys_powersaving: "CPU"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_I2C
+  desc: system clock and voltage settings
+  user: core
+  <source>
+    *: none
+    sys_powersaving: "I2C"
+  </source>
+  <dest>
+     *: none
+    sys_powersaving: "I2C"
+  </dest>
+  <voice>
+    *: none
+    sys_powersaving: "I2C"
+  </voice>
+</phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 5c99cb4cd4..f23f01d4dc 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -295,6 +295,36 @@ MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON,
          );
 #endif
 
+#ifdef CONFIG_POWER_SAVING
+#if (CONFIG_POWER_SAVING & POWERSV_CPU)
+MENUITEM_SETTING(cpu_powersave, &global_settings.cpu_powersave, NULL);
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_DISK)
+MENUITEM_SETTING(disk_powersave, &global_settings.disk_powersave, NULL);
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_I2C)
+MENUITEM_SETTING(i2c_powersave, &global_settings.i2c_powersave, NULL);
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_DISP)
+MENUITEM_SETTING(disp_powersave, &global_settings.disp_powersave, NULL);
+#endif
+
+MAKE_MENU(power_save_menu, ID2P(LANG_POWER_SAVING_MENU), 0, Icon_NOICON,
+#if (CONFIG_POWER_SAVING & POWERSV_CPU)
+        &cpu_powersave,
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_DISK)
+        &disk_powersave,
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_I2C)
+        &i2c_powersave,
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_DISP)
+        &disp_powersave,
+#endif
+         );
+#endif /* ifdef CONFIG_POWER_SAVING */
+
 /* Limits menu */
 MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL);
 MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL);
@@ -412,6 +442,11 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
             &disk_menu,
 #endif
             &limits_menu,
+
+#if defined(CONFIG_POWER_SAVING)
+            &power_save_menu,
+#endif
+
 #ifdef HAVE_QUICKSCREEN
             &shortcuts_replaces_quickscreen,
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 71233d904a..411675153a 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -860,6 +860,25 @@ struct user_settings
     int governor;
     int usb_mode;
 #endif
+
+#ifdef CONFIG_POWER_SAVING
+#if (CONFIG_POWER_SAVING & POWERSV_CPU)
+    bool cpu_powersave;
+#endif
+
+#if (CONFIG_POWER_SAVING & POWERSV_DISK)
+    bool disk_powersave;
+#endif
+
+#if (CONFIG_POWER_SAVING & POWERSV_I2C)
+    bool i2c_powersave;
+#endif
+
+#if (CONFIG_POWER_SAVING & POWERSV_DISP)
+    bool disp_powersave;
+#endif
+#endif /*defined(CONFIG_POWER_SAVING)*/
+
 };
 
 /** global variables **/
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 57763d345a..fe280b0ff6 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -2246,7 +2246,43 @@ const struct settings_list settings[] = {
                    ID2P(LANG_IBASSO_USB_MODE_CHARGE),
                    ID2P(LANG_IBASSO_USB_MODE_ADB)),
 #endif
-};
+
+#ifdef CONFIG_POWER_SAVING
+#if (CONFIG_POWER_SAVING & POWERSV_CPU)
+    OFFON_SETTING(0,
+                  cpu_powersave,
+                  LANG_CPU,
+                  false,
+                  "cpu powersave",
+                  cpu_set_powersave),
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_DISK)
+    OFFON_SETTING(0,
+                  disk_powersave,
+                  LANG_DISK_MENU,
+                  false,
+                  "disk powersave",
+                  disk_set_powersave),
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_DISP)
+    OFFON_SETTING(0,
+                  disp_powersave,
+                  LANG_DISPLAY,
+                  false,
+                  "disp powersave",
+                  disp_set_powersave),
+#endif
+#if (CONFIG_POWER_SAVING & POWERSV_I2C)
+    OFFON_SETTING(0,
+                  i2c_powersave,
+                  LANG_I2C,
+                  false,
+                  "i2c powersave",
+                  i2c_set_powersave),
+#endif
+#endif /*defined(CONFIG_POWER_SAVING)*/
+
+};/*struct settings_list settings*/
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);