Skip to content

Commit f7138a9

Browse files
author
Greg Smith
committed
- 4.3B UI tweaks. Larger effect icons. Added panel of GP5 block icons.
- some more analysis of GP5 protocol.
1 parent 6c69ccf commit f7138a9

File tree

107 files changed

+17973
-7203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+17973
-7203
lines changed

‎source/main/CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ if(CONFIG_TONEX_CONTROLLER_HARDWARE_PLATFORM_WAVESHARE_43B OR CONFIG_TONEX_CONTR
3232
"ui_generated_800x480land/ui_image_effect_icon_eq.c"
3333
"ui_generated_800x480land/ui_image_arrow_left.c" "ui_generated_800x480land/ui_image_arrow_right.c" "ui_generated_800x480land/ui_image_tick.c"
3434
"ui_generated_800x480land/ui_image_bt_conn.c" "ui_generated_800x480land/ui_image_bt_disconn.c"
35+
"ui_generated_800x480land/ui_image_eq_off.c" "ui_generated_800x480land/ui_image_eq_on.c"
36+
"ui_generated_800x480land/ui_image_mod_off.c" "ui_generated_800x480land/ui_image_mod_on.c"
37+
"ui_generated_800x480land/ui_image_pre_off.c" "ui_generated_800x480land/ui_image_pre_on.c"
38+
"ui_generated_800x480land/ui_image_nr_off.c" "ui_generated_800x480land/ui_image_nr_on.c"
39+
"ui_generated_800x480land/ui_image_rvb_off.c" "ui_generated_800x480land/ui_image_rvb_on.c"
40+
"ui_generated_800x480land/ui_image_tc_off.c" "ui_generated_800x480land/ui_image_tc_on.c"
41+
"ui_generated_800x480land/ui_image_amp_off.c" "ui_generated_800x480land/ui_image_amp_on.c"
42+
"ui_generated_800x480land/ui_image_dly_off.c" "ui_generated_800x480land/ui_image_dly_on.c"
43+
"ui_generated_800x480land/ui_image_dst_off.c" "ui_generated_800x480land/ui_image_dst_on.c"
44+
"ui_generated_800x480land/ui_image_cab_off.c" "ui_generated_800x480land/ui_image_cab_on.c"
3545
"ui_generated_800x480land/ui_image_skin_jcm.c")
3646
endif()
3747

‎source/main/platform_ws43.c‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,35 @@ __attribute__((unused)) void platform_adjust_display_flush_area(lv_area_t *area)
194194
*****************************************************************************/
195195
__attribute__((unused)) void platform_get_icon_coords(int16_t* dest, uint8_t max_entries)
196196
{
197+
// Tonex
197198
if (max_entries <= 8)
198199
{
199-
dest[0] = 89;
200-
dest[1] = 156;
201-
dest[2] = 223;
202-
dest[3] = 291;
203-
dest[4] = 356;
204-
dest[5] = 416;
205-
dest[6] = 479;
206-
dest[7] = 549;
200+
dest[0] = -4;
201+
dest[1] = 85;
202+
dest[2] = 170;
203+
dest[3] = 255;
204+
dest[4] = 340;
205+
dest[5] = 425;
206+
dest[6] = 505;
207+
dest[7] = 590;
207208
}
209+
210+
#if 0
211+
// Valeton
212+
if (max_entries <= 10)
213+
{
214+
dest[0] = -15;
215+
dest[1] = 55;
216+
dest[2] = 125;
217+
dest[3] = 195;
218+
dest[4] = 265;
219+
dest[5] = 335;
220+
dest[6] = 405;
221+
dest[7] = 475;
222+
dest[8] = 545;
223+
dest[9] = 615;
224+
}
225+
#endif
208226
}
209227

