summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-12-04 20:39:18 -0500
committerMichael Sevakis <jethead71@rockbox.org>2012-12-04 20:40:00 -0500
commit708bf1aca31761f1012e3c48fd89749ad7d8d227 (patch)
tree0fd059897445f1dcda7343a4eec6108d2f142f3f /apps
parent0f8aedbe9492a5226fddd4ad27dae21b8a39e1b4 (diff)
downloadrockbox-708bf1aca31761f1012e3c48fd89749ad7d8d227.tar.gz
rockbox-708bf1aca31761f1012e3c48fd89749ad7d8d227.zip
Revert a couple keymaps from 0f8aedb.
M200v4 doesn't have enough plugin RAM for waveform view. HD300 I was clueless about, created a duplicated case. Will just leave for now. Targets still need GRAPHMODE key defined to access. Change-Id: Ib21f46f25c1121ebee78bd26c856446ac7720b37
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/oscilloscope.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 66ebb43774..4fbf96939d 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -175,16 +175,13 @@
175#define OSCILLOSCOPE_QUIT BUTTON_POWER 175#define OSCILLOSCOPE_QUIT BUTTON_POWER
176#define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) 176#define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL)
177#define OSCILLOSCOPE_ADVMODE BUTTON_DOWN 177#define OSCILLOSCOPE_ADVMODE BUTTON_DOWN
178#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_UP 178#define OSCILLOSCOPE_ORIENTATION BUTTON_UP
179#define OSCILLOSCOPE_ORIENTATION (BUTTON_UP | BUTTON_REL)
180#define OSCILLOSCOPE_GRAPHMODE_PRE BUTTON_UP
181#define OSCILLOSCOPE_GRAPHMODE (BUTTON_UP | BUTTON_REPEAT)
182#define OSCILLOSCOPE_PAUSE (BUTTON_SELECT | BUTTON_UP) 179#define OSCILLOSCOPE_PAUSE (BUTTON_SELECT | BUTTON_UP)
183#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT 180#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
184#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT 181#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
185#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP 182#define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP
186#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN 183#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN
187#define NEED_LASTBUTTON 184/* Not enough plugin RAM for waveform view */
188 185
189#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD 186#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
190#define OSCILLOSCOPE_QUIT BUTTON_POWER 187#define OSCILLOSCOPE_QUIT BUTTON_POWER
@@ -383,16 +380,13 @@
383#define OSCILLOSCOPE_QUIT (BUTTON_MENU | BUTTON_REPEAT) 380#define OSCILLOSCOPE_QUIT (BUTTON_MENU | BUTTON_REPEAT)
384#define OSCILLOSCOPE_DRAWMODE BUTTON_ENTER 381#define OSCILLOSCOPE_DRAWMODE BUTTON_ENTER
385#define OSCILLOSCOPE_ADVMODE BUTTON_REC 382#define OSCILLOSCOPE_ADVMODE BUTTON_REC
386#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_MENU 383#define OSCILLOSCOPE_ORIENTATION BUTTON_MENU
387#define OSCILLOSCOPE_ORIENTATION (BUTTON_MENU | BUTTON_REL)
388#define OSCILLOSCOPE_GRAPHMODE_PRE BUTTON_MENU
389#define OSCILLOSCOPE_GRAPHMODE (BUTTON_MENU | BUTTON_REPEAT)
390#define OSCILLOSCOPE_PAUSE BUTTON_PLAY 384#define OSCILLOSCOPE_PAUSE BUTTON_PLAY
391#define OSCILLOSCOPE_SPEED_UP BUTTON_FF 385#define OSCILLOSCOPE_SPEED_UP BUTTON_FF
392#define OSCILLOSCOPE_SPEED_DOWN BUTTON_REW 386#define OSCILLOSCOPE_SPEED_DOWN BUTTON_REW
393#define OSCILLOSCOPE_VOL_UP BUTTON_UP 387#define OSCILLOSCOPE_VOL_UP BUTTON_UP
394#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN 388#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN
395#define NEED_LASTBUTTON 389/* Need GRAPHMODE */
396 390
397#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD 391#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
398#define OSCILLOSCOPE_QUIT BUTTON_POWER 392#define OSCILLOSCOPE_QUIT BUTTON_POWER