summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/target/arm/as3525/scrollwheel-as3525.c2
-rw-r--r--firmware/target/hosted/sdl/button-sdl.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/firmware/target/arm/as3525/scrollwheel-as3525.c b/firmware/target/arm/as3525/scrollwheel-as3525.c
index d67e097ae8..c66f8e091a 100644
--- a/firmware/target/arm/as3525/scrollwheel-as3525.c
+++ b/firmware/target/arm/as3525/scrollwheel-as3525.c
@@ -23,6 +23,7 @@
23#include "button.h" 23#include "button.h"
24#include "kernel.h" 24#include "kernel.h"
25#include "backlight.h" 25#include "backlight.h"
26#include "powermgmt.h"
26 27
27void scrollwheel(unsigned int wheel_value) 28void scrollwheel(unsigned int wheel_value)
28{ 29{
@@ -108,6 +109,7 @@ void scrollwheel(unsigned int wheel_value)
108 { 109 {
109 buttonlight_on(); 110 buttonlight_on();
110 backlight_on(); 111 backlight_on();
112 reset_poweroff_timer();
111 queue_post(&button_queue, btn, ((wheel_delta+1)<<24)); 113 queue_post(&button_queue, btn, ((wheel_delta+1)<<24));
112 /* message posted - reset count and remember post */ 114 /* message posted - reset count and remember post */
113 counter = 0; 115 counter = 0;
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 3d6a3797cf..ca1f2e5eb1 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -33,6 +33,7 @@
33#include "sim_tasks.h" 33#include "sim_tasks.h"
34#include "buttonmap.h" 34#include "buttonmap.h"
35#include "debug.h" 35#include "debug.h"
36#include "powermgmt.h"
36 37
37#ifdef HAVE_TOUCHSCREEN 38#ifdef HAVE_TOUCHSCREEN
38#include "touchscreen.h" 39#include "touchscreen.h"
@@ -418,6 +419,7 @@ static void button_event(int key, bool pressed)
418#ifdef HAVE_BUTTON_LIGHT 419#ifdef HAVE_BUTTON_LIGHT
419 buttonlight_on(); 420 buttonlight_on();
420#endif 421#endif
422 reset_poweroff_timer();
421 queue_post(&button_queue, new_btn, 1<<24); 423 queue_post(&button_queue, new_btn, 1<<24);
422 new_btn &= ~(BUTTON_SCROLL_FWD | BUTTON_SCROLL_BACK); 424 new_btn &= ~(BUTTON_SCROLL_FWD | BUTTON_SCROLL_BACK);
423 } 425 }