Skip to content

Commit d9bbab9

Browse files
fbiegofbiego
committed
update lvgl api v8
1 parent 26192e1 commit d9bbab9

File tree

34 files changed

+1964
-1963
lines changed

34 files changed

+1964
-1963
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
.DS_Store
77
prefs.txt
88
**/convert.py
9+
scripts/api_migrate.py

‎hal/esp32/app_hal.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ void connectionCallback(bool state)
890890
void ringerCallback(String caller, bool state)
891891
{
892892
lv_disp_t *display = lv_disp_get_default();
893-
lv_obj_t *actScr = lv_disp_get_screen_active(display);
893+
lv_obj_t *actScr = lv_disp_get_scr_act(display);
894894

895895
if (state)
896896
{

‎src/apps/attitude/attitude.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void ui_event_attiudeScreen(lv_event_t *e)
7878
onGameClosed();
7979
}
8080

81-
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT)
81+
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_active()) == LV_DIR_RIGHT)
8282
{
8383
ui_app_exit();
8484
}
@@ -89,51 +89,51 @@ void ui_attiudeScreen_screen_init()
8989
{
9090

9191
ui_attiudeScreen = lv_obj_create(NULL);
92-
lv_obj_clear_flag(ui_attiudeScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
92+
lv_obj_remove_flag(ui_attiudeScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
9393

94-
ui_img_dial_bg = lv_img_create(ui_attiudeScreen);
95-
lv_img_set_src(ui_img_dial_bg, &ui_img_dial_bg_png);
94+
ui_img_dial_bg = lv_image_create(ui_attiudeScreen);
95+
lv_image_set_src(ui_img_dial_bg, &ui_img_dial_bg_png);
9696
lv_obj_set_width(ui_img_dial_bg, LV_SIZE_CONTENT); /// 1
9797
lv_obj_set_height(ui_img_dial_bg, LV_SIZE_CONTENT); /// 1
9898
lv_obj_set_align(ui_img_dial_bg, LV_ALIGN_CENTER);
9999
lv_obj_add_flag(ui_img_dial_bg, LV_OBJ_FLAG_ADV_HITTEST); /// Flags
100-
lv_obj_clear_flag(ui_img_dial_bg, LV_OBJ_FLAG_SCROLLABLE); /// Flags
100+
lv_obj_remove_flag(ui_img_dial_bg, LV_OBJ_FLAG_SCROLLABLE); /// Flags
101101

102-
ui_img_pitch_scale = lv_img_create(ui_attiudeScreen);
103-
lv_img_set_src(ui_img_pitch_scale, &ui_img_pitch_scale_png);
102+
ui_img_pitch_scale = lv_image_create(ui_attiudeScreen);
103+
lv_image_set_src(ui_img_pitch_scale, &ui_img_pitch_scale_png);
104104
lv_obj_set_width(ui_img_pitch_scale, LV_SIZE_CONTENT); /// 1
105105
lv_obj_set_height(ui_img_pitch_scale, LV_SIZE_CONTENT); /// 1
106106
lv_obj_set_align(ui_img_pitch_scale, LV_ALIGN_CENTER);
107107
lv_obj_add_flag(ui_img_pitch_scale, LV_OBJ_FLAG_ADV_HITTEST); /// Flags
108-
lv_obj_clear_flag(ui_img_pitch_scale, LV_OBJ_FLAG_SCROLLABLE); /// Flags
108+
lv_obj_remove_flag(ui_img_pitch_scale, LV_OBJ_FLAG_SCROLLABLE); /// Flags
109109

110-
ui_img_dum_scale = lv_img_create(ui_attiudeScreen);
111-
lv_img_set_src(ui_img_dum_scale, &ui_img_roll_scale2_png);
110+
ui_img_dum_scale = lv_image_create(ui_attiudeScreen);
111+
lv_image_set_src(ui_img_dum_scale, &ui_img_roll_scale2_png);
112112
lv_obj_set_width(ui_img_dum_scale, LV_SIZE_CONTENT); /// 300
113113
lv_obj_set_height(ui_img_dum_scale, LV_SIZE_CONTENT); /// 300
114114
lv_obj_set_align(ui_img_dum_scale, LV_ALIGN_CENTER);
115115
lv_obj_add_flag(ui_img_dum_scale, LV_OBJ_FLAG_ADV_HITTEST); /// Flags
116-
lv_obj_clear_flag(ui_img_dum_scale, LV_OBJ_FLAG_SCROLLABLE); /// Flags
116+
lv_obj_remove_flag(ui_img_dum_scale, LV_OBJ_FLAG_SCROLLABLE); /// Flags
117117

118-
ui_img_roll_scale = lv_img_create(ui_attiudeScreen);
119-
lv_img_set_src(ui_img_roll_scale, &ui_img_roll_scale_png);
118+
ui_img_roll_scale = lv_image_create(ui_attiudeScreen);
119+
lv_image_set_src(ui_img_roll_scale, &ui_img_roll_scale_png);
120120
lv_obj_set_width(ui_img_roll_scale, LV_SIZE_CONTENT); /// 1
121121
lv_obj_set_height(ui_img_roll_scale, LV_SIZE_CONTENT); /// 1
122122
lv_obj_set_x(ui_img_roll_scale, 0);
123123
lv_obj_set_y(ui_img_roll_scale, 1);
124124
lv_obj_set_align(ui_img_roll_scale, LV_ALIGN_CENTER);
125125
lv_obj_add_flag(ui_img_roll_scale, LV_OBJ_FLAG_ADV_HITTEST); /// Flags
126-
lv_obj_clear_flag(ui_img_roll_scale, LV_OBJ_FLAG_SCROLLABLE); /// Flags
126+
lv_obj_remove_flag(ui_img_roll_scale, LV_OBJ_FLAG_SCROLLABLE); /// Flags
127127

128-
ui_img_pointer = lv_img_create(ui_attiudeScreen);
129-
lv_img_set_src(ui_img_pointer, &ui_img_pointer_png);
128+
ui_img_pointer = lv_image_create(ui_attiudeScreen);
129+
lv_image_set_src(ui_img_pointer, &ui_img_pointer_png);
130130
lv_obj_set_width(ui_img_pointer, LV_SIZE_CONTENT); /// 8
131131
lv_obj_set_height(ui_img_pointer, LV_SIZE_CONTENT); /// 7
132132
lv_obj_set_x(ui_img_pointer, 1);
133133
lv_obj_set_y(ui_img_pointer, -27);
134134
lv_obj_set_align(ui_img_pointer, LV_ALIGN_CENTER);
135135
lv_obj_add_flag(ui_img_pointer, LV_OBJ_FLAG_ADV_HITTEST); /// Flags
136-
lv_obj_clear_flag(ui_img_pointer, LV_OBJ_FLAG_SCROLLABLE); /// Flags
136+
lv_obj_remove_flag(ui_img_pointer, LV_OBJ_FLAG_SCROLLABLE); /// Flags
137137

138138
ui_Label_roll = lv_label_create(ui_attiudeScreen);
139139
lv_obj_set_width(ui_Label_roll, LV_SIZE_CONTENT); /// 1
@@ -187,7 +187,7 @@ void update_pitch(int pitch_value, int pitch_rotation)
187187
}
188188
// Calculate the rotation angle in degrees for pitch
189189
int rotation_angle = pitch_rotation * -1; // Each 100 units corresponds to 10 degrees
190-
lv_img_set_angle(ui_img_pitch_scale, rotation_angle * 10); // LVGL uses 0.1 degree units
190+
lv_image_set_rotation(ui_img_pitch_scale, rotation_angle * 10); // LVGL uses 0.1 degree units
191191

192192
// Calculate the Y position
193193
int y_position = pitch_value * 2 * -1; // Each 10 pixels corresponds to 5 units
@@ -207,7 +207,7 @@ void update_roll(int roll_value)
207207
}
208208
// Calculate the rotation angle in degrees
209209
int rotation_angle = roll_value; // Each unit corresponds to 1 degree
210-
lv_img_set_angle(ui_img_roll_scale, rotation_angle * 10); // LVGL uses 0.1 degree units
210+
lv_image_set_rotation(ui_img_roll_scale, rotation_angle * 10); // LVGL uses 0.1 degree units
211211

212212
// Display positive degree on the right and negative degree on the left
213213
int display_angle = roll_value * -1; // Invert the roll value for display

‎src/apps/contacts/contacts.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void ui_event_contactScreen(lv_event_t *e)
3333

3434
}
3535

