diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 09:47:40 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-11 16:37:17 -0400 |
commit | 2a471e288c16b91a7186a60b3fb84dd55a494c7a (patch) | |
tree | 3e746212c5fa69b59f61d19b6e29d11aa8a5e31b /apps/plugins/oscilloscope.c | |
parent | 5efaa9ef8073bb216e3dcdbb4476f2fa7c672b76 (diff) | |
download | rockbox-2a471e288c16b91a7186a60b3fb84dd55a494c7a.tar.gz rockbox-2a471e288c16b91a7186a60b3fb84dd55a494c7a.zip |
New port: AIGO EROS Q / EROS K
The Q and K have a slightly different case, but the hardware under the
shell is completely identical.
These models are rebadged versions:
* Hifiwalker H2 (== Q)
* AGPTek H3 (== K)
* Surfans F20 (== K)
Other notes:
* Significant improvements in the shared Hiby-platform launcher/loader
* SD card can theoretically be hot-swapped now
* Support external USB mass storage!
* Some consolidation of Hiby-platform targets
* Some consolidation of plugin keymaps
Todo/known issues:
* Keymaps need to be gone over properly
* Convert to HAVE_SCROLLWHEEL?
Change-Id: I5a8a4f22c38a5b69392ca7c0a8ad8c4e07d9523c
Diffstat (limited to 'apps/plugins/oscilloscope.c')
-rw-r--r-- | apps/plugins/oscilloscope.c | 71 |
1 files changed, 27 insertions, 44 deletions
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 2cf9b96409..d8bef0ae7f 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -484,21 +484,7 @@ | |||
484 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | 484 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
485 | #define NEED_LASTBUTTON | 485 | #define NEED_LASTBUTTON |
486 | 486 | ||
487 | #elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) | 487 | #elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) || (CONFIG_KEYPAD == XDUOO_X20_PAD) |
488 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | ||
489 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY | ||
490 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) | ||
491 | #define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_PLAY | ||
492 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY | BUTTON_REPEAT) | ||
493 | #define OSCILLOSCOPE_ADVMODE BUTTON_HOME | ||
494 | #define OSCILLOSCOPE_PAUSE BUTTON_OPTION | ||
495 | #define OSCILLOSCOPE_SPEED_UP BUTTON_NEXT | ||
496 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_PREV | ||
497 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP | ||
498 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | ||
499 | #define NEED_LASTBUTTON | ||
500 | |||
501 | #elif (CONFIG_KEYPAD == XDUOO_X20_PAD) | ||
502 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 488 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
503 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY | 489 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY |
504 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) | 490 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) |
@@ -526,7 +512,7 @@ | |||
526 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | 512 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
527 | #define NEED_LASTBUTTON | 513 | #define NEED_LASTBUTTON |
528 | 514 | ||
529 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) | 515 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) |
530 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 516 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
531 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY | 517 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY |
532 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) | 518 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) |
@@ -540,19 +526,16 @@ | |||
540 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | 526 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
541 | #define NEED_LASTBUTTON | 527 | #define NEED_LASTBUTTON |
542 | 528 | ||
543 | #elif (CONFIG_KEYPAD == IHIFI_800_PAD) | 529 | #elif CONFIG_KEYPAD == EROSQ_PAD |
544 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 530 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
545 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY | 531 | #define OSCILLOSCOPE_DRAWMODE BUTTON_PREV |
546 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) | 532 | #define OSCILLOSCOPE_ADVMODE BUTTON_NEXT |
547 | #define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_PLAY | 533 | #define OSCILLOSCOPE_ORIENTATION BUTTON_BACK |
548 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY | BUTTON_REPEAT) | 534 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY |
549 | #define OSCILLOSCOPE_ADVMODE BUTTON_HOME | 535 | #define OSCILLOSCOPE_SPEED_UP BUTTON_SCROLL_FWD |
550 | #define OSCILLOSCOPE_PAUSE (BUTTON_HOME | BUTTON_REPEAT) | 536 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_SCROLL_BACK |
551 | #define OSCILLOSCOPE_SPEED_UP BUTTON_NEXT | 537 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP |
552 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_PREV | 538 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
553 | #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP | ||
554 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | ||
555 | #define NEED_LASTBUTTON | ||
556 | 539 | ||
557 | #else | 540 | #else |
558 | #error No keymap defined! | 541 | #error No keymap defined! |
@@ -881,7 +864,7 @@ static void anim_draw_cursor_h(int x) | |||
881 | { | 864 | { |
882 | #if LCD_DEPTH > 1 | 865 | #if LCD_DEPTH > 1 |
883 | rb->lcd_set_foreground(CURSOR_COLOR); | 866 | rb->lcd_set_foreground(CURSOR_COLOR); |
884 | rb->lcd_vline(x, 0, LCD_HEIGHT-1); | 867 | rb->lcd_vline(x, 0, LCD_HEIGHT-1); |
885 | rb->lcd_set_foreground(GRAPH_COLOR); | 868 | rb->lcd_set_foreground(GRAPH_COLOR); |
886 | #else | 869 | #else |
887 | rb->lcd_set_drawmode(DRMODE_COMPLEMENT); | 870 | rb->lcd_set_drawmode(DRMODE_COMPLEMENT); |
@@ -895,7 +878,7 @@ static void anim_draw_cursor_v(int y) | |||
895 | { | 878 | { |
896 | #if LCD_DEPTH > 1 /* cursor bar */ | 879 | #if LCD_DEPTH > 1 /* cursor bar */ |
897 | rb->lcd_set_foreground(CURSOR_COLOR); | 880 | rb->lcd_set_foreground(CURSOR_COLOR); |
898 | rb->lcd_hline(0, LCD_WIDTH-1, y); | 881 | rb->lcd_hline(0, LCD_WIDTH-1, y); |
899 | rb->lcd_set_foreground(GRAPH_COLOR); | 882 | rb->lcd_set_foreground(GRAPH_COLOR); |
900 | #else | 883 | #else |
901 | rb->lcd_set_drawmode(DRMODE_COMPLEMENT); | 884 | rb->lcd_set_drawmode(DRMODE_COMPLEMENT); |
@@ -1040,9 +1023,9 @@ static long anim_peaks_horizontal(void) | |||
1040 | } | 1023 | } |
1041 | else | 1024 | else |
1042 | { | 1025 | { |
1043 | left = last_left | 1026 | left = last_left |
1044 | + (LCD_WIDTH - last_pos) * (last_left - cur_left) / d; | 1027 | + (LCD_WIDTH - last_pos) * (last_left - cur_left) / d; |
1045 | right = last_right | 1028 | right = last_right |
1046 | + (LCD_WIDTH - last_pos) * (last_right - cur_right) / d; | 1029 | + (LCD_WIDTH - last_pos) * (last_right - cur_right) / d; |
1047 | 1030 | ||
1048 | rb->lcd_drawline( | 1031 | rb->lcd_drawline( |
@@ -1066,7 +1049,7 @@ static long anim_peaks_horizontal(void) | |||
1066 | } | 1049 | } |
1067 | } | 1050 | } |
1068 | break; | 1051 | break; |
1069 | 1052 | ||
1070 | case DRAW_PIXEL: | 1053 | case DRAW_PIXEL: |
1071 | left = last_left; | 1054 | left = last_left; |
1072 | right = last_right; | 1055 | right = last_right; |
@@ -1090,14 +1073,14 @@ static long anim_peaks_horizontal(void) | |||
1090 | 1073 | ||
1091 | last_left = cur_left; | 1074 | last_left = cur_left; |
1092 | last_right = cur_right; | 1075 | last_right = cur_right; |
1093 | 1076 | ||
1094 | if (full_update) | 1077 | if (full_update) |
1095 | { | 1078 | { |
1096 | osd_lcd_update(); | 1079 | osd_lcd_update(); |
1097 | } | 1080 | } |
1098 | else | 1081 | else |
1099 | { | 1082 | { |
1100 | anim_draw_cursor_h(cur_x + 1); /* cursor bar */ | 1083 | anim_draw_cursor_h(cur_x + 1); /* cursor bar */ |
1101 | 1084 | ||
1102 | if (cur_x > last_pos) | 1085 | if (cur_x > last_pos) |
1103 | { | 1086 | { |
@@ -1164,7 +1147,7 @@ static long anim_peaks_vertical(void) | |||
1164 | cur_y -= shift; | 1147 | cur_y -= shift; |
1165 | last_pos -= shift; | 1148 | last_pos -= shift; |
1166 | } | 1149 | } |
1167 | else | 1150 | else |
1168 | { | 1151 | { |
1169 | cur_y -= LCD_HEIGHT; | 1152 | cur_y -= LCD_HEIGHT; |
1170 | } | 1153 | } |
@@ -1219,7 +1202,7 @@ static long anim_peaks_vertical(void) | |||
1219 | } | 1202 | } |
1220 | else | 1203 | else |
1221 | { | 1204 | { |
1222 | left = last_left | 1205 | left = last_left |
1223 | + (LCD_HEIGHT - last_pos) * (last_left - cur_left) / d; | 1206 | + (LCD_HEIGHT - last_pos) * (last_left - cur_left) / d; |
1224 | right = last_right | 1207 | right = last_right |
1225 | + (LCD_HEIGHT - last_pos) * (last_right - cur_right) / d; | 1208 | + (LCD_HEIGHT - last_pos) * (last_right - cur_right) / d; |
@@ -1245,7 +1228,7 @@ static long anim_peaks_vertical(void) | |||
1245 | } | 1228 | } |
1246 | } | 1229 | } |
1247 | break; | 1230 | break; |
1248 | 1231 | ||
1249 | case DRAW_PIXEL: | 1232 | case DRAW_PIXEL: |
1250 | left = last_left; | 1233 | left = last_left; |
1251 | right = last_right; | 1234 | right = last_right; |
@@ -1269,7 +1252,7 @@ static long anim_peaks_vertical(void) | |||
1269 | 1252 | ||
1270 | last_left = cur_left; | 1253 | last_left = cur_left; |
1271 | last_right = cur_right; | 1254 | last_right = cur_right; |
1272 | 1255 | ||
1273 | if (full_update) | 1256 | if (full_update) |
1274 | { | 1257 | { |
1275 | osd_lcd_update(); | 1258 | osd_lcd_update(); |
@@ -1358,7 +1341,7 @@ static void waveform_buffer_done(void) | |||
1358 | 1341 | ||
1359 | waveform_buffer_have = have; | 1342 | waveform_buffer_have = have; |
1360 | } | 1343 | } |
1361 | 1344 | ||
1362 | /* where the samples are obtained and buffered */ | 1345 | /* where the samples are obtained and buffered */ |
1363 | static void waveform_buffer_callback(const void *start, size_t size) | 1346 | static void waveform_buffer_callback(const void *start, size_t size) |
1364 | { | 1347 | { |
@@ -2053,7 +2036,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
2053 | osc_popupmsg(OSC_MSG_GRAPHMODE, osc.graphmode); | 2036 | osc_popupmsg(OSC_MSG_GRAPHMODE, osc.graphmode); |
2054 | break; | 2037 | break; |
2055 | #endif /* OSCILLOSCOPE_GRAPHMODE */ | 2038 | #endif /* OSCILLOSCOPE_GRAPHMODE */ |
2056 | 2039 | ||
2057 | case OSCILLOSCOPE_ORIENTATION: | 2040 | case OSCILLOSCOPE_ORIENTATION: |
2058 | #ifdef OSCILLOSCOPE_ORIENTATION_PRE | 2041 | #ifdef OSCILLOSCOPE_ORIENTATION_PRE |
2059 | if (lastbutton != OSCILLOSCOPE_ORIENTATION_PRE) | 2042 | if (lastbutton != OSCILLOSCOPE_ORIENTATION_PRE) |
@@ -2075,7 +2058,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
2075 | graphmode_pause_unpause(paused); | 2058 | graphmode_pause_unpause(paused); |
2076 | osc_popupmsg(OSC_MSG_PAUSED, paused ? 1 : 0); | 2059 | osc_popupmsg(OSC_MSG_PAUSED, paused ? 1 : 0); |
2077 | break; | 2060 | break; |
2078 | 2061 | ||
2079 | case OSCILLOSCOPE_SPEED_UP: | 2062 | case OSCILLOSCOPE_SPEED_UP: |
2080 | case OSCILLOSCOPE_SPEED_UP | BUTTON_REPEAT: | 2063 | case OSCILLOSCOPE_SPEED_UP | BUTTON_REPEAT: |
2081 | { | 2064 | { |
@@ -2088,7 +2071,7 @@ enum plugin_status plugin_start(const void* parameter) | |||
2088 | osc_popupmsg(OSC_MSG_SPEED, *val); | 2071 | osc_popupmsg(OSC_MSG_SPEED, *val); |
2089 | break; | 2072 | break; |
2090 | } | 2073 | } |
2091 | 2074 | ||
2092 | case OSCILLOSCOPE_SPEED_DOWN: | 2075 | case OSCILLOSCOPE_SPEED_DOWN: |
2093 | case OSCILLOSCOPE_SPEED_DOWN | BUTTON_REPEAT: | 2076 | case OSCILLOSCOPE_SPEED_DOWN | BUTTON_REPEAT: |
2094 | { | 2077 | { |