devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

xduoo_x3ii: Improvements in the meymappings!

Browse source 
* PREV/NEXT now swapped so they do what is expected in most contexts
 * List and setting context retains prior behavior
 * Enable the ADC that reads the headset remote and map the keys.
 * As ADC-based remote "events" arrive as press/release pairs,
   delay the button release.

Change-Id: I22d4eac3bfe1573b50eca795cf377bdafdeb5336
This commit is contained in:
Solomon Peachy 2021-03-10 19:03:00 -05:00
parent a87abdb28f
commit 87e37a4d48
6 changed files with 68 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

40
firmware/target/hosted/button-devinput.c
View file

@ -19,7 +19,6 @@
* KIND, either express or implied.
*
****************************************************************************/
#include <poll.h>
#include <errno.h>
#include <unistd.h>
@ -72,6 +71,11 @@ void button_close_device(void)
num_devices = 0;
}
#ifdef BUTTON_DELAY_RELEASE
static int button_delay_release = 0;
static int delay_tick = 0;
#endif
int button_read_device(void)
{
static int button_bitmap = 0;
@ -81,6 +85,15 @@ int button_read_device(void)
int wheel_ticks = 0;
#endif
#ifdef BUTTON_DELAY_RELEASE
/* First de-assert delayed-release buttons */
if (button_delay_release && current_tick >= delay_tick)
{
button_bitmap &= ~button_delay_release;
button_delay_release = 0;
}
#endif
/* check if there are any events pending and process them */
while(poll(poll_fds, num_devices, 0))
{
@ -92,17 +105,14 @@ int button_read_device(void)
int size = read(poll_fds[i].fd, &event, sizeof(event));
if(size == (int)sizeof(event))
{
int keycode = event.code;
/* map linux event code to rockbox button bitmap */
int bmap = button_map(event.code);
/* event.value == 0x10000 means press
* event.value == 0 means release
*/
bool press = event.value ? true : false;
/* map linux event code to rockbox button bitmap */
if(press)
if(event.value)
{
int bmap = button_map(keycode);
#ifdef HAVE_SCROLLWHEEL
/* Filter out wheel ticks */
if (bmap & BUTTON_SCROLL_BACK)
@ -110,19 +120,29 @@ int button_read_device(void)
else if (bmap & BUTTON_SCROLL_FWD)
wheel_ticks++;
bmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
#endif
#ifdef BUTTON_DELAY_RELEASE
bmap &= ~BUTTON_DELAY_RELEASE;
#endif
button_bitmap |= bmap;
}
else
{
int bmap = button_map(keycode);
#ifdef BUTTON_DELAY_RELEASE
/* Delay the release of any requested buttons */
if (bmap & BUTTON_DELAY_RELEASE)
{
button_delay_release |= bmap & ~BUTTON_DELAY_RELEASE;
delay_tick = current_tick + HZ/20;
bmap = 0;
}
#endif
#ifdef HAVE_SCROLLWHEEL
/* Wheel gives us press+release back to back; ignore the release */
bmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
#endif
button_bitmap &= ~bmap;
}
}
}