payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtos屏蔽开机按上建升级, qr弹窗文件位置更换

Browse Source
This commit is contained in:
xiehongyan 2024-01-24 10:45:58 +08:00
parent e88c800b2c
commit c510b39e07
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_all.sh
View File

@ -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

16
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -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));
}

4
rtos/code/driver/na51089/source/mcu/sf_mcu.c
View File

@ -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)