1.增加存储重传状态查询上报功能0xD8;

2.版本日期修改为“20221206”

Inc/KeySlave485.h

@@ -241,6 +241,7 @@
 //add poly 20221027 FRAM地址与ADDR_OiLType_Data地址冲突，将外部地址也内部地址分离
 #define 	FRAM_ADDR_Scan_Param			0x00C4	//	196		长度16字节，存储主动发送配置参数
 #define 	FRAM_ADDR_Scan_flowID			0x00D4	//	212		长度4字节，发送序列ID存储
+#define 	IDEX_ADDR_Read_WorkSt			0x00D8	//	216		用于响应上位机下发的运行状态数据帧
 //end add poly
 #define 	ADDR_OiLType_Data					0x00E4	//	228		油品参数   膨胀系数 0.0008  0.0012
 //modify poly 20221027 FRAM地址与ADDR_OiLType_Data地址冲突，将外部地址也内部地址分离

Inc/main.h

@@ -63,8 +63,8 @@ extern "C" {
 #include <stdlib.h>
 #include "stm32f7xx_hal.h"
 
-#define REMOTE_IAP_UPDATA 		0 	//是否是远程升级 //0--本地运行版本      1---远程升级版本
-#define WATCH_DOG_ON 					0   //是否打开看门狗 //0--关闭看门狗SP706   1---打开看门狗SP706
+#define REMOTE_IAP_UPDATA 		1 	//是否是远程升级 //0--本地运行版本      1---远程升级版本
+#define WATCH_DOG_ON 					1   //是否打开看门狗 //0--关闭看门狗SP706   1---打开看门狗SP706
 #define USE_RAM_RECORD    		1   //是否启用RAM数据缓存重发机制
 #define USE_QUEUE_RECORD			1   //是否启用队列数据缓存重发机制
 

MDK-ARM/TestF7.uvoptx

@@ -120,7 +120,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGUARM</Key>
-          <Name>|	?</Name>
+          <Name></Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -235,6 +235,16 @@
           <WinNumber>1</WinNumber>
           <ItemText>Pass41SensorScanParam</ItemText>
         </Ww>
+        <Ww>
+          <count>14</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>T2C_RemoteCaliDat001</ItemText>
+        </Ww>
+        <Ww>
+          <count>15</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>USART1_TX_BUF</ItemText>
+        </Ww>
       </WatchWindow1>
       <WatchWindow2>
         <Ww>
@@ -350,7 +360,7 @@
 
   <Group>
     <GroupName>Application/User</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -490,7 +500,7 @@
 
   <Group>
     <GroupName>Application/sys</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -558,7 +568,7 @@
 
   <Group>
     <GroupName>Application/bsp</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1326,7 +1336,7 @@
 
   <Group>
     <GroupName>sys</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

MDK-ARM/TestF7.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
+                <StartAddress>0x8080000</StartAddress>
                 <Size>0x20000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
@@ -300,13 +300,13 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x20020000</StartAddress>
-                <Size>0x60000</Size>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0xffff</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x20000</Size>
+                <StartAddress>0x20010000</StartAddress>
+                <Size>0xb0000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>

Src/KeySlave485.c

@@ -38,7 +38,7 @@ uint8_t product_code[20] = "JL-SIMS-CJ-V2.1";				 //
 uint8_t product_ID[20] = "20210730001";						 //产品ID
 
 char Version_software[30] = "KZB09A0_20220210_Temp1";
-uint32_t Version_Soft[8] = {2,2,3,13,1,1,0,20221125};
+uint32_t Version_Soft[8] = {2,2,3,13,1,1,0,20221206};
 
 uint8_t flag_exitReset = 0;	 //终止复位命令
 uint8_t flag_Uart4_Busy = 0; //表明打印机占用了总线，暂停语音播报

Src/TerminalSlave485.c

@@ -5089,6 +5089,9 @@ int 	Process_CMD_0x39_RemoteCali(uint8_t dataMode)
 				case	IDEX_ADDR_Scan_Param:
  					FM25L16B_Read_N_Bytes(FRAM_ADDR_Scan_Param,T2C_RemoteCaliDat001.PayLoadData,16);
 					T2C_RemoteCaliDat001.NumberOfRegs = 16; 
+      		break;	
+				case	IDEX_ADDR_Read_WorkSt: 					
+					T2C_RemoteCaliDat001.NumberOfRegs = jt808_Build_Read_WorkSt(T2C_RemoteCaliDat001.PayLoadData); 
       		break;	
 				default:
 
@@ -5639,7 +5642,7 @@ int 	Process_CMD_0x39_RemoteCali(uint8_t dataMode)
 		{
 			sprintf((char *)(&USART1_TX_BUF[33 + i001 * 2]), "%02X", T2C_RemoteCaliDat001.PayLoadData[i001]);
 		}
-
+		
 		Lrc_temp = MODBUS_ASCII_GetLrc(USART1_TX_BUF + 1, 32 + T2C_RemoteCaliDat001.NumberOfRegs * 2);
 		sprintf((char *)(&USART1_TX_BUF[33 + T2C_RemoteCaliDat001.NumberOfRegs * 2]), "%02X", Lrc_temp);
 		USART1_TX_BUF[35 + T2C_RemoteCaliDat001.NumberOfRegs * 2] = 0x0D;

Src/TerminalSlave485_jt808.c

@@ -911,4 +911,38 @@ void jt808_InitSensorScanParam(void)
 	jt808_read_Scan_flowID(&(jt808_obj.flowID));
 }
 
