Commit Graph

215 Commits

Author SHA1 Message Date
sober.song
224c1c291c Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-27 13:52:29 +08:00
payton
b1452dad68 1.更换重启命令 2023-12-27 11:57:21 +08:00
payton
5d2ca48ce3 1.1.Linux增加区分自动和手动模式升级 2023-12-27 11:56:51 +08:00
sober.song
8bbe9651b2 合入原厂Linux和Rtos下EMMC最新改动和存储设备切换逻辑 2023-12-26 21:16:40 +08:00
xiehongyan
36e55a3291 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-26 18:19:21 +08:00
xiehongyan
b3c93d9abd BUG:10646 切换运营商后显示并等待三秒重启 2023-12-26 18:19:04 +08:00
sober.song
b18d94f150 Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-26 17:12:48 +08:00
payton
11152df385 1.合并emmc修改 2023-12-26 14:57:42 +08:00
xiaojiazhu
de5b58d770 Fixed:setting time and date failed bug. 2023-12-25 17:40:41 +08:00
sober.song
2a20d7fd2a rtos和linux下存储文件路径加入存储设备切换逻辑 2023-12-23 19:15:22 +08:00
xiehongyan
c924d94dc7 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-22 19:24:32 +08:00
xiehongyan
6d386153ab bug:9796 电池界面锂电池跳转其他选项变灰 2023-12-22 19:24:13 +08:00
xiaojiazhu
126c130133 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_emmc 2023-12-20 17:20:42 +08:00
xiehongyan
f5f825d7d2 bug:10571 修复开机后密码界面会自动关闭 2023-12-20 15:43:15 +08:00
xiaojiazhu
9741bf7716 Fixed bug:show review screen when power off. 2023-12-20 10:17:03 +08:00
payton
c1ef11a1cd 1.mcu升级调整:升级开lcd;mcu读写超时时间调整;2.lib里的usb标识调整 2023-12-20 09:54:14 +08:00
payton
ce3132dc91 1.增加些log确认信号;2.优化gps消息 2023-12-19 16:52:18 +08:00
xiaojiazhu
787ee85bbd Gui Megre emmc branch. 2023-12-18 19:48:39 +08:00
payton
212f874943 Merge branch 'Branch_S550_Fast' into Branch_S550_Fast_Emmc 2023-12-18 16:40:06 +08:00
payton
47674661ea 1.ota cmd优化 2023-12-18 16:29:54 +08:00
payton
7bc6174a29 1.emmc合并修改 2023-12-18 16:18:40 +08:00
payton
a32f7c314a 1.1进入setup使用reboot重启系统 2023-12-18 13:56:32 +08:00
payton
041d8d89a3 1.信号改使用全局变量 2023-12-18 13:55:23 +08:00
xiaojiazhu
73abb4e48d Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-15 18:41:17 +08:00
payton
80a26e8088 1.增加背光cmd;2.如要切换模式拍摄结束再切换 2023-12-15 16:29:49 +08:00
payton
413001226c 1.原厂修改msdc代码 2023-12-15 13:46:39 +08:00
xiaojiazhu
8f549afebd Fixed bug number 10186. 2023-12-13 15:03:02 +08:00
xiaojiazhu
788eace2ba Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-12 18:46:22 +08:00
xiaojiazhu
d5282fedc0 Fixed bug number 10238. 2023-12-12 17:05:49 +08:00
xiaojiazhu
f7a938c374 Fixed bug number 10369. 2023-12-11 16:59:16 +08:00
payton
d71f1a88e4 1.修改ui参数打印 2023-12-11 15:55:29 +08:00
xiaojiazhu
1514cc5823 Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-08 15:47:28 +08:00
xiaojiazhu
8d1e130df8 Fixed bug number 10492. 2023-12-07 17:30:38 +08:00
payton
df8cb7848d Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast 2023-12-07 16:17:37 +08:00
payton
f7a2b7c45a 1.修复cpu高占用问题 2023-12-07 16:15:29 +08:00
xiaojiazhu
b303800a68 Improve netword select fuction when open usb device failed. 2023-12-04 16:49:23 +08:00
xiaojiazhu
bc7c1c583f Improve network select fuciton. 2023-12-04 16:14:25 +08:00
xiaojiazhu
59dcff9209 Improve sim card check bug. 2023-12-04 11:32:23 +08:00
xiaojiazhu
9d59abbafd Merge Branch_S550_Fast. 2023-12-01 15:37:19 +08:00
payton
84b7b973dc 1.wifi状态和菜单切换更改 2023-12-01 14:27:52 +08:00
xiaojiazhu
52949309db Backup. 2023-12-01 11:45:10 +08:00
payton
087c51cca8 1.连接蓝牙时也需要退出到预览 2023-11-29 16:50:51 +08:00
xiaojiazhu
5bb1d3983c Fixed bug number 10195. 2023-11-29 11:38:07 +08:00
payton
43ed123735 1.wifi链接后退出到预览界面 2023-11-27 16:51:05 +08:00
xiaojiazhu
78c389bc4f Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-24 17:40:54 +08:00
xiaojiazhu
c03e1abcc0 Fixed check sim show bug. 2023-11-24 17:38:03 +08:00
payton
38840befb6 1.同步DS05 IQ更改 2023-11-24 16:56:17 +08:00
payton
40a52dc31c 1.mcu升级功能 2023-11-24 14:56:27 +08:00
payton
0d75e82d10 1.exfat工具支持 2023-11-23 15:48:05 +08:00
payton
a685df607b 1.exfat支持 2023-11-23 15:45:32 +08:00
payton
6a303efec9 1.rtsp标识更改 2023-11-22 18:05:45 +08:00
payton
7b4e3fed49 1.优化log 2023-11-21 10:10:40 +08:00
xiaojiazhu
03673dad1a Improve password screen. 2023-11-15 17:09:05 +08:00
xiaojiazhu
7c23947404 Fixed msg screen bug. 2023-11-14 19:21:09 +08:00
xiaojiazhu
c59a619b51 Improve password screen function. 2023-11-14 17:20:11 +08:00
xiaojiazhu
62d6ab47ff Fixed bug number 9751. 2023-11-13 15:21:22 +08:00
zyj
c3ba572d50 1.修改设置菜单的部分问题
2.完成生成CAM_INFO.txt和QR.BMP的功能
2023-11-10 18:22:48 +08:00
xiaojiazhu
37f7cd1481 Add sending picture message in ui. 2023-11-10 16:37:10 +08:00
xiaojiazhu
36dbd1e71f Fixed bug nember 9776. 2023-11-08 14:02:11 +08:00
xiaojiazhu
7d4265a06b Merge code of gui. 2023-11-08 10:12:03 +08:00
payton
a9d2466106 1.去掉一些log 2023-11-07 20:49:59 +08:00
xiaojiazhu
4ea2045894 Fixed bluetooth status show bug. 2023-11-07 15:52:10 +08:00
payton
68eced2e23 1.wifi加载修改 2023-11-06 19:27:35 +08:00
payton
35aa37ab60 1.增加WiFi开关控制 2023-11-06 18:25:49 +08:00
xiaojiazhu
aa2e833ea3 Fixed bug number 9517. 2023-11-06 15:22:01 +08:00
6e3727cab8 1.adc lib更改 2023-11-06 14:30:19 +08:00
payton
0c1f201b72 1.蓝牙状态 2023-11-06 10:12:29 +08:00
576b10ede1 Fixed wifi and bluetooth status show bug. 2023-11-03 19:37:38 +08:00
57fea3c641 Fiex qr code show bug. 2023-11-03 19:01:04 +08:00
1ecfe61844 Merge code of ding to fixed setting and play screen bug. 2023-11-03 14:32:51 +08:00
533307f2e0 Merge code of gui. 2023-11-02 17:07:40 +08:00
be193949e0 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui 2023-11-02 13:59:52 +08:00
zyj
3a63cc3464 完成Network Selection部分功能,修改了LPA业务 2023-11-02 11:36:37 +08:00
139a66c818 Improve lvgl from ding. 2023-11-02 10:56:12 +08:00
payton
299feee950 1.蓝牙指令sd卡相关处理业务 2023-11-02 10:19:49 +08:00
payton
e82393a5d6 1.esim卡的iccid 2023-10-24 17:10:13 +08:00
payton
7ce822975c 1.软升级改到uboot下 2023-10-24 17:08:35 +08:00
payton
a9d2903ad3 1.蓝牙业务调整
2.log记录修改,调整log
2023-10-20 20:30:05 +08:00
94afaa5317 Merge gui code. 2023-10-19 17:30:56 +08:00
9373577880 GUI show auto off time. 2023-10-19 13:51:19 +08:00
payton
4015d47723 1.蓝牙业务 2023-10-18 11:09:28 +08:00
be0fcb06c1 Add qrcode show function. 2023-10-17 21:10:31 +08:00
payton
57c4457306 1.增加两个cmd 2023-10-16 20:48:58 +08:00
a369f09caa Merge s550_fast with gui code. 2023-10-08 18:54:55 +08:00
541bb66326 Signal show. 2023-10-07 16:07:03 +08:00
090ed9fed8 1.修改wifi;2.去除编译警告 2023-09-26 18:02:34 +08:00
0924de5678 1.S550适配 2023-09-14 11:28:44 +08:00
4dd6c4e3b3 1.修复冲突;2.增加dbg开关 2023-09-14 09:51:08 +08:00
4207e0eb72 Merge branch 'Branch_S530' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S530 2023-09-11 15:56:01 +08:00
alisa
d6fdec636e [业务]1.合并代码后编译失败问题处理 2023-09-11 00:48:40 +08:00
alisa
0a5c35d505 Merge remote-tracking branch 'origin/Branch_S530' into branch_s530 2023-09-10 23:30:34 +08:00
alisa
995fc920fc [业务]1.e-sim卡注册网络流程优化 2023-09-10 23:17:55 +08:00
19307baf27 1.修改参数同步问题 2023-09-08 16:12:56 +08:00
0a7fbcec2f 1.优化升级写mcu
2.修复cardv下写mcu不生效问题
2023-09-07 14:10:01 +08:00
8ce2b8abbe 1.去除编译警告
2.修复ftp相关命令
3.修复升级失败时重启
2023-09-06 21:09:24 +08:00
3ff21467cd 1.去除调试代码 2023-09-06 15:49:24 +08:00
alisa
3457993928 [LPA]1.修复wifi切网失败的问题
2.version注网流程优化
2023-09-06 11:18:25 +08:00
alisa
948687ed10 Merge branch 'Branch_S530' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s530 2023-08-30 23:39:12 +08:00
alisa
962968f81a [e-sim]1.切网调试,目前eg915上读取profile失败
2.eg91模块执行at+qnvfr优化,强制匹配EG91VX和EG95VX
2023-08-30 23:33:48 +08:00
0eb259375b 1.修复电池参数传递 2023-08-28 09:48:29 +08:00