diff options
| -rw-r--r-- | apps/plugins/calculator.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index e65d8bb703..b9529f4e54 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
| @@ -161,24 +161,22 @@ PLUGIN_HEADER | |||
| 161 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 161 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
| 162 | 162 | ||
| 163 | #define CALCULATOR_LEFT BUTTON_LEFT | 163 | #define CALCULATOR_LEFT BUTTON_LEFT |
| 164 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 164 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
| 165 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK | 165 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK |
| 166 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD | 166 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD |
| 167 | #define CALCULATOR_QUIT BUTTON_MENU | 167 | #define CALCULATOR_QUIT BUTTON_MENU |
| 168 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | 168 | #define CALCULATOR_INPUT BUTTON_SELECT |
| 169 | #define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) | 169 | #define CALCULATOR_CALC BUTTON_PLAY |
| 170 | #define CALCULATOR_CALC (BUTTON_PLAY | BUTTON_REPEAT) | ||
| 171 | 170 | ||
| 172 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 171 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
| 173 | 172 | ||
| 174 | #define CALCULATOR_LEFT BUTTON_LEFT | 173 | #define CALCULATOR_LEFT BUTTON_LEFT |
| 175 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 174 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
| 176 | #define CALCULATOR_UP BUTTON_UP | 175 | #define CALCULATOR_UP BUTTON_UP |
| 177 | #define CALCULATOR_DOWN BUTTON_DOWN | 176 | #define CALCULATOR_DOWN BUTTON_DOWN |
| 178 | #define CALCULATOR_QUIT BUTTON_POWER | 177 | #define CALCULATOR_QUIT BUTTON_POWER |
| 179 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | 178 | #define CALCULATOR_INPUT BUTTON_SELECT |
| 180 | #define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) | 179 | #define CALCULATOR_CALC BUTTON_PLAY |
| 181 | #define CALCULATOR_CALC BUTTON_PLAY | ||
| 182 | #define CALCULATOR_CLEAR BUTTON_REC | 180 | #define CALCULATOR_CLEAR BUTTON_REC |
| 183 | 181 | ||
| 184 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 182 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
| @@ -223,14 +221,13 @@ PLUGIN_HEADER | |||
| 223 | 221 | ||
| 224 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 222 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
| 225 | 223 | ||
| 226 | #define CALCULATOR_LEFT BUTTON_LEFT | 224 | #define CALCULATOR_LEFT BUTTON_LEFT |
| 227 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 225 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
| 228 | #define CALCULATOR_UP BUTTON_UP | 226 | #define CALCULATOR_UP BUTTON_UP |
| 229 | #define CALCULATOR_DOWN BUTTON_DOWN | 227 | #define CALCULATOR_DOWN BUTTON_DOWN |
| 230 | #define CALCULATOR_QUIT BUTTON_BACK | 228 | #define CALCULATOR_QUIT BUTTON_BACK |
| 231 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU | 229 | #define CALCULATOR_INPUT BUTTON_SELECT |
| 232 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) | 230 | #define CALCULATOR_CALC BUTTON_MENU |
| 233 | #define CALCULATOR_CALC BUTTON_SELECT | ||
| 234 | #define CALCULATOR_CLEAR BUTTON_PLAY | 231 | #define CALCULATOR_CLEAR BUTTON_PLAY |
| 235 | 232 | ||
| 236 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | 233 | #elif (CONFIG_KEYPAD == MROBE100_PAD) |