Skip to content

Commit 1817330

Browse files
author
Greg Smith
committed
Added dialog box on 4.3/3.5 platforms, that allows precise entry of param values via keyboard. Press the value on the right side to launch it.
1 parent 4186466 commit 1817330

File tree

13 files changed

+3973
-730
lines changed

13 files changed

+3973
-730
lines changed

source/main/display.c

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,33 @@ void action_preset_description_pressed(lv_event_t * e)
577577
}
578578
}
579579

580+
/****************************************************************************
581+
* NAME:
582+
* DESCRIPTION:
583+
* PARAMETERS:
584+
* RETURN:
585+
* NOTES:
586+
*****************************************************************************/
587+
void action_value_clicked(lv_event_t *e)
588+
{
589+
ESP_LOGI(TAG, "action_value_clicked");
590+
591+
switch (usb_get_connected_modeller_type())
592+
{
593+
case AMP_MODELLER_TONEX_ONE: // fallthrough
594+
case AMP_MODELLER_TONEX: // fallthrough
595+
default:
596+
{
597+
tonex_value_clicked(e);
598+
} break;
599+
600+
case AMP_MODELLER_VALETON_GP5:
601+
{
602+
valeton_value_clicked(e);
603+
} break;
604+
}
605+
}
606+
580607
/****************************************************************************
581608
* NAME:
582609
* DESCRIPTION:
@@ -614,6 +641,38 @@ void action_keyboard_ok(lv_event_t * e)
614641
}
615642
}
616643

644+
/****************************************************************************
645+
* NAME:
646+
* DESCRIPTION:
647+
* PARAMETERS:
648+
* RETURN:
649+
* NOTES:
650+
*****************************************************************************/
651+
void action_value_keyboard_ok(lv_event_t * e)
652+
{
653+
lv_event_code_t event_code = lv_event_get_code(e);
654+
655+
if (event_code == LV_EVENT_READY)
656+
{
657+
ESP_LOGI(TAG, "action_value_keyboard_ok");
658+
659+
switch (usb_get_connected_modeller_type())
660+
{
661+
case AMP_MODELLER_TONEX_ONE: // fallthrough
662+
case AMP_MODELLER_TONEX: // fallthrough
663+
default:
664+
{
665+
tonex_value_changed(e);
666+
} break;
667+
668+
case AMP_MODELLER_VALETON_GP5:
669+
{
670+
valeton_value_changed(e);
671+
} break;
672+
}
673+
}
674+
}
675+
617676
/****************************************************************************
618677
* NAME:
619678
* DESCRIPTION:

source/main/display_tonex.c

Lines changed: 325 additions & 63 deletions
Large diffs are not rendered by default.

source/main/display_tonex.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ void tonex_action_effect_icon_clicked(lv_event_t* e);
2929
void tonex_action_parameter_changed(lv_event_t* e);
3030
void tonex_update_icon_order(void);
3131
uint8_t tonex_update_ui_parameters(void);
32+
void tonex_value_clicked(lv_event_t *e);
33+
void tonex_value_changed(lv_event_t * e);
3234

3335
#ifdef __cplusplus
3436
} /*extern "C"*/

source/main/display_valeton.c

Lines changed: 220 additions & 0 deletions
Large diffs are not rendered by default.

source/main/display_valeton.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ void valeton_action_effect_icon_clicked(lv_event_t* e);
2929
void valeton_action_parameter_changed(lv_event_t* e);
3030
void valeton_update_icon_order(void);
3131
uint8_t valeton_update_ui_parameters(void);
32+
void valeton_value_clicked(lv_event_t *e);
33+
void valeton_value_changed(lv_event_t * e);
3234

3335
#ifdef __cplusplus
3436
} /*extern "C"*/

source/main/ui_generated_480x320land/actions.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ 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);
2222
extern void action_gesture(lv_event_t * e);
23+
extern void action_value_keyboard_ok(lv_event_t * e);
24+
extern void action_value_clicked(lv_event_t * e);
2325

2426

2527
#ifdef __cplusplus

source/main/ui_generated_480x320land/screens.c

Lines changed: 333 additions & 83 deletions
Large diffs are not rendered by default.

source/main/ui_generated_480x320land/screens.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ typedef struct _objects_t {
204204
lv_obj_t *ui_volume_slider;
205205
lv_obj_t *ui_volume_value;
206206
lv_obj_t *ui_closeimage;
207+
lv_obj_t *ui_settings_dialog;
208+
lv_obj_t *ui_settings_text_entry;
209+
lv_obj_t *ui_settings_keyboard;
207210
lv_obj_t *ui_val_settings_tab_view;
208211
lv_obj_t *obj7;
209212
lv_obj_t *ui_val_nr_tab;
@@ -419,6 +422,9 @@ typedef struct _objects_t {
419422
lv_obj_t *ui_val_patch_vol_slider;
420423
lv_obj_t *ui_val_patch_vol_value;
421424
lv_obj_t *ui_val_closeimage;
425+
lv_obj_t *ui_val_settings_dialog;
426+
lv_obj_t *ui_val_settings_text_entry;
427+
lv_obj_t *ui_val_settings_keyboard;
422428
} objects_t;
423429

424430
extern objects_t objects;

source/main/ui_generated_800x480land/actions.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ 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);
2222
extern void action_gesture(lv_event_t * e);
23+
extern void action_value_clicked(lv_event_t * e);
24+
extern void action_value_keyboard_ok(lv_event_t * e);
2325

2426

2527
#ifdef __cplusplus

source/main/ui_generated_800x480land/screens.c

Lines changed: 333 additions & 82 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)