diff options
Diffstat (limited to 'apps/plugins/chessclock.c')
-rw-r--r-- | apps/plugins/chessclock.c | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index aee9c9f8e7..27b3990b8b 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -366,27 +366,7 @@ | |||
366 | #define CHC_SETTINGS_CANCEL BUTTON_RIGHT | 366 | #define CHC_SETTINGS_CANCEL BUTTON_RIGHT |
367 | #define CHC_SETTINGS_OK (BUTTON_SELECT|BUTTON_REPEAT) | 367 | #define CHC_SETTINGS_OK (BUTTON_SELECT|BUTTON_REPEAT) |
368 | 368 | ||
369 | #elif CONFIG_KEYPAD == XDUOO_X3_PAD | 369 | #elif (CONFIG_KEYPAD == XDUOO_X3_PAD) || (CONFIG_KEYPAD == XDUOO_X3II_PAD) || (CONFIG_KEYPAD == XDUOO_X20_PAD) |
370 | #define CHC_QUIT BUTTON_POWER | ||
371 | #define CHC_STARTSTOP BUTTON_PLAY | ||
372 | #define CHC_RESET BUTTON_OPTION | ||
373 | #define CHC_MENU BUTTON_HOME | ||
374 | #define CHC_SETTINGS_INC BUTTON_NEXT | ||
375 | #define CHC_SETTINGS_DEC BUTTON_PREV | ||
376 | #define CHC_SETTINGS_OK BUTTON_PLAY | ||
377 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | ||
378 | |||
379 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD | ||
380 | #define CHC_QUIT BUTTON_POWER | ||
381 | #define CHC_STARTSTOP BUTTON_PLAY | ||
382 | #define CHC_RESET BUTTON_OPTION | ||
383 | #define CHC_MENU BUTTON_HOME | ||
384 | #define CHC_SETTINGS_INC BUTTON_NEXT | ||
385 | #define CHC_SETTINGS_DEC BUTTON_PREV | ||
386 | #define CHC_SETTINGS_OK BUTTON_PLAY | ||
387 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | ||
388 | |||
389 | #elif CONFIG_KEYPAD == XDUOO_X20_PAD | ||
390 | #define CHC_QUIT BUTTON_POWER | 370 | #define CHC_QUIT BUTTON_POWER |
391 | #define CHC_STARTSTOP BUTTON_PLAY | 371 | #define CHC_STARTSTOP BUTTON_PLAY |
392 | #define CHC_RESET BUTTON_OPTION | 372 | #define CHC_RESET BUTTON_OPTION |
@@ -406,7 +386,7 @@ | |||
406 | #define CHC_SETTINGS_OK BUTTON_PLAY | 386 | #define CHC_SETTINGS_OK BUTTON_PLAY |
407 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 387 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
408 | 388 | ||
409 | #elif CONFIG_KEYPAD == IHIFI_770_PAD | 389 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) |
410 | #define CHC_QUIT BUTTON_POWER | 390 | #define CHC_QUIT BUTTON_POWER |
411 | #define CHC_STARTSTOP BUTTON_PLAY | 391 | #define CHC_STARTSTOP BUTTON_PLAY |
412 | #define CHC_RESET (BUTTON_PLAY|BUTTON_REPEAT) | 392 | #define CHC_RESET (BUTTON_PLAY|BUTTON_REPEAT) |
@@ -416,15 +396,15 @@ | |||
416 | #define CHC_SETTINGS_OK BUTTON_PLAY | 396 | #define CHC_SETTINGS_OK BUTTON_PLAY |
417 | #define CHC_SETTINGS_CANCEL BUTTON_HOME | 397 | #define CHC_SETTINGS_CANCEL BUTTON_HOME |
418 | 398 | ||
419 | #elif CONFIG_KEYPAD == IHIFI_800_PAD | 399 | #elif CONFIG_KEYPAD == EROSQ_PAD |
420 | #define CHC_QUIT BUTTON_POWER | 400 | #define CHC_QUIT BUTTON_POWER |
421 | #define CHC_STARTSTOP BUTTON_PLAY | 401 | #define CHC_STARTSTOP BUTTON_PLAY |
422 | #define CHC_RESET (BUTTON_PLAY|BUTTON_REPEAT) | 402 | #define CHC_RESET BUTTON_BACK |
423 | #define CHC_MENU BUTTON_HOME | 403 | #define CHC_MENU BUTTON_MENU |
424 | #define CHC_SETTINGS_INC BUTTON_VOL_UP | 404 | #define CHC_SETTINGS_INC BUTTON_NEXT |
425 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN | 405 | #define CHC_SETTINGS_DEC BUTTON_PREV |
426 | #define CHC_SETTINGS_OK BUTTON_PLAY | 406 | #define CHC_SETTINGS_OK BUTTON_PLAY |
427 | #define CHC_SETTINGS_CANCEL BUTTON_HOME | 407 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
428 | 408 | ||
429 | #else | 409 | #else |
430 | #error No keymap defined! | 410 | #error No keymap defined! |
@@ -481,7 +461,7 @@ static struct { | |||
481 | } timer_holder[MAX_PLAYERS]; | 461 | } timer_holder[MAX_PLAYERS]; |
482 | 462 | ||
483 | static int run_timer(int nr); | 463 | static int run_timer(int nr); |
484 | static int chessclock_set_int(char* string, | 464 | static int chessclock_set_int(char* string, |
485 | int* variable, | 465 | int* variable, |
486 | int step, | 466 | int step, |
487 | int min, | 467 | int min, |
@@ -784,7 +764,7 @@ static int run_timer(int nr) | |||
784 | return retval; | 764 | return retval; |
785 | } | 765 | } |
786 | 766 | ||
787 | static int chessclock_set_int(char* string, | 767 | static int chessclock_set_int(char* string, |
788 | int* variable, | 768 | int* variable, |
789 | int step, | 769 | int step, |
790 | int min, | 770 | int min, |
@@ -856,4 +836,3 @@ static char * show_time(int seconds) | |||
856 | rb->snprintf(buf, sizeof(buf), "%02d:%02d", seconds/60, seconds%60); | 836 | rb->snprintf(buf, sizeof(buf), "%02d:%02d", seconds/60, seconds%60); |
857 | return buf; | 837 | return buf; |
858 | } | 838 | } |
859 | |||