36-
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT)
36+
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_active()) == LV_DIR_RIGHT)
3737
{
3838
ui_app_exit();
3939
}
@@ -62,7 +62,7 @@ void addContact(const char *name, const char *number, bool sos)
6262
lv_obj_set_width(ui_contactPanel, 200);
6363
lv_obj_set_height(ui_contactPanel, 47);
6464
lv_obj_set_align(ui_contactPanel, LV_ALIGN_CENTER);
65-
lv_obj_clear_flag(ui_contactPanel, LV_OBJ_FLAG_SCROLLABLE); /// Flags
65+
lv_obj_remove_flag(ui_contactPanel, LV_OBJ_FLAG_SCROLLABLE); /// Flags
6666
lv_obj_set_style_radius(ui_contactPanel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
6767
lv_obj_set_style_bg_color(ui_contactPanel, lv_color_hex(0x000000), LV_PART_MAIN | LV_STATE_DEFAULT);
6868
lv_obj_set_style_bg_opa(ui_contactPanel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
@@ -75,15 +75,15 @@ void addContact(const char *name, const char *number, bool sos)
7575
lv_obj_set_style_pad_top(ui_contactPanel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
7676
lv_obj_set_style_pad_bottom(ui_contactPanel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
7777

78-
lv_obj_t *ui_contactIcon = lv_img_create(ui_contactPanel);
79-
lv_img_set_src(ui_contactIcon, sos ? &ui_img_sos_contact_png : &ui_img_contact_png);
78+
lv_obj_t *ui_contactIcon = lv_image_create(ui_contactPanel);
79+
lv_image_set_src(ui_contactIcon, sos ? &ui_img_sos_contact_png : &ui_img_contact_png);
8080
lv_obj_set_width(ui_contactIcon, LV_SIZE_CONTENT); /// 1
8181
lv_obj_set_height(ui_contactIcon, LV_SIZE_CONTENT); /// 1
8282
lv_obj_set_x(ui_contactIcon, 10);
8383
lv_obj_set_y(ui_contactIcon, 0);
8484
lv_obj_set_align(ui_contactIcon, LV_ALIGN_LEFT_MID);
8585
lv_obj_add_flag(ui_contactIcon, LV_OBJ_FLAG_ADV_HITTEST); /// Flags
86-
lv_obj_clear_flag(ui_contactIcon, LV_OBJ_FLAG_SCROLLABLE); /// Flags
86+
lv_obj_remove_flag(ui_contactIcon, LV_OBJ_FLAG_SCROLLABLE); /// Flags
8787

8888
lv_obj_t *ui_contactNumber = lv_label_create(ui_contactPanel);
8989
lv_obj_set_width(ui_contactNumber, 140);
@@ -128,7 +128,7 @@ void ui_contactScreen_screen_init()
128128

129129
#ifdef ENABLE_APP_CONTACTS
130130
ui_contactScreen = lv_obj_create(NULL);
131-
lv_obj_clear_flag(ui_contactScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
131+
lv_obj_remove_flag(ui_contactScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
132132
lv_obj_set_style_bg_color(ui_contactScreen, lv_color_hex(0x000000), LV_PART_MAIN | LV_STATE_DEFAULT);
133133
lv_obj_set_style_bg_opa(ui_contactScreen, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
134134

‎src/apps/navigation/navigation.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void ui_event_navScreen(lv_event_t *e)
4646
onGameClosed();
4747
}
4848

49-
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT)
49+
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_active()) == LV_DIR_RIGHT)
5050
{
5151
ui_app_exit();
5252
}
@@ -56,15 +56,15 @@ void ui_navScreen_screen_init()
5656
{
5757

5858
ui_navScreen = lv_obj_create(NULL);
59-
lv_obj_clear_flag(ui_navScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
59+
lv_obj_remove_flag(ui_navScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
6060
lv_obj_set_style_bg_color(ui_navScreen, lv_color_hex(0x000000), LV_PART_MAIN | LV_STATE_DEFAULT);
6161
lv_obj_set_style_bg_opa(ui_navScreen, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
6262

6363
ui_navPanel = lv_obj_create(ui_navScreen);
6464
lv_obj_set_width(ui_navPanel, 240);
6565
lv_obj_set_height(ui_navPanel, 240);
6666
lv_obj_set_align(ui_navPanel, LV_ALIGN_CENTER);
67-
lv_obj_clear_flag(ui_navPanel, LV_OBJ_FLAG_SCROLLABLE); /// Flags
67+
lv_obj_remove_flag(ui_navPanel, LV_OBJ_FLAG_SCROLLABLE); /// Flags
6868
lv_obj_set_style_radius(ui_navPanel, 120, LV_PART_MAIN | LV_STATE_DEFAULT);
6969
lv_obj_set_style_bg_color(ui_navPanel, lv_color_hex(0x000000), LV_PART_MAIN | LV_STATE_DEFAULT);
7070
lv_obj_set_style_bg_opa(ui_navPanel, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
@@ -109,7 +109,7 @@ void ui_navScreen_screen_init()
109109
lv_obj_set_x(ui_navIconCanvas, 0);
110110
lv_obj_set_y(ui_navIconCanvas, 68);
111111
lv_obj_set_align(ui_navIconCanvas, LV_ALIGN_TOP_MID);
112-
lv_obj_clear_flag(ui_navIconCanvas, LV_OBJ_FLAG_SCROLLABLE); /// Flags
112+
lv_obj_remove_flag(ui_navIconCanvas, LV_OBJ_FLAG_SCROLLABLE); /// Flags
113113
lv_obj_set_style_radius(ui_navIconCanvas, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
114114
lv_obj_set_style_bg_color(ui_navIconCanvas, lv_color_hex(0xFFFFFF), LV_PART_MAIN | LV_STATE_DEFAULT);
115115
lv_obj_set_style_bg_opa(ui_navIconCanvas, 255, LV_PART_MAIN | LV_STATE_DEFAULT);

‎src/apps/piobot/piobot.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ void ui_event_pioScreen(lv_event_t *e)
115115
ui_pioScreen = NULL;
116116
}
117117

118-
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT)
118+
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_active()) == LV_DIR_RIGHT)
119119
{
120120
ui_app_exit();
121121
}
122122

123123

124-
lv_disp_t *display = lv_disp_get_default();
125-
lv_obj_t *actScr = lv_disp_get_scr_act(display);
124+
lv_disp_t *display = lv_display_get_default();
125+
lv_obj_t *actScr = lv_display_get_screen_active(display);
126126

127127
if (actScr != ui_pioScreen){
128128
return;

‎src/apps/qmi8658c/qmi8658c.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void ui_event_imuScreen(lv_event_t *e)
104104
onGameClosed();
105105
}
106106

107-
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT)
107+
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_active()) == LV_DIR_RIGHT)
108108
{
109109
ui_app_exit();
110110
}
@@ -123,7 +123,7 @@ void ui_event_imuScreen(lv_event_t *e)
123123
void ui_imuScreen_screen_init()
124124
{
125125
ui_imuScreen = lv_obj_create(NULL);
126-
lv_obj_clear_flag(ui_imuScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
126+
lv_obj_remove_flag(ui_imuScreen, LV_OBJ_FLAG_SCROLLABLE); /// Flags
127127
lv_obj_set_style_bg_color(ui_imuScreen, lv_color_hex(0x000000), LV_PART_MAIN | LV_STATE_DEFAULT);
128128
lv_obj_set_style_bg_opa(ui_imuScreen, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
129129

@@ -257,7 +257,7 @@ void ui_imuScreen_screen_init()
257257
// lv_obj_set_align(ui_rtwPanel, LV_ALIGN_CENTER);
258258
// lv_obj_set_flex_flow(ui_rtwPanel, LV_FLEX_FLOW_ROW);
259259
// lv_obj_set_flex_align(ui_rtwPanel, LV_FLEX_ALIGN_SPACE_BETWEEN, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
260-
// lv_obj_clear_flag(ui_rtwPanel, LV_OBJ_FLAG_SCROLLABLE); /// Flags
260+
// lv_obj_remove_flag(ui_rtwPanel, LV_OBJ_FLAG_SCROLLABLE); /// Flags
261261
// lv_obj_set_style_radius(ui_rtwPanel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
262262
// lv_obj_set_style_bg_color(ui_rtwPanel, lv_color_hex(0x000000), LV_PART_MAIN | LV_STATE_DEFAULT);
263263
// lv_obj_set_style_bg_opa(ui_rtwPanel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);

‎src/apps/timer/timer.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void ui_event_timerScreen(lv_event_t *e)
6363
onGameClosed();
6464
}
6565

66-
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_get_act()) == LV_DIR_RIGHT)
66+
if (event_code == LV_EVENT_GESTURE && lv_indev_get_gesture_dir(lv_indev_active()) == LV_DIR_RIGHT)
6767
{
6868
ui_app_exit();
6969
}
@@ -111,7 +111,7 @@ void start_timer_event(lv_event_t *e)
111111
lv_label_set_text(ui_customLabel1, "Stop");
112112
lv_obj_add_flag(ui_timerText, LV_OBJ_FLAG_HIDDEN);
113113
lv_obj_add_flag(ui_customTimer, LV_OBJ_FLAG_HIDDEN);
114-
lv_obj_clear_flag(ui_runningTimer, LV_OBJ_FLAG_HIDDEN);
114+
lv_obj_remove_flag(ui_runningTimer, LV_OBJ_FLAG_HIDDEN);
115115

116116
lv_label_set_text_fmt(ui_timerinfo, "%02d:%02d", minutes, seconds);
117117

@@ -123,7 +123,7 @@ void start_timer_event(lv_event_t *e)
123123
void stop_timer_event(lv_event_t *e)
124124
{
125125
lv_obj_add_flag(ui_runningTimer, LV_OBJ_FLAG_HIDDEN);
126-
lv_obj_clear_flag(ui_customTimer, LV_OBJ_FLAG_HIDDEN);
126+
lv_obj_remove_flag(ui_customTimer, LV_OBJ_FLAG_HIDDEN);
127127

128128
if (time_timer != NULL)
129129
{

‎src/faces/1041/1041.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ lv_obj_t *face_1041_33_205280;
2828
void init_face_1041(void (*callback)(const char*, const lv_img_dsc_t *, lv_obj_t **, lv_obj_t **)){
2929
#ifdef ENABLE_FACE_1041
3030
face_1041 = lv_obj_create(NULL);
31-
lv_obj_clear_flag(face_1041, LV_OBJ_FLAG_SCROLLABLE);
31+
lv_obj_remove_flag(face_1041, LV_OBJ_FLAG_SCROLLABLE);
3232
lv_obj_set_style_bg_color(face_1041, lv_color_hex(0x000000), LV_PART_MAIN | LV_STATE_DEFAULT);
3333
lv_obj_set_style_bg_opa(face_1041, 255, LV_PART_MAIN | LV_STATE_DEFAULT);
3434
lv_obj_set_style_border_width(face_1041, 0, LV_PART_MAIN| LV_STATE_DEFAULT);
@@ -40,44 +40,44 @@ void init_face_1041(void (*callback)(const char*, const lv_img_dsc_t *, lv_obj_t
4040
lv_obj_add_event_cb(face_1041, onFaceEvent, LV_EVENT_ALL, NULL);
4141

4242

43-
face_1041_0_984 = lv_img_create(face_1041);
44-
lv_img_set_src(face_1041_0_984, &face_1041_dial_img_0_984_0);
43+
face_1041_0_984 = lv_image_create(face_1041);
44+
lv_image_set_src(face_1041_0_984, &face_1041_dial_img_0_984_0);
4545
lv_obj_set_width(face_1041_0_984, LV_SIZE_CONTENT);
4646
lv_obj_set_height(face_1041_0_984, LV_SIZE_CONTENT);
4747
lv_obj_set_x(face_1041_0_984, 0);
4848
lv_obj_set_y(face_1041_0_984, 0);
4949
lv_obj_add_flag(face_1041_0_984, LV_OBJ_FLAG_ADV_HITTEST );
50-
lv_obj_clear_flag(face_1041_0_984, LV_OBJ_FLAG_SCROLLABLE );
50+
lv_obj_remove_flag(face_1041_0_984, LV_OBJ_FLAG_SCROLLABLE );
5151

52-
face_1041_1_70612 = lv_img_create(face_1041);
53-
lv_img_set_src(face_1041_1_70612, &face_1041_dial_img_1_70612_0);
52+
face_1041_1_70612 = lv_image_create(face_1041);
53+
lv_image_set_src(face_1041_1_70612, &face_1041_dial_img_1_70612_0);
5454
lv_obj_set_width(face_1041_1_70612, LV_SIZE_CONTENT);
5555
lv_obj_set_height(face_1041_1_70612, LV_SIZE_CONTENT);
5656
lv_obj_set_x(face_1041_1_70612, 112);
5757
lv_obj_set_y(face_1041_1_70612, 71);
5858
lv_obj_add_flag(face_1041_1_70612, LV_OBJ_FLAG_ADV_HITTEST );
59-
lv_obj_clear_flag(face_1041_1_70612, LV_OBJ_FLAG_SCROLLABLE );
60-
lv_img_set_pivot(face_1041_1_70612, 8, 73);
59+
lv_obj_remove_flag(face_1041_1_70612, LV_OBJ_FLAG_SCROLLABLE );
60+
lv_image_set_pivot(face_1041_1_70612, 8, 73);
6161

62-
face_1041_17_117033 = lv_img_create(face_1041);
63-
lv_img_set_src(face_1041_17_117033, &face_1041_dial_img_17_117033_0);
62+
face_1041_17_117033 = lv_image_create(face_1041);
63+
lv_image_set_src(face_1041_17_117033, &face_1041_dial_img_17_117033_0);
6464
lv_obj_set_width(face_1041_17_117033, LV_SIZE_CONTENT);
6565
lv_obj_set_height(face_1041_17_117033, LV_SIZE_CONTENT);
6666
lv_obj_set_x(face_1041_17_117033, 112);
6767
lv_obj_set_y(face_1041_17_117033, 33);
6868
lv_obj_add_flag(face_1041_17_117033, LV_OBJ_FLAG_ADV_HITTEST );
69-
lv_obj_clear_flag(face_1041_17_117033, LV_OBJ_FLAG_SCROLLABLE );
70-
lv_img_set_pivot(face_1041_17_117033, 8, 111);
69+
lv_obj_remove_flag(face_1041_17_117033, LV_OBJ_FLAG_SCROLLABLE );
70+
lv_image_set_pivot(face_1041_17_117033, 8, 111);
7171

72-
face_1041_33_205280 = lv_img_create(face_1041);
73-
lv_img_set_src(face_1041_33_205280, &face_1041_dial_img_33_205280_0);
72+
face_1041_33_205280 = lv_image_create(face_1041);
73+
lv_image_set_src(face_1041_33_205280, &face_1041_dial_img_33_205280_0);
7474
lv_obj_set_width(face_1041_33_205280, LV_SIZE_CONTENT);
7575
lv_obj_set_height(face_1041_33_205280, LV_SIZE_CONTENT);
7676
lv_obj_set_x(face_1041_33_205280, 106);
7777
lv_obj_set_y(face_1041_33_205280, 29);
7878
lv_obj_add_flag(face_1041_33_205280, LV_OBJ_FLAG_ADV_HITTEST );
79-
lv_obj_clear_flag(face_1041_33_205280, LV_OBJ_FLAG_SCROLLABLE );
80-
lv_img_set_pivot(face_1041_33_205280, 14, 115);
79+
lv_obj_remove_flag(face_1041_33_205280, LV_OBJ_FLAG_SCROLLABLE );
80+
lv_image_set_pivot(face_1041_33_205280, 14, 115);
8181

8282

8383
callback("1041", &face_1041_dial_img_preview_0, &face_1041, &face_1041_33_205280);
@@ -92,8 +92,8 @@ void update_time_1041(int second, int minute, int hour, bool mode, bool am, int
9292
{
9393
return;
9494
}
95-
lv_img_set_angle(face_1041_1_70612, hour * 300 + (minute * 5) + (second * (5 / 60)));
96-
lv_img_set_angle(face_1041_17_117033, (minute * 60) + second);
95+
lv_image_set_rotation(face_1041_1_70612, hour * 300 + (minute * 5) + (second * (5 / 60)));
96+
lv_image_set_rotation(face_1041_17_117033, (minute * 60) + second);
9797

9898
#endif
9999
}

0 commit comments

Comments
 (0)