Skip to content

Commit f35d99e

Browse files
author
Greg Smith
committed
Added flashing BPM indicator to all 1.69" LCD platforms.
1 parent 68a41a6 commit f35d99e

File tree

13 files changed

+149
-13
lines changed

13 files changed

+149
-13
lines changed

‎source/main/display.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static const char *TAG = "app_display";
8383

8484
#define DISPLAY_TASK_STACK_SIZE (6 * 1024)
8585

86-
#if CONFIG_TONEX_CONTROLLER_DISPLAY_FULL_UI && CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR
86+
#if CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR
8787
//static lv_anim_t *ui_BPMAnimation = NULL;
8888
//static lv_anim_t PropertyAnimation_0;
8989
void ui_BPMAnimate(lv_obj_t *TargetObject, uint32_t duration);
@@ -1291,7 +1291,7 @@ static __attribute__((unused)) uint8_t update_ui_element(tUIUpdate* update)
12911291
return 1;
12921292
}
12931293

1294-
#if CONFIG_TONEX_CONTROLLER_DISPLAY_FULL_UI && CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR
1294+
#if CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR
12951295

12961296
/****************************************************************************
12971297
* NAME:

‎source/main/display_tonex.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2475,6 +2475,10 @@ uint8_t tonex_update_ui_parameters(void)
24752475
char buf[128];
24762476
sprintf(buf, "%d", (int)round(param_entry->Value));
24772477
lv_label_set_text(objects.ui_bpm, buf);
2478+
2479+
#if CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR
2480+
ui_BPMAnimate(objects.ui_bpm_indicator, 1000 * 60 / param_entry->Value);
2481+
#endif
24782482
} break;
24792483

24802484
case TONEX_PARAM_COMP_ENABLE:

‎source/main/display_valeton.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3090,6 +3090,10 @@ uint8_t valeton_update_ui_parameters(void)
30903090
char buf[128];
30913091
sprintf(buf, "%d", (int)round(param_entry->Value));
30923092
lv_label_set_text(objects.ui_bpm, buf);
3093+
3094+
#if CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR
3095+
ui_BPMAnimate(objects.ui_bpm_indicator, 1000 * 60 / param_entry->Value);
3096+
#endif
30933097
} break;
30943098

30953099
case VALETON_PARAM_DIST_ENABLE:

‎source/main/ui_generated_240x280port/screens.c‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ void create_screen_screen1() {
199199
// ui_BPMLabel
200200
lv_obj_t *obj = lv_label_create(parent_obj);
201201
objects.ui_bpm_label = obj;
202-
lv_obj_set_pos(obj, 181, 56);
202+
lv_obj_set_pos(obj, 181, 50);
203203
lv_obj_set_size(obj, 53, LV_SIZE_CONTENT);
204204
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
205205
lv_obj_set_style_text_font(obj, &lv_font_montserrat_20, LV_PART_MAIN | LV_STATE_DEFAULT);
@@ -210,14 +210,25 @@ void create_screen_screen1() {
210210
// ui_BPM
211211
lv_obj_t *obj = lv_label_create(parent_obj);
212212
objects.ui_bpm = obj;
213-
lv_obj_set_pos(obj, 181, 84);
213+
lv_obj_set_pos(obj, 181, 70);
214214
lv_obj_set_size(obj, 53, LV_SIZE_CONTENT);
215215
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
216216
lv_obj_set_style_text_font(obj, &lv_font_montserrat_30, LV_PART_MAIN | LV_STATE_DEFAULT);
217217
lv_obj_set_style_text_color(obj, lv_color_hex(0xffffffff), LV_PART_MAIN | LV_STATE_DEFAULT);
218218
lv_obj_set_style_text_align(obj, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
219219
lv_label_set_text(obj, "128");
220220
}
221+
{
222+
// ui_BPMIndicator
223+
lv_obj_t *obj = lv_obj_create(parent_obj);
224+
objects.ui_bpm_indicator = obj;
225+
lv_obj_set_pos(obj, 195, 101);
226+
lv_obj_set_size(obj, 25, 25);
227+
lv_obj_set_style_bg_color(obj, lv_color_hex(0xffd1a60c), LV_PART_MAIN | LV_STATE_DEFAULT);
228+
lv_obj_set_style_bg_grad_dir(obj, LV_GRAD_DIR_VER, LV_PART_MAIN | LV_STATE_DEFAULT);
229+
lv_obj_set_style_bg_grad_color(obj, lv_color_hex(0xffd1b44d), LV_PART_MAIN | LV_STATE_DEFAULT);
230+
lv_obj_set_style_radius(obj, 20, LV_PART_MAIN | LV_STATE_DEFAULT);
231+
}
221232
{
222233
// BottomContainer
223234
lv_obj_t *obj = lv_obj_create(parent_obj);

‎source/main/ui_generated_240x280port/screens.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ typedef struct _objects_t {
2525
lv_obj_t *ui_preset_heading_label;
2626
lv_obj_t *ui_bpm_label;
2727
lv_obj_t *ui_bpm;
28+
lv_obj_t *ui_bpm_indicator;
2829
lv_obj_t *bottom_container;
2930
lv_obj_t *ui_preset_heading_label2;
3031
} objects_t;

‎source/main/ui_generated_280x240land/screens.c‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void create_screen_screen1() {
217217
// ui_BPMLabel
218218
lv_obj_t *obj = lv_label_create(parent_obj);
219219
objects.ui_bpm_label = obj;
220-
lv_obj_set_pos(obj, 47, 60);
220+
lv_obj_set_pos(obj, 43, 60);
221221
lv_obj_set_size(obj, 53, LV_SIZE_CONTENT);
222222
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
223223
lv_obj_set_style_text_font(obj, &lv_font_montserrat_20, LV_PART_MAIN | LV_STATE_DEFAULT);
@@ -229,15 +229,26 @@ void create_screen_screen1() {
229229
// ui_BPM
230230
lv_obj_t *obj = lv_label_create(parent_obj);
231231
objects.ui_bpm = obj;
232-
lv_obj_set_pos(obj, 74, 60);
232+
lv_obj_set_pos(obj, 60, 60);
233233
lv_obj_set_size(obj, 53, LV_SIZE_CONTENT);
234234
lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
235-
lv_obj_set_style_text_font(obj, &lv_font_montserrat_30, LV_PART_MAIN | LV_STATE_DEFAULT);
235+
lv_obj_set_style_text_font(obj, &lv_font_montserrat_24, LV_PART_MAIN | LV_STATE_DEFAULT);
236236
lv_obj_set_style_text_color(obj, lv_color_hex(0xffffffff), LV_PART_MAIN | LV_STATE_DEFAULT);
237237
lv_obj_set_style_text_align(obj, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN | LV_STATE_DEFAULT);
238238
lv_obj_set_style_transform_angle(obj, -900, LV_PART_MAIN | LV_STATE_DEFAULT);
239239
lv_label_set_text(obj, "128");
240240
}
241+
{
242+
// ui_BPMIndicator
243+
lv_obj_t *obj = lv_obj_create(parent_obj);
244+
objects.ui_bpm_indicator = obj;
245+
lv_obj_set_pos(obj, 84, 24);
246+
lv_obj_set_size(obj, 24, 24);
247+
lv_obj_set_style_bg_color(obj, lv_color_hex(0xffd1a60c), LV_PART_MAIN | LV_STATE_DEFAULT);
248+
lv_obj_set_style_bg_grad_dir(obj, LV_GRAD_DIR_VER, LV_PART_MAIN | LV_STATE_DEFAULT);
249+
lv_obj_set_style_bg_grad_color(obj, lv_color_hex(0xffd1b44d), LV_PART_MAIN | LV_STATE_DEFAULT);
250+
lv_obj_set_style_radius(obj, 20, LV_PART_MAIN | LV_STATE_DEFAULT);
251+
}
241252
{
242253
// BottomContainer
243254
lv_obj_t *obj = lv_obj_create(parent_obj);

‎source/main/ui_generated_280x240land/screens.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ typedef struct _objects_t {
2525
lv_obj_t *ui_preset_heading_label;
2626
lv_obj_t *ui_bpm_label;
2727
lv_obj_t *ui_bpm;
28+
lv_obj_t *ui_bpm_indicator;
2829
lv_obj_t *bottom_container;
2930
lv_obj_t *ui_preset_heading_label2;
3031
} objects_t;

‎source/sdkconfig.ws169‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CONFIG_SPIRAM_MODE_OCT=y
1212
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y
1313
CONFIG_LV_COLOR_16_SWAP=y
1414
CONFIG_LV_COLOR_SCREEN_TRANSP=y
15+
CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR=y
1516
CONFIG_TONEX_CONTROLLER_HARDWARE_PLATFORM_WAVESHARE_169=y
1617
CONFIG_TONEX_CONTROLLER_HAS_DISPLAY=y
1718
CONFIG_TONEX_CONTROLLER_DISPLAY_SMALL=y

‎source/sdkconfig.ws169land‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CONFIG_LV_COLOR_SCREEN_TRANSP=y
1515
CONFIG_TONEX_CONTROLLER_HARDWARE_PLATFORM_WAVESHARE_169=y
1616
CONFIG_TONEX_CONTROLLER_HAS_DISPLAY=y
1717
CONFIG_TONEX_CONTROLLER_DISPLAY_SMALL=y
18+
CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR=y
1819
CONFIG_TONEX_CONTROLLER_GPIO_FOOTSWITCHES=y
1920
CONFIG_TONEX_CONTROLLER_WAVESHARE_169_LANDSCAPE=y
2021
CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y

‎source/sdkconfig.ws169t‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CONFIG_LV_COLOR_SCREEN_TRANSP=y
1515
CONFIG_TONEX_CONTROLLER_HARDWARE_PLATFORM_WAVESHARE_169TOUCH=y
1616
CONFIG_TONEX_CONTROLLER_HAS_DISPLAY=y
1717
CONFIG_TONEX_CONTROLLER_DISPLAY_SMALL=y
18+
CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR=y
1819
CONFIG_TONEX_CONTROLLER_GPIO_FOOTSWITCHES=y
1920
CONFIG_TONEX_CONTROLLER_HAS_TOUCH=y
2021
CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y

0 commit comments

Comments
 (0)