4 files changed, 29 insertions, 1 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index 66aa2d7c6c..a04000a426 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -522,6 +522,14 @@ void backlight_off(void)
     queue_post(&backlight_queue, BACKLIGHT_OFF, NULL);
 }
 
+bool is_backlight_on(void)
+{
+    if (backlight_timer || !backlight_get_current_timeout())
+        return true;
+    else
+        return false;
+}
+
 /* return value in ticks; 0 means always on, <0 means always off */
 int backlight_get_current_timeout(void)
 {
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index dbdb171bf2..9e649ead5a 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -52,6 +52,9 @@ static long last_read; /* Last button status, for debouncing/filtering */
 #ifdef HAVE_LCD_BITMAP
 static bool flipped;  /* buttons can be flipped to match the LCD flip */
 #endif
+#ifdef CONFIG_BACKLIGHT
+static bool filter_first_keypress;
+#endif
 
 /* how often we check to see if a button is pressed */
 #define POLL_FREQUENCY    HZ/100
@@ -504,7 +507,10 @@ static void button_tick(void)
                     }
                     else
                     {
-                        queue_post(&button_queue, btn, NULL);
+#ifdef CONFIG_BACKLIGHT
+                        if ( !filter_first_keypress || is_backlight_on())
+#endif
+                            queue_post(&button_queue, btn, NULL);
                         post = false;
                     }
 #ifdef HAVE_REMOTE_LCD
@@ -629,6 +635,9 @@ void button_init(void)
 #ifdef HAVE_LCD_BITMAP
     flipped = false;
 #endif
+#ifdef CONFIG_BACKLIGHT
+    filter_first_keypress = false;
+#endif
 }
 
 #ifdef HAVE_LCD_BITMAP /* only bitmap displays can be flipped */
@@ -687,6 +696,13 @@ void button_set_flip(bool flip)
 }
 #endif /* HAVE_LCD_BITMAP */
 
+#ifdef CONFIG_BACKLIGHT
+void set_backlight_filter_keypress(bool value)
+{
+    filter_first_keypress = value;
+}
+#endif
+
 /*
  Archos hardware button hookup
  =============================
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index e182803898..f371dc1423 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+bool is_backlight_on(void);
 void backlight_on(void);
 void backlight_off(void);
 void backlight_set_timeout(int index);
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 02d91d6a9b..a142540511 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -42,6 +42,9 @@ void button_clear_queue(void);
 #ifdef HAVE_LCD_BITMAP
 void button_set_flip(bool flip); /* turn 180 degrees */
 #endif
+#ifdef CONFIG_BACKLIGHT
+void set_backlight_filter_keypress(bool value);
+#endif
 
 #ifdef HAS_BUTTON_HOLD
 bool button_hold(void);