enable keylock for Sony NWZ-E370/E380

enable keylock in WPS and FMS by simultaniously pressing POWER and BACK.
It was necessary to change the ACTION_FM_EXIT from BUTTON_BACK-button-press-event to
BUTTON_BACK|BUTTON_REL-event and BUTTON_BACK|BUTTON_REPEAT-event to easily be able
to press BUTTON_POWER|BUTTON_BACK without accidentally triggering ACTION_FM_EXIT.

also rebase to current master and add myself to docs/CREDITS

Change-Id: I263a034d0d8fd047d39265e3598ae7936dd8133d
This commit is contained in:
Johannes König 2020-03-01 12:32:47 +01:00
parent 8d2d6f4ca5
commit 91739d124e
2 changed files with 6 additions and 1 deletions

View file

@ -57,6 +57,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_QUICKSCREEN, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_WPS_QUICKSCREEN, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_WPS_CONTEXT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_CONTEXT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_BACK, BUTTON_NONE },
{ ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
{ ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
@ -153,7 +154,10 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
{ ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_FM_EXIT, BUTTON_BACK, BUTTON_NONE }, { ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_BACK, BUTTON_NONE },
{ ACTION_FM_EXIT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK },
{ ACTION_FM_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE },
/* only compiled if there is a Volume UP button defined */ /* only compiled if there is a Volume UP button defined */
#ifdef BUTTON_VOL_UP #ifdef BUTTON_VOL_UP

View file

@ -686,6 +686,7 @@ Martin Buck
Stefan Ott Stefan Ott
David Chionne David Chionne
Wilfried Winkler Wilfried Winkler
Johannes König
The libmad team The libmad team
The wavpack team The wavpack team