kkkjtr
/
4G_module
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改报警参数

This commit is contained in:
kkkjtr 2025-07-31 10:41:47 +08:00
parent 524226f4a4
commit f551d38609
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
custom/jt808/src/jt808_set_TermParam.c
View File

@ -416,9 +416,10 @@ osThreadFunc_t Autoreport_param_ThreadId;
uint16_t scenic_Fence_Polygon_count = 0;
uint16_t ban_Fence_Polygon_count = 0;
uint16_t ban_unlock_count = 0;
uint16_t ban_unlock_count = 0;
uint16_t delay_off_count = 0; // 延时关闭计数
uint8_t ban_unlock_flag = 0; //0：围栏非空 1：空围栏
uint8_t ban_unlock_flag = 0; //禁区开锁标志
uint8_t first_warning_flag = 0; //第一次进入禁区标志
uint8_t Rsp_locked_condition = 0; // 锁车状态, BYTE
@ -534,10 +535,22 @@ void jt808_LocReport_param_update(void){
jt808_pkg_send(ID_LocReport,10000/5); // 发送位置信息上报包
}
ban_Fence_Polygon_count++;
if((ban_Fence_Polygon_count >= 2) && (0 == flag)){ // 2S
if((ban_Fence_Polygon_count >= 3) && (0 == flag)){ // 2S
ban_Fence_Polygon_count = 0;
local_tts_text_play("您已进入禁区,请尽快离开！",0,0);
jt808_pkg_send(ID_LocReport,10000/5); // 发送位置信息上报包
// if(first_warning_flag == 0)
// {
// first_warning_flag = 1; //第一次进入禁区
// local_tts_text_play("您已进入禁区,请尽快离开！",0,0);
// jt808_pkg_send(ID_LocReport,10000/5); // 发送位置信息上报包
// }
// else
// {
local_tts_text_play("您已进入禁区,请尽快离开！",0,0);
jt808_pkg_send(ID_LocReport,10000/5); // 发送位置信息上报包
// }
}
}
@ -547,6 +560,8 @@ void jt808_LocReport_param_update(void){
ban_Fence_Polygon_count = 0;
ban_unlock_count = 0;
ban_unlock_flag = 0;
first_warning_flag = 0;
}
}else{
scenic_Fence_Polygon_count = 0;
@ -701,7 +716,7 @@ void jt808_set_term_param_init(void){
// memcpy(jt808_term_param_item.big_term_attr_resp.term_ICCID+4, jt808_term_param_item.phone_BCDnum, 6); // 终端手机号码 但是你照这个来云端收到的iccid全是，因为BCDnum参数本身没有初始化
char str_hw_ver[] = "1.0.0"; // 硬件版本
char str_fw_ver[] = "1.1.6"; // 固件版本 原本为1.0.0
char str_fw_ver[] = "1.2.0"; // 固件版本 原本为1.0.0
jt808_term_param_item.big_term_attr_resp.hw_ver_len = strlen(str_hw_ver); // 硬件版本长度
jt808_term_param_item.big_term_attr_resp.fw_ver_len = strlen(str_fw_ver); // 固件版本长度
memcpy(jt808_term_param_item.big_term_attr_resp.str_hw_ver, str_hw_ver, strlen(str_hw_ver)); // 硬件版本
@ -752,7 +767,7 @@ void jt808_set_term_param_init(void){
jt808_term_param_item.set_term_param.SpeedCutLimit =2000; // 前进自动减速刹车距离
jt808_term_param_item.set_term_param.BrakeLimit_B =1000; // 后退刹车距离
jt808_term_param_item.set_term_param.SpeedCutLimit_B =1600; // 后退自动减速刹车距离
jt808_term_param_item.set_term_param.Ban_Fence_Polygon_Delay_OFF =5; // 禁止围栏延时锁车时间
jt808_term_param_item.set_term_param.Ban_Fence_Polygon_Delay_OFF =15; // 禁止围栏延时锁车时间
jt808_save_TermParam(); // 保存终端参数
}
}while(0);

3
custom/tcp_client/src/tcp_client.c
View File

@ -220,6 +220,9 @@ TCP_DISABLE:
goto TCP_DISABLE;
}
}
if(i == 2 && ret != 0){ // 3次尝试都失败
goto TCP_DISABLE; // 跳转重连
}
}
jt808_pkg_send(ID_GetTermAttrResp, 0); // 发送终端属性查询应答包