Commit Graph

380 Commits

Author SHA1 Message Date
payton
c54e521de2 1.修改battery测试log 2024-01-02 15:42:26 +08:00
sober.song
4879e7cc94 strgMng存储路径动态获取 2023-12-30 20:54:10 +08:00
payton
9f3b279232 1.增加SF_4G_MODE_TEST宏开关 2023-12-29 22:16:10 +08:00
payton
1182e8f476 1.sms增加gprs开关控制 2023-12-29 22:15:49 +08:00
payton
fd81e9b252 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-28 16:17:10 +08:00
payton
5737d78b10 1.修改gps;2.去掉多余的头文件 2023-12-28 10:41:06 +08:00
payton
23f4de153d 1.对bat检测进行补偿 2023-12-28 10:38:05 +08:00
payton
5156752c1a 1.wifi切网时做互斥操作,以免频繁点击 2023-12-27 17:06:16 +08:00
payton
26e56590ad 1.先连接ftp服务器再搜gps 2023-12-27 11:58:25 +08:00
payton
5ff97d0610 1.修复ftp下载升级包缺失部分 2023-12-27 11:57:50 +08:00
payton
b1452dad68 1.更换重启命令 2023-12-27 11:57:21 +08:00
sober.song
8bbe9651b2 合入原厂Linux和Rtos下EMMC最新改动和存储设备切换逻辑 2023-12-26 21:16:40 +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
d63c3ad5cd Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-26 15:16:10 +08:00
payton
ce5a796aeb 1.关闭电池检测有机率宕机,暂时屏蔽 2023-12-26 15:00:38 +08:00
xiehongyan
30dcf75c83 BUG:10639 二维码生成流程修改 2023-12-25 20:17:48 +08:00
sober.song
69dc8b618c 修改部分EMMC和SD卡切换逻辑 2023-12-25 11:30:44 +08:00
sober.song
2a20d7fd2a rtos和linux下存储文件路径加入存储设备切换逻辑 2023-12-23 19:15:22 +08:00
sober.song
85230bb460 EMMC和SD卡切换逻辑代码实现 2023-12-23 16:51:21 +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
payton
7e4f40ccc0 1.修复启动模式获取错误问题 2023-12-20 16:48:51 +08:00
payton
be37d33bc1 1.关闭gps时首次启动也发一次gps 2023-12-20 09:54:45 +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
payton
c4a322004b 1.修复cam id开启时在dp文件中 2023-12-19 16:49:18 +08:00
payton
eb3e4e257f 1.修改dp电池类型 2023-12-19 15:33:47 +08:00
payton
6e47f2c698 1.dp记录的错误码修改 2023-12-19 10:46:46 +08:00
payton
e5416993b6 1.去掉蓝牙的普通log 2023-12-19 10:46:10 +08:00
payton
8a68dab79b 1.wifi点击切换模式再工作过程中不切换模式 2023-12-19 10:45:38 +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
73c15c532c 1.修改ota 2023-12-18 16:30:16 +08:00
payton
52f09283fc 1.预约发送检查文件是否存在 2023-12-18 13:55:36 +08:00
payton
041d8d89a3 1.信号改使用全局变量 2023-12-18 13:55:23 +08:00
payton
13f633bf6c 1.增加cardv关机超时错误时sfapp关机 2023-12-15 16:29:58 +08:00
payton
c4fb81c191 1.升级优化 2023-12-15 16:28:21 +08:00
payton
260288c3cb Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast 2023-12-12 19:25:59 +08:00
payton
736cfbb5d3 1.蓝牙WiFimakefile修改 2023-12-12 19:25:47 +08:00
payton
3000364201 1.WiFi适配 2023-12-12 19:25:14 +08:00
payton
e8a1816bfc 1.蓝牙适配 2023-12-12 19:24:49 +08:00
payton
5522667d3b 1.蓝牙固件 2023-12-12 19:21:56 +08:00
xiaojiazhu
788eace2ba Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-12 18:46:22 +08:00
xiaojiazhu
390e256d52 Fixed bug number 10495. 2023-12-12 17:34:24 +08:00
payton
d71d1c07e2 1.优化自动模式注网流程 2023-12-12 13:55:52 +08:00
xiaojiazhu
4ddb2fc68c Fixed bug number 10266. 2023-12-11 19:28:44 +08:00
payton
fd7f905912 1.修复短信设置SendType 2023-12-11 19:18:09 +08:00
payton
9006d37230 1.修复蓝牙和WiFi设置sendtype 2023-12-11 19:17:39 +08:00
payton
3bf5f784e0 1.优化注网代码 2023-12-11 19:17:12 +08:00
xiaojiazhu
f7a938c374 Fixed bug number 10369. 2023-12-11 16:59:16 +08:00
payton
2b7af14a19 1.Linux下电池检测调整 2023-12-11 15:56:34 +08:00
payton
279907d8f8 1.dp生成修改 2023-12-11 15:56:09 +08:00
payton
d5657b81c5 1.修复DebugMode开启后看门狗问题 2023-12-11 15:55:10 +08:00
payton
fdfbc22659 1.异常处理优化 2023-12-11 15:54:22 +08:00
payton
36698eb868 1.短信指令支持ftp开关修改 2023-12-11 15:53:46 +08:00
payton
bb49625dbf 1.优化模块睡眠流程 2023-12-11 15:53:18 +08:00
xiaojiazhu
1514cc5823 Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-08 15:47:28 +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
payton
93990c03a1 1.修复tty读取不完整的问题 2023-12-07 15:56:49 +08:00
payton
409b49d5dd 1.优化关机读取sd卡信息;2.优化短信读取流程 2023-12-07 15:55:48 +08:00
xiaojiazhu
8d32ca76f1 Fixed bug number 10033. 2023-12-07 10:57:11 +08:00
payton
7874a6336e 1.修复模块初始化可能出现at超时问题 2023-12-07 09:10:04 +08:00
xiaojiazhu
7658426211 Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-06 16:32:25 +08:00
payton
ec08ee6bc4 1.修改sd卡读取判断 2023-12-06 15:32:15 +08:00
payton
5c73903ff2 1.修复短信指令和dp文件的短信指令 2023-12-05 18:08:17 +08:00
payton
20d7862827 1.更改超时时间 2023-12-05 17:04:12 +08:00
xiaojiazhu
b303800a68 Improve netword select fuction when open usb device failed. 2023-12-04 16:49:23 +08:00
payton
17f1537ef9 1.屏蔽掉一些log 2023-12-04 16:17:36 +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
payton
84b7b973dc 1.wifi状态和菜单切换更改 2023-12-01 14:27:52 +08:00
payton
38743429cd 1.修复WiFi和蓝牙设置集中发送 2023-11-30 19:17:29 +08:00
payton
9cdfda03f5 1.sd卡循环增加异常目录处理,错误5次退出 2023-11-29 18:03:48 +08:00
payton
2271f29b65 1.优化发送流程:自动模式下B启动和Instant时无需执行模块init,直接进行注网流程
2.8和a启动无线进行usb net初始化
3.优化ip检测代码加快检测频率
2023-11-29 14:59:27 +08:00
payton
abb834c296 1.优化注网代码;2.去掉一些log 2023-11-29 14:50:43 +08:00
payton
24c8b031ec 1.LI_PACK 2023-11-29 10:14:16 +08:00
payton
e73791c1c1 1.优化锂电池盒插入 2023-11-29 09:51:10 +08:00
payton
43ed123735 1.wifi链接后退出到预览界面 2023-11-27 16:51:05 +08:00
payton
ee09338f59 1.修复WiFi点击拍照发图问题 2023-11-27 11:49:59 +08:00
xiaojiazhu
78c389bc4f Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-24 17:40:54 +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
xiaojiazhu
e2d55b0a38 Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-24 13:41:35 +08:00
payton
ee41d9c0bd 1.qlog优化 2023-11-23 15:41:13 +08:00
xiaojiazhu
7771d8e7a6 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-23 09:13:31 +08:00
zyj
4a25f8d061 1.完善网络切换功能 2023-11-22 21:07:34 +08:00
payton
4847a8db9a 1.注网时间改90s;2.优化模块初始化代码 2023-11-22 18:07:19 +08:00
payton
3560751dcf 1.gps发送更改;2.修改发送标识 2023-11-22 17:58:15 +08:00
payton
0eb9afd500 1.修复Dailyreport发送问题 2023-11-21 15:50:38 +08:00
payton
911d0f3666 1.增加mcu dbg 2023-11-21 10:20:53 +08:00
payton
f90c8c3d97 1.增加SD卡报警功能 2023-11-21 10:16:50 +08:00
payton
42693f9133 1.优化cardv和sf app获取mcu信息 2023-11-20 11:35:50 +08:00
payton
31642e05d2 1.修复温度水印开机时无的问题 2023-11-17 18:46:28 +08:00
payton
cb10217e93 1.更改时间格式默认值 2023-11-17 18:45:54 +08:00
payton
d3745ff4aa 1.SD卡删除空文件夹 2023-11-17 11:14:36 +08:00
payton
500637db5b 1.p+vWiFi蓝牙更改 2023-11-16 20:14:08 +08:00
payton
d973040350 1.修复WiFi和蓝牙设置cam id
2.修复WiFi下图问题
2023-11-16 17:40:52 +08:00
payton
57d0359554 1.mem编译选项 2023-11-16 09:55:14 +08:00