+
+/**
+ ***************************************
+ * 初始化发送配置参数
+ * 输入：无
+ * 返回: 无
+ ***************************************
+ */
+
+uint8_t jt808_Build_Read_WorkSt(uint8_t * PayLoad)
+{
+	uint8_t idx = 0;
+	PayLoad[idx++] = func_record_queue_flash_get();
+	PayLoad[idx++] = jt808_obj.link_ok;
+	
+	uint32_t msg_num = 0;
+	if(PayLoad[0] == true)
+	{
+		msg_num = func_record_queue_obj_cnt();
+	}
+	else
+	{
+		msg_num = func_ram_obj_num(DATA_UNIT_SIZE);
+	}
+	
+	PayLoad[idx++] = (msg_num>>24)&0xff;
+	PayLoad[idx++] = (msg_num>>16)&0xff;
+	PayLoad[idx++] = (msg_num>>8)&0xff;
+	PayLoad[idx++] = (msg_num)&0xff;
+	
+	return idx;
+	
+}
+
 #endif    /*************APP_TERMINALSLAVE485_JT808_USE*******************/

Src/TerminalSlave485_jt808.h

@@ -46,7 +46,7 @@ extern Pass41SensorScanParam_TypeDef Pass41SensorScanParam;
 void jt808_InitSensorScanParam(void);
 void jt808_DoInternalSensorScanAndPost(void);
 void jt808_recv_func_DataBack(uint8_t * buf ,uint8_t len);
-
+uint8_t jt808_Build_Read_WorkSt(uint8_t * PayLoad);
 
 
 #endif    /*********TERMINALSLAVE485_JT808_H****************/

func/func_queue_record.c

@@ -312,7 +312,7 @@ uint8_t func_record_queue_flash_get(void)
 	return queue_record_obj.flash_ok;
 }
 
-uint32_t func_record_queue_cnt(void)
+uint32_t func_record_queue_obj_cnt(void)
 {
 	uint32_t cnt_estimate = 0;
 	
@@ -438,7 +438,7 @@ void func_record_queue_main(void const *argument)
 		
 		if(queue_record_obj.flash_ok == true)			//flash正常，且处于读取状态时进行数量计算；			
 		{		
-			func_record_queue_cnt();
+			func_record_queue_obj_cnt();
 			
 			func_record_queue_work();	
 			

func/func_queue_record.h

@@ -37,6 +37,7 @@ void 		func_record_queue_update(void);
 
 uint32_t func_record_queue_write(void *buf ,uint32_t len);
 uint32_t func_record_queue_read(void *buf ,uint32_t len);
+uint32_t func_record_queue_obj_cnt(void);
 void 		 func_record_queue_link_set(uint8_t stat);
 uint8_t  func_record_queue_link_get(void);
 uint8_t  func_record_queue_flash_get(void);

func/func_ram_record.c

@@ -82,6 +82,11 @@ uint32_t func_ram_record_delete(uint8_t *buf,uint32_t len)
 	return read_len;
 }
 
+uint32_t func_ram_obj_num(uint32_t obj_size)
+{
+	uint32_t 		read_len = RingBuf_obj_num(ram_record_handle, (int) obj_size);
+	return read_len;
+}
 
 void func_ram_record_init(void)
 {	

func/func_ram_record.h

@@ -53,6 +53,7 @@ void 		 func_ram_record_init(void);											//
 uint32_t func_ram_record_write(uint8_t *buf ,uint32_t len);
 uint32_t func_ram_record_read(uint8_t *buf ,uint32_t len);
 uint32_t func_ram_record_delete(uint8_t *buf,uint32_t len);
+uint32_t func_ram_obj_num(uint32_t obj_size);
 
 void func_ram_record_test(void);	
 

func/func_spi_w25qxx.c

@@ -9,6 +9,7 @@
 //#define FUNC_SPI_W25QXX_USE
 #include <string.h>
 #include <stdbool.h>
+#include "cmsis_os.h"
 #include "func_spi_w25qxx.h"
 #include "obj_hal_w25qxx.h"
 #include "obj_soft_w25qxx.h"

keilkilll.bat

@@ -1,27 +0,0 @@
-del *.bak /s
-del *.ddk /s
-del *.edk /s
-del *.lst /s
-del *.lnp /s
-del *.mpf /s
-del *.mpj /s
-del *.obj /s
-del *.omf /s
-::del *.opt /s  ::²»ÔÊÐíɾ³ýJLINKµÄÉèÖÃ
-del *.plg /s
-del *.rpt /s
-del *.tmp /s
-del *.__i /s
-del *.crf /s
-del *.o /s
-del *.d /s
-::del *.axf /s
-del *.tra /s
-del *.dep /s           
-del JLinkLog.txt /s
-
-del *.iex /s
-del *.htm /s
-del *.sct /s
-del *.map /s
-exit