char与const char * 不匹配,不报错但是无法显示内容
This commit is contained in:
parent
90f0e32cfe
commit
85021d8c3b
|
@ -2,7 +2,7 @@
|
||||||
* @Author: wujunchao wujunchao@wuxismart.com
|
* @Author: wujunchao wujunchao@wuxismart.com
|
||||||
* @Date: 2024-12-27 11:51:06
|
* @Date: 2024-12-27 11:51:06
|
||||||
* @LastEditors: wujunchao wujunchao@wuxismart.com
|
* @LastEditors: wujunchao wujunchao@wuxismart.com
|
||||||
* @LastEditTime: 2025-01-13 15:40:41
|
* @LastEditTime: 2025-01-13 19:24:32
|
||||||
* @FilePath: \signal_generator\App\APP_WU\Inc\apps_gather.h
|
* @FilePath: \signal_generator\App\APP_WU\Inc\apps_gather.h
|
||||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||||
*/
|
*/
|
||||||
|
@ -53,9 +53,9 @@ extern const lv_img_dsc_t * screen_main_animimg_1_imgs[6];
|
||||||
#define SCREEN_INIT 0
|
#define SCREEN_INIT 0
|
||||||
#define SCREEN_INIT_CNT_MAX 4
|
#define SCREEN_INIT_CNT_MAX 4
|
||||||
#define SCREEN_MAIN 1
|
#define SCREEN_MAIN 1
|
||||||
#define IO_CURSOR_START1 123 //用于改变直线位置
|
#define IO_CURSOR_START1 149 //用于改变直线位置
|
||||||
#define IO_CURSOR_START2 190
|
#define IO_CURSOR_START2 209
|
||||||
#define IO_CURSOR_INTERVAL 20
|
#define IO_CURSOR_INTERVAL 17
|
||||||
#define SCREEN_SETTING 2
|
#define SCREEN_SETTING 2
|
||||||
|
|
||||||
// void menu_test2(void); //竖屏,3个进度条,sggt_test_02
|
// void menu_test2(void); //竖屏,3个进度条,sggt_test_02
|
||||||
|
@ -107,9 +107,10 @@ typedef struct
|
||||||
char runtime_show[8];
|
char runtime_show[8];
|
||||||
uint8_t battery_cnt;
|
uint8_t battery_cnt;
|
||||||
uint8_t io_cursor; //光标位置, [000,000], 0~5整数表示6个位置
|
uint8_t io_cursor; //光标位置, [000,000], 0~5整数表示6个位置
|
||||||
char io_numbers[7]; //实时显示的字符
|
char io_numbers[6]; //实时显示的字符
|
||||||
uint16_t io_number_L; //小数点左三位
|
// uint16_t io_number_L; //小数点左三位
|
||||||
uint16_t io_number_R; //小数点右三位
|
// uint16_t io_number_R; //小数点右三位
|
||||||
|
|
||||||
//screen_setting
|
//screen_setting
|
||||||
|
|
||||||
}MENU_DATA;
|
}MENU_DATA;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* @Author: wujunchao wujunchao@wuxismart.com
|
* @Author: wujunchao wujunchao@wuxismart.com
|
||||||
* @Date: 2024-12-27 11:50:56
|
* @Date: 2024-12-27 11:50:56
|
||||||
* @LastEditors: wujunchao wujunchao@wuxismart.com
|
* @LastEditors: wujunchao wujunchao@wuxismart.com
|
||||||
* @LastEditTime: 2025-01-13 16:31:02
|
* @LastEditTime: 2025-01-13 20:25:55
|
||||||
* @FilePath: \signal_generator\App\APP_WU\Src\apps_gather.c
|
* @FilePath: \signal_generator\App\APP_WU\Src\apps_gather.c
|
||||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||||
*/
|
*/
|
||||||
|
@ -30,8 +30,11 @@ void menu_data_init(void)
|
||||||
m5data.runtime_hours = 0;
|
m5data.runtime_hours = 0;
|
||||||
m5data.battery_cnt = 0;
|
m5data.battery_cnt = 0;
|
||||||
m5data.io_cursor = 3;
|
m5data.io_cursor = 3;
|
||||||
m5data.io_number_L = 0;
|
for(uint8_t i = 0; i < 6; i++)
|
||||||
m5data.io_number_R = 0;
|
{
|
||||||
|
m5data.io_numbers[i] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
//screen_setting
|
//screen_setting
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,71 +81,46 @@ void key_functions_main(void) //按键功能
|
||||||
{
|
{
|
||||||
key = 0;
|
key = 0;
|
||||||
|
|
||||||
if(m5data.io_cursor <= 2)
|
switch (m5data.io_cursor)
|
||||||
{
|
{
|
||||||
uint16_t l0 = 0, l1 = 0, l2 = 0;
|
case 0:
|
||||||
l0 = m5data.io_number_L / 100;
|
|
||||||
l1 = (m5data.io_number_L % 100) / 10;
|
|
||||||
l2 = m5data.io_number_L % 10;
|
|
||||||
|
|
||||||
switch (m5data.io_cursor)
|
|
||||||
{
|
{
|
||||||
case 0:
|
m5data.io_numbers[0] = (m5data.io_numbers[0] >= 9)?(0):(m5data.io_numbers[0] + 1);
|
||||||
{
|
|
||||||
l0 = (l0 >= 9)?(0):(l0 + 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 1:
|
|
||||||
{
|
|
||||||
l1 = (l1 >= 9)?(0):(l1 + 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 2:
|
|
||||||
{
|
|
||||||
l2 = (l2 >= 9)?(0):(l2 + 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
m5data.io_number_L = 100*l0 + 10*l1 + l2;
|
case 1:
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
uint16_t r3 = 0, r4 = 0, r5 = 0;
|
|
||||||
r3 = m5data.io_number_R / 100;
|
|
||||||
r4 = (m5data.io_number_R % 100) / 10;
|
|
||||||
r5 = m5data.io_number_R % 10;
|
|
||||||
|
|
||||||
switch (m5data.io_cursor)
|
|
||||||
{
|
{
|
||||||
case 3:
|
m5data.io_numbers[1] = (m5data.io_numbers[1] >= 9)?(0):(m5data.io_numbers[1] + 1);
|
||||||
{
|
|
||||||
r3 = (r3 >= 9)?(0):(r3 + 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 4:
|
|
||||||
{
|
|
||||||
r4 = (r4 >= 9)?(0):(r4 + 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 5:
|
|
||||||
{
|
|
||||||
r5 = (r5 >= 9)?(0):(r5 + 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
m5data.io_number_R = 100*r3 + 10*r4 + r5;
|
case 2:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[2] = (m5data.io_numbers[2] >= 9)?(0):(m5data.io_numbers[2] + 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 3:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[3] = (m5data.io_numbers[3] >= 9)?(0):(m5data.io_numbers[3] + 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 4:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[4] = (m5data.io_numbers[4] >= 9)?(0):(m5data.io_numbers[4] + 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 5:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[5] = (m5data.io_numbers[5] >= 9)?(0):(m5data.io_numbers[5] + 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -197,71 +175,46 @@ void key_functions_main(void) //按键功能
|
||||||
{
|
{
|
||||||
key = 0;
|
key = 0;
|
||||||
|
|
||||||
if(m5data.io_cursor <= 2)
|
switch (m5data.io_cursor)
|
||||||
{
|
{
|
||||||
uint16_t l0 = 0, l1 = 0, l2 = 0;
|
case 0:
|
||||||
l0 = m5data.io_number_L / 100;
|
|
||||||
l1 = (m5data.io_number_L % 100) / 10;
|
|
||||||
l2 = m5data.io_number_L % 10;
|
|
||||||
|
|
||||||
switch (m5data.io_cursor)
|
|
||||||
{
|
{
|
||||||
case 0:
|
m5data.io_numbers[0] = (m5data.io_numbers[0] <= 0)?(9):(m5data.io_numbers[0] - 1);
|
||||||
{
|
|
||||||
l0 = (l0 <= 0)?(9):(l0 - 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 1:
|
|
||||||
{
|
|
||||||
l1 = (l1 <= 0)?(9):(l1 - 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 2:
|
|
||||||
{
|
|
||||||
l2 = (l2 <= 0)?(9):(l2 - 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
m5data.io_number_L = 100*l0 + 10*l1 + l2;
|
case 1:
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
uint16_t r3 = 0, r4 = 0, r5 = 0;
|
|
||||||
r3 = m5data.io_number_R / 100;
|
|
||||||
r4 = (m5data.io_number_R % 100) / 10;
|
|
||||||
r5 = m5data.io_number_R % 10;
|
|
||||||
|
|
||||||
switch (m5data.io_cursor)
|
|
||||||
{
|
{
|
||||||
case 3:
|
m5data.io_numbers[1] = (m5data.io_numbers[1] <= 0)?(9):(m5data.io_numbers[1] - 1);
|
||||||
{
|
|
||||||
r3 = (r3 <= 0)?(9):(r3 - 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 4:
|
|
||||||
{
|
|
||||||
r4 = (r4 <= 0)?(9):(r4 - 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 5:
|
|
||||||
{
|
|
||||||
r5 = (r5 <= 0)?(9):(r5 - 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
m5data.io_number_R = 100*r3 + 10*r4 + r5;
|
case 2:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[2] = (m5data.io_numbers[2] <= 0)?(9):(m5data.io_numbers[2] - 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 3:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[3] = (m5data.io_numbers[3] <= 0)?(9):(m5data.io_numbers[3] - 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 4:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[4] = (m5data.io_numbers[4] <= 0)?(9):(m5data.io_numbers[4] - 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 5:
|
||||||
|
{
|
||||||
|
m5data.io_numbers[5] = (m5data.io_numbers[5] <= 0)?(9):(m5data.io_numbers[5] - 1);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -389,8 +342,12 @@ void current_io(void) //当前输入&输出
|
||||||
lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START2 + (m5data.io_cursor -3 ) * IO_CURSOR_INTERVAL, 225);
|
lv_obj_set_pos(guider_ui.screen_main_line_1, IO_CURSOR_START2 + (m5data.io_cursor -3 ) * IO_CURSOR_INTERVAL, 225);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(m5data.io_numbers, "%03d.%03d", m5data.io_number_L, m5data.io_number_R);
|
lv_span_set_text(guider_ui.screen_main_spangroup_7_span, &m5data.io_numbers[0]);
|
||||||
lv_span_set_text(guider_ui.screen_main_spangroup_2_span, m5data.io_numbers);
|
lv_span_set_text(guider_ui.screen_main_spangroup_8_span, &m5data.io_numbers[1]);
|
||||||
|
lv_span_set_text(guider_ui.screen_main_spangroup_9_span, &m5data.io_numbers[2]);
|
||||||
|
lv_span_set_text(guider_ui.screen_main_spangroup_10_span, &m5data.io_numbers[3]);
|
||||||
|
lv_span_set_text(guider_ui.screen_main_spangroup_11_span, &m5data.io_numbers[4]);
|
||||||
|
lv_span_set_text(guider_ui.screen_main_spangroup_12_span, &m5data.io_numbers[5]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void scr_setting_run(void) //详细设置界面
|
void scr_setting_run(void) //详细设置界面
|
||||||
|
|
|
@ -30,8 +30,6 @@ typedef struct
|
||||||
lv_obj_t *screen_main_spangroup_1;
|
lv_obj_t *screen_main_spangroup_1;
|
||||||
lv_span_t *screen_main_spangroup_1_span;
|
lv_span_t *screen_main_spangroup_1_span;
|
||||||
lv_obj_t *screen_main_animimg_1;
|
lv_obj_t *screen_main_animimg_1;
|
||||||
lv_obj_t *screen_main_spangroup_2;
|
|
||||||
lv_span_t *screen_main_spangroup_2_span;
|
|
||||||
lv_obj_t *screen_main_spangroup_3;
|
lv_obj_t *screen_main_spangroup_3;
|
||||||
lv_span_t *screen_main_spangroup_3_span;
|
lv_span_t *screen_main_spangroup_3_span;
|
||||||
lv_obj_t *screen_main_spangroup_4;
|
lv_obj_t *screen_main_spangroup_4;
|
||||||
|
@ -41,6 +39,20 @@ typedef struct
|
||||||
lv_obj_t *screen_main_line_1;
|
lv_obj_t *screen_main_line_1;
|
||||||
lv_obj_t *screen_main_spangroup_6;
|
lv_obj_t *screen_main_spangroup_6;
|
||||||
lv_span_t *screen_main_spangroup_6_span;
|
lv_span_t *screen_main_spangroup_6_span;
|
||||||
|
lv_obj_t *screen_main_spangroup_7;
|
||||||
|
lv_span_t *screen_main_spangroup_7_span;
|
||||||
|
lv_obj_t *screen_main_spangroup_8;
|
||||||
|
lv_span_t *screen_main_spangroup_8_span;
|
||||||
|
lv_obj_t *screen_main_spangroup_9;
|
||||||
|
lv_span_t *screen_main_spangroup_9_span;
|
||||||
|
lv_obj_t *screen_main_spangroup_10;
|
||||||
|
lv_span_t *screen_main_spangroup_10_span;
|
||||||
|
lv_obj_t *screen_main_spangroup_11;
|
||||||
|
lv_span_t *screen_main_spangroup_11_span;
|
||||||
|
lv_obj_t *screen_main_spangroup_12;
|
||||||
|
lv_span_t *screen_main_spangroup_12_span;
|
||||||
|
lv_obj_t *screen_main_spangroup_13;
|
||||||
|
lv_span_t *screen_main_spangroup_13_span;
|
||||||
lv_obj_t *screen_setting;
|
lv_obj_t *screen_setting;
|
||||||
bool screen_setting_del;
|
bool screen_setting_del;
|
||||||
lv_obj_t *screen_setting_menu_1;
|
lv_obj_t *screen_setting_menu_1;
|
||||||
|
@ -91,10 +103,10 @@ LV_IMG_DECLARE(screen_main_animimg_1bt80);
|
||||||
LV_IMG_DECLARE(screen_main_animimg_1bt100);
|
LV_IMG_DECLARE(screen_main_animimg_1bt100);
|
||||||
|
|
||||||
LV_FONT_DECLARE(lv_font_montserratMedium_12)
|
LV_FONT_DECLARE(lv_font_montserratMedium_12)
|
||||||
LV_FONT_DECLARE(lv_font_montserratMedium_30)
|
|
||||||
LV_FONT_DECLARE(lv_font_montserratMedium_20)
|
LV_FONT_DECLARE(lv_font_montserratMedium_20)
|
||||||
LV_FONT_DECLARE(lv_font_montserratMedium_25)
|
LV_FONT_DECLARE(lv_font_montserratMedium_25)
|
||||||
LV_FONT_DECLARE(lv_font_montserratMedium_16)
|
LV_FONT_DECLARE(lv_font_montserratMedium_16)
|
||||||
|
LV_FONT_DECLARE(lv_font_montserratMedium_26)
|
||||||
LV_FONT_DECLARE(lv_font_SourceHanSerifSC_Regular_15)
|
LV_FONT_DECLARE(lv_font_SourceHanSerifSC_Regular_15)
|
||||||
LV_FONT_DECLARE(lv_font_SourceHanSerifSC_Regular_20)
|
LV_FONT_DECLARE(lv_font_SourceHanSerifSC_Regular_20)
|
||||||
LV_FONT_DECLARE(lv_font_SourceHanSerifSC_Regular_12)
|
LV_FONT_DECLARE(lv_font_SourceHanSerifSC_Regular_12)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -120,35 +120,6 @@ void setup_scr_screen_main(lv_ui *ui)
|
||||||
lv_obj_set_pos(ui->screen_main_animimg_1, 280, 0);
|
lv_obj_set_pos(ui->screen_main_animimg_1, 280, 0);
|
||||||
lv_obj_set_size(ui->screen_main_animimg_1, 40, 25);
|
lv_obj_set_size(ui->screen_main_animimg_1, 40, 25);
|
||||||
|
|
||||||
//Write codes screen_main_spangroup_2
|
|
||||||
ui->screen_main_spangroup_2 = lv_spangroup_create(ui->screen_main);
|
|
||||||
lv_spangroup_set_align(ui->screen_main_spangroup_2, LV_TEXT_ALIGN_LEFT);
|
|
||||||
lv_spangroup_set_overflow(ui->screen_main_spangroup_2, LV_SPAN_OVERFLOW_CLIP);
|
|
||||||
lv_spangroup_set_mode(ui->screen_main_spangroup_2, LV_SPAN_MODE_BREAK);
|
|
||||||
//create span
|
|
||||||
ui->screen_main_spangroup_2_span = lv_spangroup_new_span(ui->screen_main_spangroup_2);
|
|
||||||
lv_span_set_text(ui->screen_main_spangroup_2_span, "000.000");
|
|
||||||
lv_style_set_text_color(&ui->screen_main_spangroup_2_span->style, lv_color_hex(0x000000));
|
|
||||||
lv_style_set_text_decor(&ui->screen_main_spangroup_2_span->style, LV_TEXT_DECOR_NONE);
|
|
||||||
lv_style_set_text_font(&ui->screen_main_spangroup_2_span->style, &lv_font_montserratMedium_30);
|
|
||||||
lv_obj_set_pos(ui->screen_main_spangroup_2, 120, 195);
|
|
||||||
lv_obj_set_size(ui->screen_main_spangroup_2, 130, 25);
|
|
||||||
|
|
||||||
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_2_main_main_default
|
|
||||||
static lv_style_t style_screen_main_spangroup_2_main_main_default;
|
|
||||||
ui_init_style(&style_screen_main_spangroup_2_main_main_default);
|
|
||||||
|
|
||||||
lv_style_set_border_width(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_style_set_radius(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_style_set_bg_opa(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_style_set_pad_top(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_style_set_pad_right(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_style_set_pad_bottom(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_style_set_pad_left(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_style_set_shadow_width(&style_screen_main_spangroup_2_main_main_default, 0);
|
|
||||||
lv_obj_add_style(ui->screen_main_spangroup_2, &style_screen_main_spangroup_2_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
|
||||||
lv_spangroup_refr_mode(ui->screen_main_spangroup_2);
|
|
||||||
|
|
||||||
//Write codes screen_main_spangroup_3
|
//Write codes screen_main_spangroup_3
|
||||||
ui->screen_main_spangroup_3 = lv_spangroup_create(ui->screen_main);
|
ui->screen_main_spangroup_3 = lv_spangroup_create(ui->screen_main);
|
||||||
lv_spangroup_set_align(ui->screen_main_spangroup_3, LV_TEXT_ALIGN_LEFT);
|
lv_spangroup_set_align(ui->screen_main_spangroup_3, LV_TEXT_ALIGN_LEFT);
|
||||||
|
@ -189,7 +160,7 @@ void setup_scr_screen_main(lv_ui *ui)
|
||||||
lv_style_set_text_color(&ui->screen_main_spangroup_4_span->style, lv_color_hex(0x000000));
|
lv_style_set_text_color(&ui->screen_main_spangroup_4_span->style, lv_color_hex(0x000000));
|
||||||
lv_style_set_text_decor(&ui->screen_main_spangroup_4_span->style, LV_TEXT_DECOR_NONE);
|
lv_style_set_text_decor(&ui->screen_main_spangroup_4_span->style, LV_TEXT_DECOR_NONE);
|
||||||
lv_style_set_text_font(&ui->screen_main_spangroup_4_span->style, &lv_font_montserratMedium_25);
|
lv_style_set_text_font(&ui->screen_main_spangroup_4_span->style, &lv_font_montserratMedium_25);
|
||||||
lv_obj_set_pos(ui->screen_main_spangroup_4, 256, 197);
|
lv_obj_set_pos(ui->screen_main_spangroup_4, 260, 197);
|
||||||
lv_obj_set_size(ui->screen_main_spangroup_4, 60, 25);
|
lv_obj_set_size(ui->screen_main_spangroup_4, 60, 25);
|
||||||
|
|
||||||
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_4_main_main_default
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_4_main_main_default
|
||||||
|
@ -240,7 +211,7 @@ void setup_scr_screen_main(lv_ui *ui)
|
||||||
ui->screen_main_line_1 = lv_line_create(ui->screen_main);
|
ui->screen_main_line_1 = lv_line_create(ui->screen_main);
|
||||||
static lv_point_t screen_main_line_1[] = {{0, 0},{60, 0},};
|
static lv_point_t screen_main_line_1[] = {{0, 0},{60, 0},};
|
||||||
lv_line_set_points(ui->screen_main_line_1, screen_main_line_1, 2);
|
lv_line_set_points(ui->screen_main_line_1, screen_main_line_1, 2);
|
||||||
lv_obj_set_pos(ui->screen_main_line_1, 190, 225);
|
lv_obj_set_pos(ui->screen_main_line_1, 243, 225);
|
||||||
lv_obj_set_size(ui->screen_main_line_1, 12, 3);
|
lv_obj_set_size(ui->screen_main_line_1, 12, 3);
|
||||||
|
|
||||||
//Write style for screen_main_line_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
|
//Write style for screen_main_line_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT.
|
||||||
|
@ -278,6 +249,209 @@ void setup_scr_screen_main(lv_ui *ui)
|
||||||
lv_obj_add_style(ui->screen_main_spangroup_6, &style_screen_main_spangroup_6_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
lv_obj_add_style(ui->screen_main_spangroup_6, &style_screen_main_spangroup_6_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
lv_spangroup_refr_mode(ui->screen_main_spangroup_6);
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_6);
|
||||||
|
|
||||||
|
//Write codes screen_main_spangroup_7
|
||||||
|
ui->screen_main_spangroup_7 = lv_spangroup_create(ui->screen_main);
|
||||||
|
lv_spangroup_set_align(ui->screen_main_spangroup_7, LV_TEXT_ALIGN_LEFT);
|
||||||
|
lv_spangroup_set_overflow(ui->screen_main_spangroup_7, LV_SPAN_OVERFLOW_CLIP);
|
||||||
|
lv_spangroup_set_mode(ui->screen_main_spangroup_7, LV_SPAN_MODE_BREAK);
|
||||||
|
//create span
|
||||||
|
ui->screen_main_spangroup_7_span = lv_spangroup_new_span(ui->screen_main_spangroup_7);
|
||||||
|
lv_span_set_text(ui->screen_main_spangroup_7_span, "0");
|
||||||
|
lv_style_set_text_color(&ui->screen_main_spangroup_7_span->style, lv_color_hex(0x000000));
|
||||||
|
lv_style_set_text_decor(&ui->screen_main_spangroup_7_span->style, LV_TEXT_DECOR_NONE);
|
||||||
|
lv_style_set_text_font(&ui->screen_main_spangroup_7_span->style, &lv_font_montserratMedium_26);
|
||||||
|
lv_obj_set_pos(ui->screen_main_spangroup_7, 147, 197);
|
||||||
|
lv_obj_set_size(ui->screen_main_spangroup_7, 20, 20);
|
||||||
|
|
||||||
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_7_main_main_default
|
||||||
|
static lv_style_t style_screen_main_spangroup_7_main_main_default;
|
||||||
|
ui_init_style(&style_screen_main_spangroup_7_main_main_default);
|
||||||
|
|
||||||
|
lv_style_set_border_width(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_style_set_radius(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_style_set_bg_opa(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_style_set_pad_top(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_style_set_pad_right(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_style_set_pad_bottom(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_style_set_pad_left(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_style_set_shadow_width(&style_screen_main_spangroup_7_main_main_default, 0);
|
||||||
|
lv_obj_add_style(ui->screen_main_spangroup_7, &style_screen_main_spangroup_7_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_7);
|
||||||
|
|
||||||
|
//Write codes screen_main_spangroup_8
|
||||||
|
ui->screen_main_spangroup_8 = lv_spangroup_create(ui->screen_main);
|
||||||
|
lv_spangroup_set_align(ui->screen_main_spangroup_8, LV_TEXT_ALIGN_LEFT);
|
||||||
|
lv_spangroup_set_overflow(ui->screen_main_spangroup_8, LV_SPAN_OVERFLOW_CLIP);
|
||||||
|
lv_spangroup_set_mode(ui->screen_main_spangroup_8, LV_SPAN_MODE_BREAK);
|
||||||
|
//create span
|
||||||
|
ui->screen_main_spangroup_8_span = lv_spangroup_new_span(ui->screen_main_spangroup_8);
|
||||||
|
lv_span_set_text(ui->screen_main_spangroup_8_span, "0");
|
||||||
|
lv_style_set_text_color(&ui->screen_main_spangroup_8_span->style, lv_color_hex(0x000000));
|
||||||
|
lv_style_set_text_decor(&ui->screen_main_spangroup_8_span->style, LV_TEXT_DECOR_NONE);
|
||||||
|
lv_style_set_text_font(&ui->screen_main_spangroup_8_span->style, &lv_font_montserratMedium_26);
|
||||||
|
lv_obj_set_pos(ui->screen_main_spangroup_8, 164, 197);
|
||||||
|
lv_obj_set_size(ui->screen_main_spangroup_8, 20, 20);
|
||||||
|
|
||||||
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_8_main_main_default
|
||||||
|
static lv_style_t style_screen_main_spangroup_8_main_main_default;
|
||||||
|
ui_init_style(&style_screen_main_spangroup_8_main_main_default);
|
||||||
|
|
||||||
|
lv_style_set_border_width(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_style_set_radius(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_style_set_bg_opa(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_style_set_pad_top(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_style_set_pad_right(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_style_set_pad_bottom(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_style_set_pad_left(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_style_set_shadow_width(&style_screen_main_spangroup_8_main_main_default, 0);
|
||||||
|
lv_obj_add_style(ui->screen_main_spangroup_8, &style_screen_main_spangroup_8_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_8);
|
||||||
|
|
||||||
|
//Write codes screen_main_spangroup_9
|
||||||
|
ui->screen_main_spangroup_9 = lv_spangroup_create(ui->screen_main);
|
||||||
|
lv_spangroup_set_align(ui->screen_main_spangroup_9, LV_TEXT_ALIGN_LEFT);
|
||||||
|
lv_spangroup_set_overflow(ui->screen_main_spangroup_9, LV_SPAN_OVERFLOW_CLIP);
|
||||||
|
lv_spangroup_set_mode(ui->screen_main_spangroup_9, LV_SPAN_MODE_BREAK);
|
||||||
|
//create span
|
||||||
|
ui->screen_main_spangroup_9_span = lv_spangroup_new_span(ui->screen_main_spangroup_9);
|
||||||
|
lv_span_set_text(ui->screen_main_spangroup_9_span, "0");
|
||||||
|
lv_style_set_text_color(&ui->screen_main_spangroup_9_span->style, lv_color_hex(0x000000));
|
||||||
|
lv_style_set_text_decor(&ui->screen_main_spangroup_9_span->style, LV_TEXT_DECOR_NONE);
|
||||||
|
lv_style_set_text_font(&ui->screen_main_spangroup_9_span->style, &lv_font_montserratMedium_26);
|
||||||
|
lv_obj_set_pos(ui->screen_main_spangroup_9, 181, 197);
|
||||||
|
lv_obj_set_size(ui->screen_main_spangroup_9, 20, 20);
|
||||||
|
|
||||||
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_9_main_main_default
|
||||||
|
static lv_style_t style_screen_main_spangroup_9_main_main_default;
|
||||||
|
ui_init_style(&style_screen_main_spangroup_9_main_main_default);
|
||||||
|
|
||||||
|
lv_style_set_border_width(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_style_set_radius(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_style_set_bg_opa(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_style_set_pad_top(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_style_set_pad_right(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_style_set_pad_bottom(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_style_set_pad_left(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_style_set_shadow_width(&style_screen_main_spangroup_9_main_main_default, 0);
|
||||||
|
lv_obj_add_style(ui->screen_main_spangroup_9, &style_screen_main_spangroup_9_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_9);
|
||||||
|
|
||||||
|
//Write codes screen_main_spangroup_10
|
||||||
|
ui->screen_main_spangroup_10 = lv_spangroup_create(ui->screen_main);
|
||||||
|
lv_spangroup_set_align(ui->screen_main_spangroup_10, LV_TEXT_ALIGN_LEFT);
|
||||||
|
lv_spangroup_set_overflow(ui->screen_main_spangroup_10, LV_SPAN_OVERFLOW_CLIP);
|
||||||
|
lv_spangroup_set_mode(ui->screen_main_spangroup_10, LV_SPAN_MODE_BREAK);
|
||||||
|
//create span
|
||||||
|
ui->screen_main_spangroup_10_span = lv_spangroup_new_span(ui->screen_main_spangroup_10);
|
||||||
|
lv_span_set_text(ui->screen_main_spangroup_10_span, "0");
|
||||||
|
lv_style_set_text_color(&ui->screen_main_spangroup_10_span->style, lv_color_hex(0x000000));
|
||||||
|
lv_style_set_text_decor(&ui->screen_main_spangroup_10_span->style, LV_TEXT_DECOR_NONE);
|
||||||
|
lv_style_set_text_font(&ui->screen_main_spangroup_10_span->style, &lv_font_montserratMedium_26);
|
||||||
|
lv_obj_set_pos(ui->screen_main_spangroup_10, 207, 197);
|
||||||
|
lv_obj_set_size(ui->screen_main_spangroup_10, 20, 20);
|
||||||
|
|
||||||
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_10_main_main_default
|
||||||
|
static lv_style_t style_screen_main_spangroup_10_main_main_default;
|
||||||
|
ui_init_style(&style_screen_main_spangroup_10_main_main_default);
|
||||||
|
|
||||||
|
lv_style_set_border_width(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_style_set_radius(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_style_set_bg_opa(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_style_set_pad_top(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_style_set_pad_right(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_style_set_pad_bottom(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_style_set_pad_left(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_style_set_shadow_width(&style_screen_main_spangroup_10_main_main_default, 0);
|
||||||
|
lv_obj_add_style(ui->screen_main_spangroup_10, &style_screen_main_spangroup_10_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_10);
|
||||||
|
|
||||||
|
//Write codes screen_main_spangroup_11
|
||||||
|
ui->screen_main_spangroup_11 = lv_spangroup_create(ui->screen_main);
|
||||||
|
lv_spangroup_set_align(ui->screen_main_spangroup_11, LV_TEXT_ALIGN_LEFT);
|
||||||
|
lv_spangroup_set_overflow(ui->screen_main_spangroup_11, LV_SPAN_OVERFLOW_CLIP);
|
||||||
|
lv_spangroup_set_mode(ui->screen_main_spangroup_11, LV_SPAN_MODE_BREAK);
|
||||||
|
//create span
|
||||||
|
ui->screen_main_spangroup_11_span = lv_spangroup_new_span(ui->screen_main_spangroup_11);
|
||||||
|
lv_span_set_text(ui->screen_main_spangroup_11_span, "0");
|
||||||
|
lv_style_set_text_color(&ui->screen_main_spangroup_11_span->style, lv_color_hex(0x000000));
|
||||||
|
lv_style_set_text_decor(&ui->screen_main_spangroup_11_span->style, LV_TEXT_DECOR_NONE);
|
||||||
|
lv_style_set_text_font(&ui->screen_main_spangroup_11_span->style, &lv_font_montserratMedium_26);
|
||||||
|
lv_obj_set_pos(ui->screen_main_spangroup_11, 224, 197);
|
||||||
|
lv_obj_set_size(ui->screen_main_spangroup_11, 20, 20);
|
||||||
|
|
||||||
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_11_main_main_default
|
||||||
|
static lv_style_t style_screen_main_spangroup_11_main_main_default;
|
||||||
|
ui_init_style(&style_screen_main_spangroup_11_main_main_default);
|
||||||
|
|
||||||
|
lv_style_set_border_width(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_style_set_radius(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_style_set_bg_opa(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_style_set_pad_top(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_style_set_pad_right(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_style_set_pad_bottom(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_style_set_pad_left(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_style_set_shadow_width(&style_screen_main_spangroup_11_main_main_default, 0);
|
||||||
|
lv_obj_add_style(ui->screen_main_spangroup_11, &style_screen_main_spangroup_11_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_11);
|
||||||
|
|
||||||
|
//Write codes screen_main_spangroup_12
|
||||||
|
ui->screen_main_spangroup_12 = lv_spangroup_create(ui->screen_main);
|
||||||
|
lv_spangroup_set_align(ui->screen_main_spangroup_12, LV_TEXT_ALIGN_LEFT);
|
||||||
|
lv_spangroup_set_overflow(ui->screen_main_spangroup_12, LV_SPAN_OVERFLOW_CLIP);
|
||||||
|
lv_spangroup_set_mode(ui->screen_main_spangroup_12, LV_SPAN_MODE_BREAK);
|
||||||
|
//create span
|
||||||
|
ui->screen_main_spangroup_12_span = lv_spangroup_new_span(ui->screen_main_spangroup_12);
|
||||||
|
lv_span_set_text(ui->screen_main_spangroup_12_span, "0");
|
||||||
|
lv_style_set_text_color(&ui->screen_main_spangroup_12_span->style, lv_color_hex(0x000000));
|
||||||
|
lv_style_set_text_decor(&ui->screen_main_spangroup_12_span->style, LV_TEXT_DECOR_NONE);
|
||||||
|
lv_style_set_text_font(&ui->screen_main_spangroup_12_span->style, &lv_font_montserratMedium_26);
|
||||||
|
lv_obj_set_pos(ui->screen_main_spangroup_12, 241, 197);
|
||||||
|
lv_obj_set_size(ui->screen_main_spangroup_12, 20, 20);
|
||||||
|
|
||||||
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_12_main_main_default
|
||||||
|
static lv_style_t style_screen_main_spangroup_12_main_main_default;
|
||||||
|
ui_init_style(&style_screen_main_spangroup_12_main_main_default);
|
||||||
|
|
||||||
|
lv_style_set_border_width(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_style_set_radius(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_style_set_bg_opa(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_style_set_pad_top(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_style_set_pad_right(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_style_set_pad_bottom(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_style_set_pad_left(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_style_set_shadow_width(&style_screen_main_spangroup_12_main_main_default, 0);
|
||||||
|
lv_obj_add_style(ui->screen_main_spangroup_12, &style_screen_main_spangroup_12_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_12);
|
||||||
|
|
||||||
|
//Write codes screen_main_spangroup_13
|
||||||
|
ui->screen_main_spangroup_13 = lv_spangroup_create(ui->screen_main);
|
||||||
|
lv_spangroup_set_align(ui->screen_main_spangroup_13, LV_TEXT_ALIGN_LEFT);
|
||||||
|
lv_spangroup_set_overflow(ui->screen_main_spangroup_13, LV_SPAN_OVERFLOW_CLIP);
|
||||||
|
lv_spangroup_set_mode(ui->screen_main_spangroup_13, LV_SPAN_MODE_BREAK);
|
||||||
|
//create span
|
||||||
|
ui->screen_main_spangroup_13_span = lv_spangroup_new_span(ui->screen_main_spangroup_13);
|
||||||
|
lv_span_set_text(ui->screen_main_spangroup_13_span, ".");
|
||||||
|
lv_style_set_text_color(&ui->screen_main_spangroup_13_span->style, lv_color_hex(0x000000));
|
||||||
|
lv_style_set_text_decor(&ui->screen_main_spangroup_13_span->style, LV_TEXT_DECOR_NONE);
|
||||||
|
lv_style_set_text_font(&ui->screen_main_spangroup_13_span->style, &lv_font_montserratMedium_26);
|
||||||
|
lv_obj_set_pos(ui->screen_main_spangroup_13, 200, 197);
|
||||||
|
lv_obj_set_size(ui->screen_main_spangroup_13, 20, 20);
|
||||||
|
|
||||||
|
//Write style state: LV_STATE_DEFAULT for &style_screen_main_spangroup_13_main_main_default
|
||||||
|
static lv_style_t style_screen_main_spangroup_13_main_main_default;
|
||||||
|
ui_init_style(&style_screen_main_spangroup_13_main_main_default);
|
||||||
|
|
||||||
|
lv_style_set_border_width(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_style_set_radius(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_style_set_bg_opa(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_style_set_pad_top(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_style_set_pad_right(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_style_set_pad_bottom(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_style_set_pad_left(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_style_set_shadow_width(&style_screen_main_spangroup_13_main_main_default, 0);
|
||||||
|
lv_obj_add_style(ui->screen_main_spangroup_13, &style_screen_main_spangroup_13_main_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
|
||||||
|
lv_spangroup_refr_mode(ui->screen_main_spangroup_13);
|
||||||
|
|
||||||
//The custom code of screen_main.
|
//The custom code of screen_main.
|
||||||
|
|
||||||
|
|
||||||
|
|
58158
MDK-ARM/JLinkLog.txt
58158
MDK-ARM/JLinkLog.txt
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
|
@ -1549,6 +1549,11 @@
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_montserratMedium_25.c</FilePath>
|
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_montserratMedium_25.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
|
<File>
|
||||||
|
<FileName>lv_font_montserratMedium_26.c</FileName>
|
||||||
|
<FileType>1</FileType>
|
||||||
|
<FilePath>..\LVGL\myGUI\generated\guider_fonts\lv_font_montserratMedium_26.c</FilePath>
|
||||||
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<FileName>lv_font_montserratMedium_30.c</FileName>
|
<FileName>lv_font_montserratMedium_30.c</FileName>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue