Skip to content

Commit 94a4061

Browse files
author
Greg Smith
committed
Adjustments to 4.3B and 3.5 UI, to add Valeton effect icons and use left/right swipe for preset charging. Larger effect icons also.
1 parent 38b3222 commit 94a4061

Some content is hidden

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

58 files changed

+11154
-4773
lines changed

‎source/components/usb_host_midi/midi_host.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ esp_err_t midi_host_data_tx_blocking(midi_dev_hdl_t midi_hdl, const uint8_t *dat
895895
esp_err_t midi_host_midi_desc_get(midi_dev_hdl_t midi_hdl, const usb_standard_desc_t **desc_out)
896896
{
897897
MIDI_CHECK(midi_hdl, ESP_ERR_INVALID_ARG);
898-
midi_dev_t *midi_dev = (midi_dev_t *)midi_hdl;
898+
midi_dev_t* __attribute__((unused)) midi_dev = (midi_dev_t *)midi_hdl;
899899
esp_err_t ret = ESP_ERR_NOT_FOUND;
900900
*desc_out = NULL;
901901

‎source/main/CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,16 @@ if(CONFIG_TONEX_CONTROLLER_HARDWARE_PLATFORM_WAVESHARE_35B OR CONFIG_TONEX_CONTR
7171
"ui_generated_480x320land/ui_image_effect_icon_eq.c"
7272
"ui_generated_480x320land/ui_image_arrow_left.c" "ui_generated_480x320land/ui_image_arrow_right.c" "ui_generated_480x320land/ui_image_tick.c"
7373
"ui_generated_480x320land/ui_image_bt_conn.c" "ui_generated_480x320land/ui_image_bt_disconn.c"
74+
"ui_generated_480x320land/ui_image_eq_off.c" "ui_generated_480x320land/ui_image_eq_on.c"
75+
"ui_generated_480x320land/ui_image_mod_off.c" "ui_generated_480x320land/ui_image_mod_on.c"
76+
"ui_generated_480x320land/ui_image_pre_off.c" "ui_generated_480x320land/ui_image_pre_on.c"
77+
"ui_generated_480x320land/ui_image_nr_off.c" "ui_generated_480x320land/ui_image_nr_on.c"
78+
"ui_generated_480x320land/ui_image_rvb_off.c" "ui_generated_480x320land/ui_image_rvb_on.c"
79+
"ui_generated_480x320land/ui_image_tc_off.c" "ui_generated_480x320land/ui_image_tc_on.c"
80+
"ui_generated_480x320land/ui_image_amp_off.c" "ui_generated_480x320land/ui_image_amp_on.c"
81+
"ui_generated_480x320land/ui_image_dly_off.c" "ui_generated_480x320land/ui_image_dly_on.c"
82+
"ui_generated_480x320land/ui_image_dst_off.c" "ui_generated_480x320land/ui_image_dst_on.c"
83+
"ui_generated_480x320land/ui_image_cab_off.c" "ui_generated_480x320land/ui_image_cab_on.c"
7484
"ui_generated_480x320land/ui_image_skin_jcm.c")
7585
endif()
7686

‎source/main/platform_jc3248w.c‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,43 @@ __attribute__((unused)) void platform_adjust_display_flush_area(lv_area_t *area)
201201
*****************************************************************************/
202202
__attribute__((unused)) void platform_get_icon_coords(int16_t* dest, uint8_t max_entries)
203203
{
204-
if (max_entries <= 8)
204+
switch (usb_get_connected_modeller_type())
205205
{
206-
dest[0] = -168;
207-
dest[1] = -126;
208-
dest[2] = -84;
209-
dest[3] = -42;
210-
dest[4] = 0;
211-
dest[5] = 42;
212-
dest[6] = 84;
213-
dest[7] = 126;
206+
case AMP_MODELLER_TONEX_ONE: // fallthrough
207+
case AMP_MODELLER_TONEX: // fallthrough
208+
default:
209+
{
210+
// Tonex
211+
if (max_entries <= 8)
212+
{
213+
dest[0] = -12;
214+
dest[1] = 44;
215+
dest[2] = 96;
216+
dest[3] = 148;
217+
dest[4] = 200;
218+
dest[5] = 252;
219+
dest[6] = 304;
220+
dest[7] = 356;
221+
}
222+
} break;
223+
224+
case AMP_MODELLER_VALETON_GP5:
225+
{
226+
// Valeton
227+
if (max_entries <= 10)
228+
{
229+
dest[0] = -19;
230+
dest[1] = 24;
231+
dest[2] = 67;
232+
dest[3] = 110;
233+
dest[4] = 153;
234+
dest[5] = 196;
235+
dest[6] = 239;
236+
dest[7] = 282;
237+
dest[8] = 325;
238+
dest[9] = 368;
239+
}
240+
} break;
214241
}
215242
}
216243

‎source/main/platform_ws35b.c‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -248,16 +248,43 @@ __attribute__((unused)) void platform_adjust_display_flush_area(lv_area_t *area)
248248
*****************************************************************************/
249249
__attribute__((unused)) void platform_get_icon_coords(int16_t* dest, uint8_t max_entries)
250250
{
251-
if (max_entries <= 8)
251+
switch (usb_get_connected_modeller_type())
252252
{
253-
dest[0] = -168;
254-
dest[1] = -126;
255-
dest[2] = -84;
256-
dest[3] = -42;
257-
dest[4] = 0;
258-
dest[5] = 42;
259-
dest[6] = 84;
260-
dest[7] = 126;
253+
case AMP_MODELLER_TONEX_ONE: // fallthrough
254+
case AMP_MODELLER_TONEX: // fallthrough
255+
default:
256+
{
257+
// Tonex
258+
if (max_entries <= 8)
259+
{
260+
dest[0] = -12;
261+
dest[1] = 44;
262+
dest[2] = 96;
263+
dest[3] = 148;
264+
dest[4] = 200;
265+
dest[5] = 252;
266+
dest[6] = 304;
267+
dest[7] = 356;
268+
}
269+
} break;
270+
271+
case AMP_MODELLER_VALETON_GP5:
272+
{
273+
// Valeton
274+
if (max_entries <= 10)
275+
{
276+
dest[0] = -19;
277+
dest[1] = 24;
278+
dest[2] = 67;
279+
dest[3] = 110;
280+
dest[4] = 153;
281+
dest[5] = 196;
282+
dest[6] = 239;
283+
dest[7] = 282;
284+
dest[8] = 325;
285+
dest[9] = 368;
286+
}
287+
} break;
261288
}
262289
}
263290

‎source/main/platform_ws43.c‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -194,35 +194,44 @@ __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
198-
if (max_entries <= 8)
197+
switch (usb_get_connected_modeller_type())
199198
{
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;
208-
}
199+
case AMP_MODELLER_TONEX_ONE: // fallthrough
200+
case AMP_MODELLER_TONEX: // fallthrough
201+
default:
202+
{
203+
// Tonex
204+
if (max_entries <= 8)
205+
{
206+
dest[0] = -4;
207+
dest[1] = 85;
208+
dest[2] = 170;
209+
dest[3] = 255;
210+
dest[4] = 340;
211+
dest[5] = 425;
212+
dest[6] = 505;
213+
dest[7] = 590;
214+
}
215+
} break;
209216

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;
217+
case AMP_MODELLER_VALETON_GP5:
218+
{
219+
// Valeton
220+
if (max_entries <= 10)
221+
{
222+
dest[0] = -15;
223+
dest[1] = 55;
224+
dest[2] = 125;
225+
dest[3] = 195;
226+
dest[4] = 265;
227+
dest[5] = 335;
228+
dest[6] = 405;
229+
dest[7] = 475;
230+
dest[8] = 545;
231+
dest[9] = 615;
232+
}
233+
} break;
224234
}
225-
#endif
226235
}
227236

228237
/****************************************************************************

‎source/main/ui_generated_480x320land/actions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ extern void action_save_skin_edit(lv_event_t * e);
1919
extern void action_keyboard_ok(lv_event_t * e);
2020
extern void action_preset_description_pressed(lv_event_t * e);
2121
extern void action_effect_icon_clicked(lv_event_t * e);
22+
extern void action_gesture(lv_event_t * e);
2223

2324

2425
#ifdef __cplusplus

‎source/main/ui_generated_480x320land/images.c‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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 },
@@ -94,4 +94,24 @@ const ext_img_desc_t images[93] = {
9494
{ "usb_ok", &img_usb_ok },
9595
{ "wifi_conn", &img_wifi_conn },
9696
{ "wifi_disconn", &img_wifi_disconn },
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_480x320land/images.h‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,26 @@ extern const lv_img_dsc_t img_usb_fail;
100100
extern const lv_img_dsc_t img_usb_ok;
101101
extern const lv_img_dsc_t img_wifi_conn;
102102
extern const lv_img_dsc_t img_wifi_disconn;
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)