diff options
Diffstat (limited to 'apps/plugins/calculator.c')
| -rw-r--r-- | apps/plugins/calculator.c | 51 |
1 files changed, 43 insertions, 8 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index cfc0f76..53be78f 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -108,6 +108,8 @@ PLUGIN_HEADER /* variable button definitions */ #if CONFIG_KEYPAD == RECORDER_PAD +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_OFF @@ -117,6 +119,8 @@ PLUGIN_HEADER #define CALCULATOR_CLEAR BUTTON_F1 #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_OFF @@ -126,6 +130,8 @@ PLUGIN_HEADER #define CALCULATOR_CLEAR BUTTON_F1 #elif CONFIG_KEYPAD == ONDIO_PAD +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_OFF @@ -135,6 +141,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ (CONFIG_KEYPAD == IRIVER_H300_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_OFF @@ -149,6 +157,8 @@ PLUGIN_HEADER (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_SCROLL_BACK #define CALCULATOR_DOWN BUTTON_SCROLL_FWD #define CALCULATOR_QUIT BUTTON_MENU @@ -158,6 +168,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_POWER @@ -168,6 +180,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_POWER @@ -177,6 +191,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_POWER @@ -187,6 +203,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_SCROLL_UP #define CALCULATOR_DOWN BUTTON_SCROLL_DOWN #define CALCULATOR_QUIT BUTTON_POWER @@ -197,6 +215,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_BACK @@ -207,6 +227,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == MROBE100_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_QUIT BUTTON_POWER @@ -214,6 +236,19 @@ PLUGIN_HEADER #define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_DISPLAY +#elif CONFIG_KEYPAD == IAUDIO_M3_PAD + +#define CALCULATOR_LEFT BUTTON_RC_REW +#define CALCULATOR_RIGHT BUTTON_RC_FF +#define CALCULATOR_UP BUTTON_RC_VOL_UP +#define CALCULATOR_DOWN BUTTON_RC_VOL_DOWN +#define CALCULATOR_QUIT BUTTON_RC_REC +#define CALCULATOR_INPUT BUTTON_RC_PLAY +#define CALCULATOR_CALC BUTTON_RC_MODE +#define CALCULATOR_CLEAR BUTTON_RC_MENU + +#define CALCULATOR_RC_QUIT BUTTON_REC + #else #error No keymap defined! #endif @@ -763,16 +798,16 @@ Invert display new button, invert back previous button ----------------------------------------------------------------------- */ void moveButton(void){ switch(btn){ - case BUTTON_LEFT: - case BUTTON_LEFT | BUTTON_REPEAT: + case CALCULATOR_LEFT: + case CALCULATOR_LEFT | BUTTON_REPEAT: if (n == 0) n = 4; else n--; break; - case BUTTON_RIGHT: - case BUTTON_RIGHT | BUTTON_REPEAT: + case CALCULATOR_RIGHT: + case CALCULATOR_RIGHT | BUTTON_REPEAT: if (n == 4) n = 0; else @@ -1458,10 +1493,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) break; #endif - case BUTTON_LEFT: - case BUTTON_LEFT | BUTTON_REPEAT: - case BUTTON_RIGHT: - case BUTTON_RIGHT | BUTTON_REPEAT: + case CALCULATOR_LEFT: + case CALCULATOR_LEFT | BUTTON_REPEAT: + case CALCULATOR_RIGHT: + case CALCULATOR_RIGHT | BUTTON_REPEAT: case CALCULATOR_UP: case CALCULATOR_UP | BUTTON_REPEAT: case CALCULATOR_DOWN: |