210228
/****************************************************************************
@@ -315,7 +333,7 @@ void platform_init(i2c_master_bus_handle_t bus_handle, SemaphoreHandle_t I2CMute
315333
// somehow fixes it, and simulates the way that older versions of the project
316334
// did it (a lot of PSRAM was allocated for skin images.)
317335
// If anybody figures out the root cause here I'd love to hear it.
318-
void* psram_workaround_ptr = heap_caps_malloc(50000, MALLOC_CAP_SPIRAM);
336+
void* psram_workaround_ptr = heap_caps_malloc(75000, MALLOC_CAP_SPIRAM);
319337
ESP_ERROR_CHECK(esp_lcd_new_rgb_panel(&panel_config, &panel_handle));
320338
free(psram_workaround_ptr);
321339

‎source/main/ui_generated_800x480land/images.c‎

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,10 @@
11
#include "images.h"
22

3-
const ext_img_desc_t images[93] = {
3+
const ext_img_desc_t images[113] = {
44
{ "arrow_left", &img_arrow_left },
55
{ "arrow_right", &img_arrow_right },
66
{ "bt_conn", &img_bt_conn },
77
{ "bt_disconn", &img_bt_disconn },
8-
{ "effect_icon_amp_off", &img_effect_icon_amp_off },
9-
{ "effect_icon_amp_on", &img_effect_icon_amp_on },
10-
{ "effect_icon_cab_off", &img_effect_icon_cab_off },
11-
{ "effect_icon_cab_on", &img_effect_icon_cab_on },
12-
{ "effect_icon_comp_off", &img_effect_icon_comp_off },
13-
{ "effect_icon_comp_on", &img_effect_icon_comp_on },
14-
{ "effect_icon_delay_off", &img_effect_icon_delay_off },
15-
{ "effect_icon_delay_on", &img_effect_icon_delay_on },
16-
{ "effect_icon_delay_on_d", &img_effect_icon_delay_on_d },
17-
{ "effect_icon_delay_on_t", &img_effect_icon_delay_on_t },
18-
{ "effect_icon_eq", &img_effect_icon_eq },
19-
{ "effect_icon_gate_off", &img_effect_icon_gate_off },
20-
{ "effect_icon_gate_on", &img_effect_icon_gate_on },
21-
{ "effect_icon_mod_off", &img_effect_icon_mod_off },
22-
{ "effect_icon_mod_on", &img_effect_icon_mod_on },
23-
{ "effect_icon_mod_on_chorus", &img_effect_icon_mod_on_chorus },
24-
{ "effect_icon_mod_on_flanger", &img_effect_icon_mod_on_flanger },
25-
{ "effect_icon_mod_on_phaser", &img_effect_icon_mod_on_phaser },
26-
{ "effect_icon_mod_on_rotary", &img_effect_icon_mod_on_rotary },
27-
{ "effect_icon_mod_on_tremolo", &img_effect_icon_mod_on_tremolo },
28-
{ "effect_icon_reverb_off", &img_effect_icon_reverb_off },
29-
{ "effect_icon_reverb_on", &img_effect_icon_reverb_on },
30-
{ "effect_icon_reverb_on_p", &img_effect_icon_reverb_on_p },
31-
{ "effect_icon_reverb_on_r", &img_effect_icon_reverb_on_r },
32-
{ "effect_icon_reverb_on_s1", &img_effect_icon_reverb_on_s1 },
33-
{ "effect_icon_reverb_on_s2", &img_effect_icon_reverb_on_s2 },
34-
{ "effect_icon_reverb_on_s3", &img_effect_icon_reverb_on_s3 },
35-
{ "effect_icon_reverb_on_s4", &img_effect_icon_reverb_on_s4 },
368
{ "next", &img_next },
379
{ "next_down", &img_next_down },
3810
{ "previous", &img_previous },
@@ -59,7 +31,6 @@ const ext_img_desc_t images[93] = {
5931
{ "pskin_mxrsinglewhite", &img_pskin_mxrsinglewhite },
6032
{ "pskin_mxrsingleyellow", &img_pskin_mxrsingleyellow },
6133
{ "pskin_ratyellow", &img_pskin_ratyellow },
62-
{ "settings", &img_settings },
6334
{ "skin_5150", &img_skin_5150 },
6435
{ "skin_ac30", &img_skin_ac30 },
6536
{ "skin_ampegchrome", &img_skin_ampegchrome },
@@ -94,4 +65,53 @@ const ext_img_desc_t images[93] = {
9465
{ "usb_ok", &img_usb_ok },
9566
{ "wifi_conn", &img_wifi_conn },
9667
{ "wifi_disconn", &img_wifi_disconn },
68+
{ "settings", &img_settings },
69+
{ "effect_icon_amp_off", &img_effect_icon_amp_off },
70+
{ "effect_icon_amp_on", &img_effect_icon_amp_on },
71+
{ "effect_icon_cab_off", &img_effect_icon_cab_off },
72+
{ "effect_icon_cab_on", &img_effect_icon_cab_on },
73+
{ "effect_icon_comp_off", &img_effect_icon_comp_off },
74+
{ "effect_icon_comp_on", &img_effect_icon_comp_on },
75+
{ "effect_icon_delay_off", &img_effect_icon_delay_off },
76+
{ "effect_icon_delay_on", &img_effect_icon_delay_on },
77+
{ "effect_icon_delay_on_d", &img_effect_icon_delay_on_d },
78+
{ "effect_icon_delay_on_t", &img_effect_icon_delay_on_t },
79+
{ "effect_icon_eq", &img_effect_icon_eq },
80+
{ "effect_icon_gate_off", &img_effect_icon_gate_off },
81+
{ "effect_icon_gate_on", &img_effect_icon_gate_on },
82+
{ "effect_icon_mod_off", &img_effect_icon_mod_off },
83+
{ "effect_icon_mod_on", &img_effect_icon_mod_on },
84+
{ "effect_icon_mod_on_chorus", &img_effect_icon_mod_on_chorus },
85+
{ "effect_icon_mod_on_flanger", &img_effect_icon_mod_on_flanger },
86+
{ "effect_icon_mod_on_phaser", &img_effect_icon_mod_on_phaser },
87+
{ "effect_icon_mod_on_rotary", &img_effect_icon_mod_on_rotary },
88+
{ "effect_icon_mod_on_tremolo", &img_effect_icon_mod_on_tremolo },
89+
{ "effect_icon_reverb_off", &img_effect_icon_reverb_off },
90+
{ "effect_icon_reverb_on", &img_effect_icon_reverb_on },
91+
{ "effect_icon_reverb_on_p", &img_effect_icon_reverb_on_p },
92+
{ "effect_icon_reverb_on_r", &img_effect_icon_reverb_on_r },
93+
{ "effect_icon_reverb_on_s1", &img_effect_icon_reverb_on_s1 },
94+
{ "effect_icon_reverb_on_s2", &img_effect_icon_reverb_on_s2 },
95+
{ "effect_icon_reverb_on_s3", &img_effect_icon_reverb_on_s3 },
96+
{ "effect_icon_reverb_on_s4", &img_effect_icon_reverb_on_s4 },
97+
{ "amp_off", &img_amp_off },
98+
{ "amp_on", &img_amp_on },
99+
{ "cab_off", &img_cab_off },
100+
{ "cab_on", &img_cab_on },
101+
{ "dly_off", &img_dly_off },
102+
{ "dly_on", &img_dly_on },
103+
{ "dst_off", &img_dst_off },
104+
{ "dst_on", &img_dst_on },
105+
{ "eq_off", &img_eq_off },
106+
{ "eq_on", &img_eq_on },
107+
{ "mod_off", &img_mod_off },
108+
{ "mod_on", &img_mod_on },
109+
{ "nr_off", &img_nr_off },
110+
{ "nr_on", &img_nr_on },
111+
{ "pre_off", &img_pre_off },
112+
{ "pre_on", &img_pre_on },
113+
{ "rvb_off", &img_rvb_off },
114+
{ "rvb_on", &img_rvb_on },
115+
{ "tc_off", &img_tc_off },
116+
{ "tc_on", &img_tc_on },
97117
};

‎source/main/ui_generated_800x480land/images.h‎

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,6 @@ extern const lv_img_dsc_t img_arrow_left;
1111
extern const lv_img_dsc_t img_arrow_right;
1212
extern const lv_img_dsc_t img_bt_conn;
1313
extern const lv_img_dsc_t img_bt_disconn;
14-
extern const lv_img_dsc_t img_effect_icon_amp_off;
15-
extern const lv_img_dsc_t img_effect_icon_amp_on;
16-
extern const lv_img_dsc_t img_effect_icon_cab_off;
17-
extern const lv_img_dsc_t img_effect_icon_cab_on;
18-
extern const lv_img_dsc_t img_effect_icon_comp_off;
19-
extern const lv_img_dsc_t img_effect_icon_comp_on;
20-
extern const lv_img_dsc_t img_effect_icon_delay_off;
21-
extern const lv_img_dsc_t img_effect_icon_delay_on;
22-
extern const lv_img_dsc_t img_effect_icon_delay_on_d;
23-
extern const lv_img_dsc_t img_effect_icon_delay_on_t;
24-
extern const lv_img_dsc_t img_effect_icon_eq;
25-
extern const lv_img_dsc_t img_effect_icon_gate_off;
26-
extern const lv_img_dsc_t img_effect_icon_gate_on;
27-
extern const lv_img_dsc_t img_effect_icon_mod_off;
28-
extern const lv_img_dsc_t img_effect_icon_mod_on;
29-
extern const lv_img_dsc_t img_effect_icon_mod_on_chorus;
30-
extern const lv_img_dsc_t img_effect_icon_mod_on_flanger;
31-
extern const lv_img_dsc_t img_effect_icon_mod_on_phaser;
32-
extern const lv_img_dsc_t img_effect_icon_mod_on_rotary;
33-
extern const lv_img_dsc_t img_effect_icon_mod_on_tremolo;
34-
extern const lv_img_dsc_t img_effect_icon_reverb_off;
35-
extern const lv_img_dsc_t img_effect_icon_reverb_on;
36-
extern const lv_img_dsc_t img_effect_icon_reverb_on_p;
37-
extern const lv_img_dsc_t img_effect_icon_reverb_on_r;
38-
extern const lv_img_dsc_t img_effect_icon_reverb_on_s1;
39-
extern const lv_img_dsc_t img_effect_icon_reverb_on_s2;
40-
extern const lv_img_dsc_t img_effect_icon_reverb_on_s3;
41-
extern const lv_img_dsc_t img_effect_icon_reverb_on_s4;
4214
extern const lv_img_dsc_t img_next;
4315
extern const lv_img_dsc_t img_next_down;
4416
extern const lv_img_dsc_t img_previous;
@@ -65,7 +37,6 @@ extern const lv_img_dsc_t img_pskin_mxrsingleorange;
6537
extern const lv_img_dsc_t img_pskin_mxrsinglewhite;
6638
extern const lv_img_dsc_t img_pskin_mxrsingleyellow;
6739
extern const lv_img_dsc_t img_pskin_ratyellow;
68-
extern const lv_img_dsc_t img_settings;
6940
extern const lv_img_dsc_t img_skin_5150;
7041
extern const lv_img_dsc_t img_skin_ac30;
7142
extern const lv_img_dsc_t img_skin_ampegchrome;
@@ -100,6 +71,55 @@ extern const lv_img_dsc_t img_usb_fail;
10071
extern const lv_img_dsc_t img_usb_ok;
10172
extern const lv_img_dsc_t img_wifi_conn;
10273
extern const lv_img_dsc_t img_wifi_disconn;
74+
extern const lv_img_dsc_t img_settings;
75+
extern const lv_img_dsc_t img_effect_icon_amp_off;
76+
extern const lv_img_dsc_t img_effect_icon_amp_on;
77+
extern const lv_img_dsc_t img_effect_icon_cab_off;
78+
extern const lv_img_dsc_t img_effect_icon_cab_on;
79+
extern const lv_img_dsc_t img_effect_icon_comp_off;
80+
extern const lv_img_dsc_t img_effect_icon_comp_on;
81+
extern const lv_img_dsc_t img_effect_icon_delay_off;
82+
extern const lv_img_dsc_t img_effect_icon_delay_on;
83+
extern const lv_img_dsc_t img_effect_icon_delay_on_d;
84+
extern const lv_img_dsc_t img_effect_icon_delay_on_t;
85+
extern const lv_img_dsc_t img_effect_icon_eq;
86+
extern const lv_img_dsc_t img_effect_icon_gate_off;
87+
extern const lv_img_dsc_t img_effect_icon_gate_on;
88+
extern const lv_img_dsc_t img_effect_icon_mod_off;
89+
extern const lv_img_dsc_t img_effect_icon_mod_on;
90+
extern const lv_img_dsc_t img_effect_icon_mod_on_chorus;
91+
extern const lv_img_dsc_t img_effect_icon_mod_on_flanger;
92+
extern const lv_img_dsc_t img_effect_icon_mod_on_phaser;
93+
extern const lv_img_dsc_t img_effect_icon_mod_on_rotary;
94+
extern const lv_img_dsc_t img_effect_icon_mod_on_tremolo;
95+
extern const lv_img_dsc_t img_effect_icon_reverb_off;
96+
extern const lv_img_dsc_t img_effect_icon_reverb_on;
97+
extern const lv_img_dsc_t img_effect_icon_reverb_on_p;
98+
extern const lv_img_dsc_t img_effect_icon_reverb_on_r;
99+
extern const lv_img_dsc_t img_effect_icon_reverb_on_s1;
100+
extern const lv_img_dsc_t img_effect_icon_reverb_on_s2;
101+
extern const lv_img_dsc_t img_effect_icon_reverb_on_s3;
102+
extern const lv_img_dsc_t img_effect_icon_reverb_on_s4;
103+
extern const lv_img_dsc_t img_amp_off;
104+
extern const lv_img_dsc_t img_amp_on;
105+
extern const lv_img_dsc_t img_cab_off;
106+
extern const lv_img_dsc_t img_cab_on;
107+
extern const lv_img_dsc_t img_dly_off;
108+
extern const lv_img_dsc_t img_dly_on;
109+
extern const lv_img_dsc_t img_dst_off;
110+
extern const lv_img_dsc_t img_dst_on;
111+
extern const lv_img_dsc_t img_eq_off;
112+
extern const lv_img_dsc_t img_eq_on;
113+
extern const lv_img_dsc_t img_mod_off;
114+
extern const lv_img_dsc_t img_mod_on;
115+
extern const lv_img_dsc_t img_nr_off;
116+
extern const lv_img_dsc_t img_nr_on;
117+
extern const lv_img_dsc_t img_pre_off;
118+
extern const lv_img_dsc_t img_pre_on;
119+
extern const lv_img_dsc_t img_rvb_off;
120+
extern const lv_img_dsc_t img_rvb_on;
121+
extern const lv_img_dsc_t img_tc_off;
122+
extern const lv_img_dsc_t img_tc_on;
103123

104124
#ifndef EXT_IMG_DESC_T
105125
#define EXT_IMG_DESC_T
@@ -109,7 +129,7 @@ typedef struct _ext_img_desc_t {
109129
} ext_img_desc_t;
110130
#endif
111131

112-
extern const ext_img_desc_t images[93];
132+
extern const ext_img_desc_t images[113];
113133

114134

115135
#ifdef __cplusplus

0 commit comments

Comments
 (0)