|
@@ -9,6 +9,8 @@
|
|
|
|
|
|
#define APP_TERMINALSLAVE485_JT808_USE
|
|
|
|
|
|
+#define JT808_FRAM_HEAD_ID 0xA2
|
|
|
+
|
|
|
#ifdef APP_TERMINALSLAVE485_JT808_USE
|
|
|
/* Includes-----------------------------------------------------------------------------------*/
|
|
|
#include "TerminalSlave485.h"
|
|
@@ -117,7 +119,7 @@ void mem_swap(uint8_t *des,int len)
|
|
|
* 返回: 构建数据的字节总数
|
|
|
***************************************
|
|
|
*/
|
|
|
-int jt808_Build_A1_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
|
|
|
+int jt808_Build_Ax_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
|
|
|
{
|
|
|
int send_pos=0;
|
|
|
unsigned char emergencyflag=0;
|
|
@@ -129,7 +131,7 @@ int jt808_Build_A1_Cmd(uint8_t *pBuf, uint32_t flowID, uint8_t *pEmergencyflag)
|
|
|
UNUSED(temp_i);
|
|
|
jt808_update_0x40_data();
|
|
|
//标识头 总长度 紧急上报位 数据状态 仓数
|
|
|
- pBuf[send_pos++] = 0xA1;
|
|
|
+ pBuf[send_pos++] = JT808_FRAM_HEAD_ID;
|
|
|
pBuf[send_pos++] = 120;
|
|
|
if(StoreNumber>0)
|
|
|
{
|
|
@@ -767,8 +769,8 @@ void jt808_DoInternalSensorScanAndPost(void)
|
|
|
pSendBuf += xlen;
|
|
|
ylen += xlen;
|
|
|
break;
|
|
|
- case 0xA1:
|
|
|
- xlen = jt808_Build_A1_Cmd(pSendBuf, jt808_obj.flowID, emergencyflag?NULL:&emergencyflag);
|
|
|
+ case JT808_FRAM_HEAD_ID:
|
|
|
+ xlen = jt808_Build_Ax_Cmd(pSendBuf, jt808_obj.flowID, emergencyflag?NULL:&emergencyflag);
|
|
|
pSendBuf += xlen;
|
|
|
ylen += xlen;
|
|
|
break;
|
|
@@ -864,7 +866,7 @@ void jt808_InitSensorScanParam(void)
|
|
|
Pass41SensorScanParam.step = 5;
|
|
|
Pass41SensorScanParam.nstep = 6;
|
|
|
Pass41SensorScanParam.cmd_num = 1;
|
|
|
- Pass41SensorScanParam.cmd_arr[0] = 0xA1;
|
|
|
+ Pass41SensorScanParam.cmd_arr[0] = JT808_FRAM_HEAD_ID;
|
|
|
}
|
|
|
//初始化发送序列ID
|
|
|
jt808_read_Scan_flowID(&(jt808_obj.flowID));
|