diff --git a/build_all.sh b/build_all.sh index 1b9785abd..021b279f6 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,7 +1,7 @@ #!/bin/bash #用于gitlab-ci.yml编译使用 -#make app_clean +make app_clean echo "Start compile." export ROOT_PATH=$PWD @@ -9,7 +9,7 @@ export ROOT_PATH=$PWD cd rtos source build/envsetup.sh lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf -#make clean +make clean bear make all > /dev/null cp output/application.bin ../ cp output/rtos-main.bin ../ @@ -18,7 +18,7 @@ cp output/rtos-main.bin ../ cd $ROOT_PATH source build/envsetup.sh lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 -#make clean +make clean bear make all > /dev/null cd $ROOT_PATH diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index c6b4bcd9c..ce9666e8b 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -726,7 +726,7 @@ static void qr_page_task_cb(lv_task_t* task){ //printf("[qr_page_task_cb]no sim card...\n"); //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); lv_label_set_text(labelInit, "Please insert the SIM card and restart the camera"); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 31); //printf("Please insert the SIM card and restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; @@ -739,7 +739,7 @@ static void qr_page_task_cb(lv_task_t* task){ { //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "Please restart the camera"); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 56); //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; @@ -754,7 +754,7 @@ static void qr_page_task_cb(lv_task_t* task){ { //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "Please restart the camera"); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 56); //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; @@ -767,7 +767,7 @@ static void qr_page_task_cb(lv_task_t* task){ { //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "QR code loading..."); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 56); //printf("QR code loading... X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); } @@ -775,7 +775,7 @@ static void qr_page_task_cb(lv_task_t* task){ { //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); lv_label_set_text(labelInit, "Please restart the camera"); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 56); //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); } @@ -784,7 +784,7 @@ static void qr_page_task_cb(lv_task_t* task){ else{ //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "Please restart the camera"); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 56); //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; @@ -854,7 +854,7 @@ void show_qr_picture_page(lv_obj_t* obj) if (sf_cardv_get_sim_insert() == 0){ //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); lv_label_set_text(labelInit, "Please insert the SIM card and restart the camera"); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 31); //printf("Please insert the SIM card and restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); @@ -862,7 +862,7 @@ void show_qr_picture_page(lv_obj_t* obj) else{ lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "QR code loading..."); - lv_obj_set_x(labelInit, 8); + lv_obj_set_x(labelInit, 10); lv_obj_set_y(labelInit, 56); //printf("QR code loading... X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); } diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c index 1c93a4fa9..2d87fe043 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c @@ -766,7 +766,7 @@ UINT32 sf_gpio_get_status(UINT32 ipin) return (UINT32) ((gpio_get_value(ipin) == 1) ? 1 : 0 ); } UINT32 sf_in_update(void) -{ +{ /* int i = 0; if((sf_gpio_get_status(GPIO_KEY_TEST)) && (PWR_ON_SETUP == sf_get_power_on_mode())) { @@ -779,7 +779,7 @@ UINT32 sf_in_update(void) { return 1; } - } + }*/ return 0; } UINT32 sf_in_mcu_update(void)