Selaa lähdekoodia

V7.4.0.4
完善蜂鸣器

yidongFan 1 kuukausi sitten
vanhempi
commit
5a24bcec74

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
.mxproject


+ 5 - 3
BoardInterface/onechip_devinf_define.h

@@ -77,12 +77,12 @@ typedef struct {
 	unsigned int  trigger_Tick;	
 	unsigned int  int_ADC;	
 	unsigned int  resetByIwdg;	
-	unsigned int  connectTcpFlag;
-	unsigned int  connectHostFlag;		
+	unsigned int  connectTcpFlag;	
 	unsigned int  pc_link_timeout;	
 	unsigned int  pc_channel_recv;
 	unsigned int  samp_flag;
 	unsigned int  system_OnlineFlag;
+	unsigned int  system_debugFlag;
 	unsigned int  amplif_flag;
 	unsigned int  lysis_flag;
 	unsigned int  light_flag;
@@ -110,8 +110,10 @@ typedef struct {
 	uint8_t updateQR;
 	uint32_t resendeQRtimer;
 	uint32_t QRBeepTimeer;
+	uint32_t QRBeepFlash;
+	uint32_t QRBeepFlashAll;
     uint32_t error_delay; 
-
+	float cabinTem;
 	
 	ProcessStateMachine_t psmMaster;
 	ProcessStateMachine_t psmSlave;

+ 1 - 0
BoardInterface/onechip_include_header.h

@@ -34,5 +34,6 @@
 #include "van_BSP_ESPUart.h"
 #include "ESP32_WROOM_32D.h"
 #include "onchip_flash.h"
+#include "van_BSP_Temp_mts01.h"
 #endif //__ONECHIP_LOAD_INF_H_
 

+ 1 - 1
BoardInterface/onechip_load_inf.h

@@ -8,7 +8,7 @@
 #define SOFT_VERSION_1  7	//软件版本号
 #define SOFT_VERSION_2  4	//软件版本号
 #define SOFT_VERSION_3  0	//软件版本号
-#define SOFT_VERSION_4  3	//软件版本号
+#define SOFT_VERSION_4  4	//软件版本号
 
 
 

+ 1 - 1
Core/Inc/stm32f1xx_hal_conf.h

@@ -49,7 +49,7 @@
 #define HAL_I2C_MODULE_ENABLED
 /*#define HAL_I2S_MODULE_ENABLED   */
 /*#define HAL_IRDA_MODULE_ENABLED   */
-/*#define HAL_IWDG_MODULE_ENABLED   */
+#define HAL_IWDG_MODULE_ENABLED
 /*#define HAL_NOR_MODULE_ENABLED   */
 /*#define HAL_NAND_MODULE_ENABLED   */
 /*#define HAL_PCCARD_MODULE_ENABLED   */

+ 4 - 4
Core/Src/dma.c

@@ -45,16 +45,16 @@ void MX_DMA_Init(void)
 
   /* DMA interrupt init */
   /* DMA1_Channel1_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 2, 0);
+  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
   /* DMA1_Channel4_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 2, 0);
+  HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel4_IRQn);
   /* DMA1_Channel5_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
   /* DMA2_Channel3_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA2_Channel3_IRQn, 2, 0);
+  HAL_NVIC_SetPriority(DMA2_Channel3_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA2_Channel3_IRQn);
 
 }

+ 1 - 1
Core/Src/gpio.c

@@ -130,7 +130,7 @@ void MX_GPIO_Init(void)
   HAL_GPIO_Init(MINI7_V2_KEY_GPIO_Port, &GPIO_InitStruct);
 
   /* EXTI interrupt init*/
-  HAL_NVIC_SetPriority(EXTI9_5_IRQn, 1, 0);
+  HAL_NVIC_SetPriority(EXTI9_5_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(EXTI9_5_IRQn);
 
 }

+ 26 - 17
Core/Src/main.c

@@ -22,6 +22,7 @@
 #include "adc.h"
 #include "dma.h"
 #include "i2c.h"
+#include "iwdg.h"
 #include "tim.h"
 #include "usart.h"
 #include "gpio.h"
@@ -35,6 +36,7 @@
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
 #define SAMPLE_TIME 10000
+#define FAST_SAMPLE_TIME 3000
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
@@ -79,13 +81,29 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
 						if(sysinf.ms_conter%SAMPLE_TIME == 0){
 							sysinf.samp_flag = 1;
 						}
-            
+            if (!(sysinf.skip_CheckOrRun & SKIP_FARSTRUN)){
+                if(sysinf.ms_conter%SAMPLE_TIME == 0){
+                  sysinf.samp_flag = 1;
+                }
+            }else{
+                if(sysinf.ms_conter%FAST_SAMPLE_TIME == 0){
+                  sysinf.samp_flag = 1;
+                }
+            }  
 						if(sysinf.ms_conter%10000 == 0){
 							sysinf.s10_flag = 1;
 						}            
 					}
 					 Motor_mix_work();
 				 }
+         if(sysinf.QRBeepTimeer && sysinf.QRBeepFlashAll){
+            if(sysinf.QRBeepTimeer % sysinf.QRBeepFlashAll == 0){
+                HAL_GPIO_WritePin((GPIO_TypeDef *)sysinf.beep_port, sysinf.beep_pin,GPIO_PIN_SET);
+            }else if(sysinf.QRBeepTimeer % sysinf.QRBeepFlashAll == sysinf.QRBeepFlash){
+                HAL_GPIO_WritePin((GPIO_TypeDef *)sysinf.beep_port, sysinf.beep_pin,GPIO_PIN_RESET);
+            }
+            sysinf.QRBeepTimeer--;
+         }
 				 if(sysinf.ms_conter%100 == 1){
             sysinf.amplif_flag   = 1;   
 				 }
@@ -120,13 +138,7 @@ int main(void)
 {
 
   /* USER CODE BEGIN 1 */
-  //  while(1){
-  //     for(unsigned int i=0;i<10000;i++){
-  //         i++;
-  //         i--;
-  //     }
-  //   	HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_14); 
-  //  }
+  float temp;
   SCB->VTOR = 0x8010000;
    __enable_irq();
   /* USER CODE END 1 */
@@ -177,6 +189,7 @@ int main(void)
 	esp_receive_Rec_Start(sysinf.ESPUart);
 	
 	SensorInitial();
+  loadTemp_mts01Cfg();
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -222,6 +235,7 @@ int main(void)
 	}
   
 	PackDeviceNum();
+  beep_set(BEEP_SCANOK);
 
   while (1)
   {
@@ -236,7 +250,6 @@ int main(void)
             uart0_recOK = 0;
             sysinf.pc_channel_recv  = PC_CONNECT_TYPE_UART;
             sysinf.pc_link_timeout = 0;
-            sysinf.connectHostFlag = 1;
             
             uart0_massage.data = (char *)uart0_data;            
             deal_mUnion_cmd(&uart0_massage);
@@ -253,6 +266,7 @@ int main(void)
 			HAL_GPIO_TogglePin((GPIO_TypeDef *)sysinf.run_led_port, sysinf.run_led_pin); /*green*/      
       update_work();
       resetSampleData(&sysinf.psmMaster);
+      MTS01_ReadTemp(0,&sysinf.cabinTem); 
       if(sysinf.error_delay){
         sysinf.error_delay--;
       }
@@ -265,17 +279,11 @@ int main(void)
     }
 		if(	sysinf.ms10_flag == 1){
 			sysinf.ms10_flag = 0;
-      if(sysinf.QRBeepTimeer){
-        sysinf.QRBeepTimeer --;
-        if(sysinf.QRBeepTimeer == 0){
-            HAL_GPIO_WritePin((GPIO_TypeDef *)sysinf.beep_port, sysinf.beep_pin,GPIO_PIN_RESET);
-        }
-      }		
 		}
 
 		if(	sysinf.upheart_flag == 1){
 			sysinf.upheart_flag = 0;
-      if((sysinf.pc_channel_recv  == PC_CONNECT_TYPE_NULL)||(sysinf.connectHostFlag&& sysinf.pc_link_timeout > (OFFLINE_TIME/3)) ){
+      if((sysinf.pc_channel_recv  == PC_CONNECT_TYPE_NULL)||(sysinf.pc_link_timeout > (OFFLINE_TIME/3)) ){
 			  send_Devinf_pc();
       }	       
 		}
@@ -314,10 +322,11 @@ void SystemClock_Config(void)
   /** Initializes the RCC Oscillators according to the specified parameters
   * in the RCC_OscInitTypeDef structure.
   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
   RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
   RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL2;

+ 1 - 1
Core/Src/tim.c

@@ -268,7 +268,7 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
     __HAL_RCC_TIM2_CLK_ENABLE();
 
     /* TIM2 interrupt Init */
-    HAL_NVIC_SetPriority(TIM2_IRQn, 1, 0);
+    HAL_NVIC_SetPriority(TIM2_IRQn, 0, 0);
     HAL_NVIC_EnableIRQ(TIM2_IRQn);
   /* USER CODE BEGIN TIM2_MspInit 1 */
 

+ 2 - 3
DriverInterface/ESP32_WROOM_32D.c

@@ -563,10 +563,9 @@ void WIFI_recv_deal(void)
 		{
             int iProcLen = DecodeNew(&uart0_massage,uart0_data,g_wifi_rx_buf, &g_wifi_rx_head,g_wifi_rx_last,WIFI_RX_BUF_SIZE);
             if (iProcLen > 0)   {                        
-                sysinf.pc_channel_recv  = PC_CONNECT_TYPE_WIFI;                                 
-                sysinf.connectHostFlag = 1;           
+                sysinf.pc_channel_recv  = PC_CONNECT_TYPE_WIFI; 
                 sysinf.pc_link_timeout = 0;
-								uart0_massage.data = (char *)uart0_data;    
+				uart0_massage.data = (char *)uart0_data;    
                 query_pc_cmd(&uart0_massage);
                 wifi_receive_clear();
             }    

+ 22 - 14
DriverInterface/communication.c

@@ -55,7 +55,7 @@ int data_send_to_pc(pc_cmd_type cmd, char *data, unsigned short len)
         }
     }else{
         
-        if(sysinf.pc_channel_recv  == PC_CONNECT_TYPE_NULL ){            
+        if((sysinf.pc_channel_recv  == PC_CONNECT_TYPE_NULL )&& (PC_CMD_UPDATETEMP != cmd) ){            
             /*无通信,不上报*/
             return ret;
         }
@@ -92,7 +92,7 @@ int data_send_to_pc(pc_cmd_type cmd, char *data, unsigned short len)
 	}else{
 		return ret;
 	}	
-	if((sysinf.pc_channel_recv  == PC_CONNECT_TYPE_WIFI || cmd == PC_CMD_SETIP ) && PC_CMD_SETWIFI != cmd)
+	if((sysinf.pc_channel_recv  == PC_CONNECT_TYPE_WIFI || cmd == PC_CMD_SETIP ) && ((PC_CMD_SETWIFI != cmd) && (PC_CMD_UPDATETEMP != cmd)))
 	{			
 		return WIFI_ReSend();
 	}
@@ -256,13 +256,17 @@ int setState_action(unsigned char cmd, unsigned char *parg)
 
 int setLog_action(unsigned char cmd, unsigned char *parg)
 {
-    sysinf.log_level =  *(float *)(parg+4);
-    return 1;
+    sysinf.log_level =  *(uint32_t *)(parg+4);
+    sysinf.system_debugFlag  = 1;
+    sysinf.pc_channel_recv  = PC_CONNECT_TYPE_UART;
+    return cfg_save_cfg_param();
 }
 
 int setDebug_action(unsigned char cmd, unsigned char *parg)
 {
-	sysinf.skip_CheckOrRun =  *(float *)(parg+4);
+	sysinf.skip_CheckOrRun =  *(uint32_t *)(parg+4);
+    sysinf.system_debugFlag  = 1;
+    sysinf.pc_channel_recv  = PC_CONNECT_TYPE_UART;
     return 1;
 }
 
@@ -962,14 +966,18 @@ void update_work(void) {
    float temp;
    unsigned int st;
 
-	char data[20];
-    get_master_st(&temp,&st); 
-	*(unsigned int *)(data+0) = st;
-	*(float *)(data+4) =temp;
-    get_lysis_st(&temp,&st);
-	*(unsigned int *)(data+8) = st; 
-	*(float *)(data+12) = temp;
-	// data_send_to_pc(PC_CMD_UPDATETEMP, data,sizeof(data));
-    Van_Device_Printf(VAN_LOG_TEMP,"st:%d %f %d %f\n\r",sysinf.psmMaster.state,sysinf.heaterMaster.pid.realtemp,sysinf.lysis.thermostat_st,sysinf.lysis.pid.realtemp);
+    if(sysinf.log_level & VAN_LOG_TEMP ){
+        char data[20];
+        get_master_st(&temp,&st); 
+        *(unsigned int *)(data+0) = st;
+        *(float *)(data+4) =temp;
+        get_lysis_st(&temp,&st);
+        *(unsigned int *)(data+8) = st; 
+        *(float *)(data+12) = temp;
+        *(float *)(data+16) = sysinf.cabinTem;    
+        data_send_to_pc(PC_CMD_UPDATETEMP, data,sizeof(data));        
+    }
+
+    // Van_Device_Printf(VAN_LOG_TEMP,"st:%d %f %d %f\n\r",sysinf.psmMaster.state,sysinf.heaterMaster.pid.realtemp,sysinf.lysis.thermostat_st,sysinf.lysis.pid.realtemp);
 	return ;
 }

+ 1 - 1
DriverInterface/onchip_flash.c

@@ -203,7 +203,7 @@ void cfg_load_default_param(void)
 	sysinf.PreHeatTime = 1;
 	sysinf.readyTemp = 65.5;
 	sysinf.adjtemp = -0.5;
-	sysinf.log_level = 0;
+	sysinf.log_level =  VAN_LOG_ERROR|VAN_LOG_INFO|VAN_LOG_TEMP|VAN_LOG_WIFI;
 	sysinf.skip_CheckOrRun = 0;
 	sysinf.timeinner = 6000;
 	sysinf.swingtime = 100;

+ 12 - 1
DriverInterface/state_mini.c

@@ -235,6 +235,7 @@ void error_clear(void)
 {
     error_info.error_code = 0;
 	error_info.error_report = 0;
+    beep_set(BEEP_MUTE);
 }
 
 
@@ -260,15 +261,22 @@ void updateAmplifState(uint8_t newset){
         sysinf.amplifState = newset;
         if(newset == SYS_STATE_ERROR_HW){
             sysinf.lysisState = newset;
+            beep_set(BEEP_ERR_HW);
+        }else if(newset == SYS_STATE_ERROR_HM){
+            beep_set(BEEP_ERR_HM);
         }
         sysinf.updateSt = 1;
     }
 }
+        
 void updateLysisState(uint8_t newset){
     if(sysinf.lysisState != newset){
         sysinf.lysisState = newset;
         if(newset == SYS_STATE_ERROR_HW){
             sysinf.amplifState = newset;
+            beep_set(BEEP_ERR_HW);
+        }else if(newset == SYS_STATE_ERROR_HM){
+            beep_set(BEEP_ERR_HM);
         }
         sysinf.updateSt = 1;
     }
@@ -355,6 +363,8 @@ void usr_state_machine(ProcessStateMachine_t *sts, heat_ctrl_def *heater)
         	{
                 error_set(ERROR_SENSOR_SELF_CHECK);
         	}
+        	sysinf.heaterMaster.HeatState = SystemPreHeat;
+            sysinf.heaterMaster.temp_stable_sta = 0;
 
         }
 
@@ -538,7 +548,8 @@ void usr_state_machine(ProcessStateMachine_t *sts, heat_ctrl_def *heater)
         {
             sts->statusword |= SW_move_card;
             sts->state = SW_move_card;
-             updateAmplifState(SYS_STATE_WORKEND);
+             updateAmplifState(SYS_STATE_WORKEND);             
+			beep_set(BEEP_WORKEND);
         }
         break;
     }

+ 5 - 1
DriverInterface/user_heater.c

@@ -166,7 +166,11 @@ void heater_work(heat_ctrl_def *heater)
                 heater->HeatState=SysPreConTemp;
                 heater->overtempnum = 0;
                 heater->timenum=0;
-                heater->targetAfterAdj = heater->adJTarget + heater->SetTempVal;
+                if(sysinf.cabinTem < ENV_ADJ_THRESHOLD){                        
+                    heater->targetAfterAdj = heater->adJTarget + heater->SetTempVal;
+                }else{                                         
+                    heater->targetAfterAdj =heater->SetTempVal;
+                }
                 heater->pid.integral = 0;
                 heater->pid.goal = heater->targetAfterAdj ;
 

+ 1 - 1
DriverInterface/user_heater.h

@@ -13,7 +13,7 @@
 #define SysNorHeatHold     8
 #define SysERRORHeat     10
 
-
+#define ENV_ADJ_THRESHOLD 27.0
 typedef struct
 {
 	unsigned char   heat_state;            		//串口控制加热状态

+ 0 - 21
DriverInterface/usr_b2b_msg.h

@@ -1,21 +0,0 @@
-#ifndef _USR_B2B_MSG_
-#define _USR_B2B_MSG_
-
-
-#include "usr_protocol_type.h"
-
-
-#define combine_cmdMessage(msg,header,seqer,cmder,tailer)  {\
-	msg.head = header; \
-	msg.seq = seqer; \
-	msg.cmd = cmder; \
-	msg.tail = tailer; \
-}
-
-int DecodeNew(struct CmdMessage* pMessage, uint8_t *pdata, const uint8_t *pInBuffer, uint32_t *pheader,uint32_t  ulast,uint32_t maxlen);
-uint32_t PackDeviceNum(void);
-void send_Devinf_pc(void);
-
-
-
-#endif

+ 0 - 883
DriverInterface/usr_b2pc_msg.c

@@ -1,883 +0,0 @@
-/*
- *  usr_b2pc_msg.c
- *  pc同主机通信
- *  Created on: 2023年9月18日
- *      Author: longtengjun
- */
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "onechip_include_header.h"
-
-
-char DeviceNum[64] = "mini7 2312230001 v1.1, ";
-extern uint16_t WriteComm0(uint8_t *data, uint16_t len);
-
-uint8_t pc_channel_recv = 0;      //接收pc的通道,0:未连接; 1:wifi; 2:串口
-uint8_t pc_channel_send = 0;      //发给pc的通道,0:未连接; 1:wifi; 2:串口
-static uint8_t pc_channel_send_backup = 0;      //发给pc的通道备份
-
-// extern float slave_temp;
-// extern uint8_t other_run_state;
-// str_error_info_t error_info = {0};    //错误信息
-
-uint8_t pc_send_wait = 0;     //数据发送等待,0可以立即发送;>0正在发送请等待
-uint8_t pc_send_cmd = 0;     //当前发送cmd
-
-// extern str_mcu_ack mcu_ack_ctrl;
-// extern uint32_t timeout_com;
-// extern uint32_t pc_link_timeout;
-// extern struct light_band_para_t light_band_para[2];
-// extern ProcessStateMachine_t psm;
-
-// extern CFG_PARAM_STRUCT g_cfg;
-// #ifdef ONECHIP_MINI_PLUS
-// extern CFG_PARAM_STRUCT g_cfg_slave;
-// #endif
-// extern float evnTemp;
-// extern  uint32_t connectTcpFlag;
-// extern uint32_t broadDevFlag;
-// extern uint16_t scan_qrcode_ropprt;
-// extern uint8_t wifi_tx_buf[WIFI_TX_BUF_SIZE];
-// extern uint16_t wifi_tx_len;
-static unsigned char seq  =0;
-
-//字节流转整数,大端模式
-uint32_t byte_to_u32(uint8_t *p, int len)
-{
-	uint32_t temp = 0;
-
-	for(int i = len-1; i >= 0; i--)
-	{
-		temp <<= 8;
-		temp |= p[i];
-	}
-
-	return temp;
-}
-uint32_t PackDeviceNum(void){		
-	int len = 0;
-	memset((uint8_t *)&DeviceNum, 0 ,sizeof(DeviceNum));
-#ifdef ONECHIP_MINI_ONE
-	my_sprintf(&DeviceNum[len],sizeof(DeviceNum), "Mini7-one,V%d.%d.%d.%d",VERSION_1,VERSION_2,VERSION_3,VERSION_4);	
-#else 
-#ifdef ONECHIP_MINI_PLUS
-	my_sprintf(&DeviceNum[len],sizeof(DeviceNum), "Mini7-plus,V%d.%d.%d.%d",VERSION_1,VERSION_2,VERSION_3,VERSION_4);	
-#else
-	my_sprintf(&DeviceNum[len],sizeof(DeviceNum), "Mini7,V%d.%d.%d.%d",VERSION_1,VERSION_2,VERSION_3,VERSION_4);		
-#endif //ONECHIP_MINI_PLUS
-#endif //ONECHIP_MINI_ONE
-	strcat(DeviceNum, ",");
-	len = strlen(DeviceNum);
-	hex_to_ascii(get_uid(), &DeviceNum[len], 12);	//uid
-	strcat(DeviceNum, ",");
-	strcat(DeviceNum, g_cfg.SN);
-	strcat(DeviceNum, " ");
-	LOG("DeviceNum:%s\n", DeviceNum);
-}
-
-
-/********************************************************************
- *    uint16_t b2b_send_to_pc(enum pc_cmd_type cmd, char *data, uint16_t len)
- *
- *描述:串口发送
- *参数:Devicenum 0-发至主机,1发至从机
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-uint16_t b2b_send_to_pc(enum pc_cmd_type cmd, char *data, uint16_t len)
-{
-    uint16_t check;
-    CmdMessage msg;
-
-    msg.head = 0x55aa;
-    msg.seq = cmd_frame_type_req;
-    msg.cmd = cmd;
-    msg.tail = 0x5a;
-    msg.len = len;
-
-    check = checkSum(&msg.seq, 4);
-    check += checkSum(data, len);
-    msg.checksum = check & 0xFF;
-    msg.tail = check >> 8;
-
-    WriteComm0((uint8_t*)&msg, g_uMsgCmdFrameLen);
-
-    msg.data = data;
-
-    WriteComm0(data, len);
-
-    return WriteComm0(&msg.checksum, 2);
-
-}
-
-/********************************************************************
- *    uint16_t data_send_to_pc(enum pc_cmd_type cmd, char *data, uint16_t len)
- *
- *描述:发生数据到PC
- *参数:Devicenum 0-发至主机,1发至从机
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-uint16_t union_data_send_to_pc(struct CmdMessage *pMsg)
-{
-    uint16_t check;
-    uint16_t try = 0;
-    struct CmdMessage msg;
-    int ret = 0;
-
-    msg.head = 0x55aa;
-    msg.seq = pMsg->seq;
-    msg.cmd = pMsg->cmd;
-    msg.tail = 0x5a;
-    msg.len = pMsg->len;
-
-    msg.data = pMsg->data;
-   
-     check = checkSum(&msg.seq, 4);
-     *(unsigned int*)msg.data = Devicenum;/*打包模块编号*/
-     check += checkSum(msg.data, msg.len);
-     msg.checksum = check & 0xFF;
-     msg.tail = (check >> 8);
-     if(Devicenum)
-     {
-         /*从模块 通过IIC上报,稍后跟新*/
-     }
-     else
-     {
-         WriteComm0((uint8_t*)&msg, g_uMsgCmdFrameLen);		 
-         WriteComm0(msg.data, msg.len);
-         return WriteComm0(&msg.checksum, 2);
-     }   
-}
-
-
-/********************************************************************
- *    uint16_t data_send_to_pc(enum pc_cmd_type cmd, char *data, uint16_t len)
- *
- *描述:发生数据到PC
- *参数:Devicenum 0-发至主机,1发至从机
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-uint16_t data_send_to_pc(enum pc_cmd_type cmd, char *data, uint16_t len)
-{
-    uint16_t check;
-    struct CmdMessage msg;	
-    int ret = 0;
-
-    msg.head = 0x55aa;
-    msg.seq = cmd_frame_type_req;
-    msg.cmd = cmd;
-    msg.tail = 0x5a;
-    msg.len = len;
-    msg.data = data;
-	if((len+8) > WIFI_TX_BUF_SIZE){
-		 LOG_E("send_to_pc :%x  len:%d error ", cmd, len);
-		 return  -1;
-
-	}
-	if(pc_channel_send == 1 && !connectTcpFlag && cmd != PC_CMD_SETIP){
-				/*UDP 模式,不响应设置IP以为指令*/
-				return -1;
-	}			
-	if((pc_channel_send == 1 && PC_CMD_DATASCOPE == cmd)|| /*网口不上报数据*/
-		(pc_channel_send != 1 && PC_CMD_SETIP == cmd))     /*串口不广播UDP*/{
-		return  -1;
-	}	
-    switch(cmd)
-    {
-        case PC_CMD_QRCODE:
-        case PC_CMD_DATA_UPLOAD:
-        case PC_CMD_REPORT_RESULT:
-			seq++;
-			if(0xff == seq){
-				seq =1;
-			}
-            msg.seq = seq;
-            break;
-        default:    //应答
-            break;
-    }
-	check = checkSum(&msg.seq, 4);
-	check += checkSum(data, len);
-	msg.checksum = check & 0xFF;
-	msg.tail = (check >> 8);	
-	if(check_to_pc_busy()){		
-		memcpy(&wifi_tx_buf[0], (uint8_t*)&msg, g_uMsgCmdFrameLen);
-		memcpy(&wifi_tx_buf[g_uMsgCmdFrameLen], data, len);
-		memcpy(&wifi_tx_buf[g_uMsgCmdFrameLen+len],  (uint8_t*)&check, 2);
-		wifi_tx_len = g_uMsgCmdFrameLen+len+2;	
-	}else{
-		return -1;
-	}	
-	if((pc_channel_send == 1 || cmd == PC_CMD_SETIP ) && PC_CMD_SETWIFI != cmd)
-	{			
-		return WIFI_ReSend();
-	}
-	else
-	{	
-		WriteComm0(wifi_tx_buf, wifi_tx_len);			
-		memset(wifi_tx_buf, 0, sizeof(wifi_tx_buf));
-	}
-}
-
-unsigned int check_to_pc_busy(void){
-	/*判断是否可以发送,缓冲区为空或者索引为0*/
-	struct CmdMessage *pMessage = (struct CmdMessage *)wifi_tx_buf;
-	if(pMessage->seq == 0 || pMessage->len == 0){
-		return 1;
-	}
-	return 0;
-	
-}
-
-///********************************************************************
-// *    void data_resend_to_pc(void)
-// *
-// *描述:判断缓冲区内容,是否需要重发
-// *参数:无
-// *返回:无
-// *其他:无
-// *--------------------------------------------------------------------
-// *记录:
-// ********************************************************************/
-void pc_resend_del(uint8_t seq){
-	struct CmdMessage *pMessage = (struct CmdMessage *)wifi_tx_buf;
-	if(pMessage->seq == seq){
-		wifi_tx_len = 0;
-		memset(wifi_tx_buf, 0, sizeof(wifi_tx_buf));
-	}
-}
-
-/********************************************************************
- *    uint16_t send_Devinf_pc(void)
- *
- *描述:发送设备信息到主机,便于主机下法TCP信息
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-void send_Devinf_pc(void)
-{
-
-    uint16_t len = 0;
-	len =  strlen(DeviceNum);
-	data_send_to_pc(PC_CMD_SETIP,DeviceNum,len);
-
-}
-
-#ifdef ONECHIP_MINI_ONE
-int send_temp_parm(uint8_t cmd, uint8_t *parg)
-{
-	b2b_send_device(B2B_CMD_THEROM_GOAL_ONCE, parg,  16, !Devicenum);
-	return 1;
-		
-	
-}
-int setTemp_response(struct CmdMessage *pMsg, uint8_t result)
-{
-//    char result = 1;
-    data_send_to_pc(PC_CMD_SETRUNTEMP, &result, 1);
-}
-#endif
-
-
-
-
-void set_pc_chanel_recv(uint8_t channel)
-{
-    pc_channel_recv = channel;
-}
-
-void set_pc_chanel_temp()
-{
-    if(pc_channel_recv == 2)
-        timeout_com = 0;
-    
-    pc_channel_send_backup = pc_channel_send;
-    pc_channel_send = pc_channel_recv;
-}
-
-void reload_pc_chanel()
-{
-    if(pc_channel_recv > pc_channel_send_backup)   //串口优先
-    {
-        pc_channel_send_backup = pc_channel_recv;
-    }
-
-    pc_channel_send = pc_channel_send_backup;
-}
-
-void set_pc_chanel(uint8_t channel)
-{
-    pc_channel_send_backup = channel;
-    pc_channel_send = channel;
-}
-
-
-/********************************************************************
- * int handshake_action(uint8_t cmd, uint8_t *parg)
- *
- *描述:握手命令处理
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int handshake_action(uint8_t cmd, uint8_t *parg)
-{
-    if(state_controlword < Hand_Shake_cmd)      //上位机会间隔发送握手,保活
-    {
-        state_controlword = Hand_Shake_cmd;
-    }
-
-    return 0;
-}
-
-void char_replace(uint8_t *str, int size, uint8_t ch, uint8_t replace)
-{
-    for(int i = 0; i < size; i++)
-    {
-        if(str[i] == ch)
-            str[i] = replace;
-    }
-}
-
-
-/********************************************************************
- * int wifi_action(uint8_t cmd, uint8_t *parg)
- *
- *描述:设置wifi命令处理
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int wifi_action(uint8_t cmd, uint8_t *parg)
-{
-//    char_replace(parg, 64, 0xAA, 0);
-//    char_replace(parg, 64, 0xAD, ' ');
-    wifiCfg_set_new_wifi_param(parg, parg + WIFI_AP_NAME_MAX_LEN);
-
-    // wifi用户名和密码设置
-    WIFI_set_ssid();
-
-    return 1;
-}
-int setState_action(uint8_t cmd, uint8_t *parg)
-{
-	uint8_t block = *parg++;
-	uint8_t nextState = *parg;
-	if(block==0){
-		if(SYS_STATE_WORKEND == nextState){
-			psm.state = SW_move_card;
-		}
-	}else{
-		/*下发命令,改变从模块状态*/
-		b2b_send_device(B2B_CMD_STATE_SET, &nextState, sizeof(nextState), 1);
-	}
-	
-
-
-    return 1;
-}
-
-
-
-/********************************************************************
- * int wifi_action(uint8_t cmd, uint8_t *parg)
- *
- *描述:设置wifi命令处理
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int SN_action(uint8_t cmd, uint8_t *parg)
-{
-    
-	parg[15] = 0;
-	strcpy(g_cfg.SN, parg);	
-	PackDeviceNum();
-	return cfg_save_cfg_param();
-}
-
-
-/********************************************************************
- * int seq_selftest_action(uint8_t cmd, uint8_t *parg)
- *
- *描述:设备自检处理
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int seq_selftest_action(uint8_t cmd, uint8_t *parg)
-{
-    return 0;
-}
-
-/********************************************************************
- * int confirm_result_action(uint8_t cmd, uint8_t *parg)
- *
- *描述:设备收到pc的结果响应
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int confirm_result_action(uint8_t cmd, uint8_t *parg)
-{
-    if(Devicenum)
-    {
-        return 0;
-    }
-
-    if(0 == memcmp(parg,card_param_info.pid, 10 ))
-        state_controlword = result_move_card;
-
-    return 0;
-}
-
-/********************************************************************
- * int default_pc_response(struct CmdMessage *pMsg, uint8_t result)
- *
- *描述:默认回应PC
- *参数:无
- *返回:成功->0 失败->-1
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int default_pc_response(struct CmdMessage *pMsg, uint8_t result)
-{
-    if(Devicenum)
-    {
-        return 0;
-    }
-
-	return data_send_to_pc(pMsg->cmd, &result, 1);
-}
-
-/********************************************************************
- * int handshake_response(struct CmdMessage *pMsg, uint8_t result)
- *
- *描述:握手回应
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int handshake_response(struct CmdMessage *pMsg, uint8_t result)
-{
-	int len = 0;
-//	PackDeviceNum();
-	len = strlen(DeviceNum);
-	return data_send_to_pc(pMsg->cmd, (uint8_t*)DeviceNum, len);
-}
-
-	
-int AskState_response(struct CmdMessage *pMsg, uint8_t result)
-{
-	ANS_State();
-}
-
-int set_response(struct CmdMessage *pMsg, uint8_t result)
-{
-//    char wifi_result = 1;
-//    data_send_to_pc(PC_CMD_SETWIFI, &wifi_result, 1);
-}
-
-int setState_response(struct CmdMessage *pMsg, uint8_t result)
-{
-//    char result = 1;
-    data_send_to_pc(PC_CMD_SETSTATE, &result, 1);
-}
-
-
-int ans_response(struct CmdMessage *pMsg, uint8_t result)
-{	
-	/*清空需要上位机应答的消息*/
-	switch(pMsg->cmd){
-		case PC_CMD_REPORT_REEOR:
-//			unsigned char *data = pMsg->data;
-//			if(*data == Devicenum){
-//			}
-			
-			clean_error_update();
-
-			break;
-		case PC_CMD_UPDATESTATE:
-    		clean_state_update();
-			break;
-		case PC_CMD_QRCODE:
-    		clean_QR_update();
-			break;
-		case PC_CMD_DATA_UPLOAD:{
-			unsigned char *data = pMsg->data;			
-			unsigned int recdex = 0xfffffff;
-//			unsigned char result = *data;
-//			unsigned char part = *(data+1);
-			if( pMsg->len == 6){
-				recdex = *(data+5);
-			    recdex = recdex<<8;
-				recdex += *(data+4);
-			    recdex = recdex<<8;
-				recdex += *(data+3);
-			    recdex = recdex<<8;
-				recdex += *(data+2);
-			}else{
-				if(seq == pMsg->seq){
-					recdex = 0;
-				}
-			}
-			updateData_next(recdex,data);
-	    	
-		}
-			break;	
-		case PC_CMD_REPORT_RESULT:{
-			
-			unsigned char *data = pMsg->data;	
-//			unsigned char result = *data;
-//			unsigned char part = *(data+1);	
-			clean_reult_next(data);
-//			if(result){		
-//				/*消息成功,进行跟新*/		
-//				clean_reult_next(part);
-//			}
-		}
-			break;		
-	}
-}
-
-int confirm_qrcode_action(uint8_t cmd, uint8_t *parg)
-{
-    //PC返回成功,才认为扫码成功
-	scan_qrcode_ropprt = 1;
-    if(*parg == 1)
-    {
-        if(0 == mem_value(&card_param_info_temp, 0 , sizeof(str_card_param_info_t)))
-        {
-//			scan_qrcode_ropprt = 1;
-			LOG_D("rec no card \n\r:");
-            return -1;
-        }
-        if((psm.state == SW_Scan_Qrcode || psm.state == SW_Chip_Id  ))   //主机空闲,给自己
-        {
-            scan_qrcode_done = 1;
-            memcpy(&card_param_info, &card_param_info_temp, sizeof(str_card_param_info_t));
-        }
-        else
-        {
-            //比较是否跟主模块相同
-            if(0 == memcmp(&card_param_info, &card_param_info_temp, sizeof(str_card_param_info_t)))
-            {
-                return 0;
-            }
-            //主机不空,下发给从机
-            card_param_info_temp.envtemp = evnTemp;
-            b2b_send_device(B2B_CMD_REQ_QRCODE, (char *)&card_param_info_temp, sizeof(str_card_param_info_t), 1);
-        }
-		LOG_D("rec start\n\r:");
-    	return 0;
-		
-    }	
-	LOG_D("rec no macth\n\r:");
-    return -1;
-}
-
-
-int confirm_error_action(uint8_t cmd, uint8_t *parg)
-{
-    return 0;
-}
-
-
-int confirm_data_action(uint8_t cmd, uint8_t *parg)
-{
-    return 0;
-}
-
-const struct PCActionPack mPCActionPack[] =
-    {
-        {
-            .cmd = PC_CMD_HANDSHAKE,
-            .action = handshake_action,
-            .response = handshake_response,
-            .datalen = 0,
-        },
-        {
-            .cmd = PC_CMD_SETWIFI,
-            .action = wifi_action,
-            .response = set_response,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_SETSN,
-            .action = SN_action,
-            .response = handshake_response,
-            .datalen = 7,
-        },
-        {
-            .cmd = PC_CMD_QRCODE,
-            .action = confirm_qrcode_action,
-            .response = ans_response,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_SNANDCARD,
-            .action = confirm_error_action,
-            .datalen = 1,
-        },
-        {
-            .cmd = PC_CMD_REPORT_RESULT,
-            .action = confirm_result_action,
-            .response = ans_response,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_REPORT_REEOR,
-            .action = confirm_error_action,
-            .response = ans_response,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_DATA_UPLOAD,
-            .action = confirm_data_action,
-            .response = ans_response,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_SETIP,
-            .action = set_IP_action,
-            .response = NULL,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_UPDATESTATE,
-            .action = confirm_data_action,
-            .response = ans_response,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_ASKSTATE,
-            .action = confirm_data_action,
-            .response = AskState_response,
-            .datalen = 0xff,
-        },
-        {
-            .cmd = PC_CMD_SETSTATE,
-            .action = setState_action,
-            .response = setState_response,
-            .datalen = 0xff,
-        },
-#ifdef ONECHIP_MINI_ONE
-        {
-            .cmd = PC_CMD_SETRUNTEMP,
-            .action = send_temp_parm,
-            .response = setTemp_response,
-            .datalen = 0xff,
-        },
-#endif
-};
-			
-
-
-/********************************************************************
- * int handshake_action(uint8_t cmd, uint8_t *parg)
- *
- *描述:握手命令处理
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-int con_heat_action(uint8_t cmd, uint8_t *parg )
-{
-//    CmdMessage *pMsg = (CmdMessageDef *)parg;
-    struct CmdMessage *pMsg = (struct CmdMessage *)parg;;
-    miniConfigPram *pram = (miniConfigPram *)pMsg->data;
-	if(pram->partID == Devicenum){
-		if( pMsg->cmd == UINON_CMD_MOTORMOVE ){
-			/*直接透传给从muc处理*/
-			g_cfg.timeinner =  *(float *)(pMsg->data+4) * 100;
-			g_cfg.swingspeed =  *(float *)(pMsg->data+8);
-			g_cfg.swingtime =  *(float *)(pMsg->data+12) * 100;
-			g_cfg.swingtimeRight =  *(float *)(pMsg->data+16) * 100;
-			g_cfg.swingtimePause =  *(float *)(pMsg->data+20) * 100;	
-			if((1 == *(int *)(pMsg->data+pMsg->len - 4))){
-				cfg_save_cfg_param();	
-				Motor_Init();
-			}else{				
-				Motor_mix(g_cfg.timeinner,g_cfg.swingspeed,g_cfg.swingtime,g_cfg.swingtimeRight,g_cfg.swingtimePause);
-			}		
-		    data_send_to_pc(pMsg->cmd, pMsg->data,  pMsg->len);
-		}
-		if( pMsg->cmd == UINON_CMD_MOTORTRETURN ){
-			/*直接透传给从muc处理*/
-			uint32_t time = *(float *)(pMsg->data+4) * 10;
-			uint32_t speed =  *(float *)(pMsg->data+8) ;
-		    data_send_to_pc(pMsg->cmd, pMsg->data,  pMsg->len);
-//			sw_st = FIND_GAPNUM;
-//			stateFistin = 1;
-		}
-#ifdef ONECHIP_MINI_ONE
-		if( pMsg->cmd == UINON_CMD_TEMP_ADJ || 
-			pMsg->cmd == UINON_CMD_TEMP_PID ||
-			pMsg->cmd == UINON_CMD_TEMP_ADJ_GET	|| 
-			pMsg->cmd == UINON_CMD_TEMP_PID_GET	|| 
-			pMsg->cmd == UINON_CMD_TEMP_START	|| 
-			pMsg->cmd == UINON_CMD_TEMP_STOP){
-			/*直接透传给从muc处理*/
-			sendMsgtoSlaveMcu(pMsg);
-		}
-#endif
-	}else{
-#ifdef ONECHIP_MINI_ONE
-		switch(pMsg->cmd){
-			case UINON_CMD_THEROM_GOAL:{
-				b2b_send_device(B2B_CMD_THEROM_GOAL, pMsg->data,  pMsg->len, !Devicenum);
-			}break;
-			
-			case UINON_CMD_THEROM_OFFSET:{
-				b2b_send_device(B2B_CMD_THEROM_OFFSET, pMsg->data,  pMsg->len, !Devicenum);
-			}break;
-			
-			case UINON_CMD_THEROM_GET:{
-				b2b_send_device(B2B_CMD_GETTHEROMPRAM_ACK, pMsg->data,  pMsg->len, !Devicenum);
-			}break;
-		}		
-		/*发送给从模块 稍后实现*/
-#endif
-	}
-    return 0;
-}
-const struct PCActionPack mUnionActionPack[] =
-    {
-        {
-            .cmd = UINON_CMD_MOTORMOVE,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_MOTORTRETURN,
-            .action = con_heat_action,
-        },
-#ifdef ONECHIP_MINI_ONE
-        {
-            .cmd = UINON_CMD_TEMP_ADJ,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_TEMP_PID,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_TEMP_ADJ_GET,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_TEMP_PID_GET,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_TEMP_START,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_TEMP_STOP,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_THEROM_GOAL,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_THEROM_OFFSET,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_THEROM_GET,
-            .action = con_heat_action,
-        },
-        {
-            .cmd = UINON_CMD_TEMP_DEBUG,
-            .response = handshake_response,
-        },
-				
-#endif
-
-};
-
- 
-
-void deal_mUnion_cmd(struct CmdMessage *pMsg)
-{
-	for (uint8_t i = 0; i < sizeof(mUnionActionPack)/sizeof(mUnionActionPack[0]); i++)
-	{
-		if (mUnionActionPack[i].cmd == pMsg->cmd ) 
-		{			
-			uint8_t ret = mUnionActionPack[i].action( pMsg->cmd,(uint8_t *)pMsg);
-			if (mUnionActionPack[i].response)
-			{
-				mUnionActionPack[i].response(pMsg, ret);
-			}
-			break;
-		}
-	}
-}
-
-
-/********************************************************************
- * void query_pc_cmd(struct CmdMessage *pMsg)
- *
- *描述:处理PC命令
- *参数:无
- *返回:无
- *其他:无
- *--------------------------------------------------------------------
- *记录:
- ********************************************************************/
-void query_pc_cmd(struct CmdMessage *pMsg)
-{
-    for (uint8_t i = 0; i < sizeof(mPCActionPack)/sizeof(mPCActionPack[0]); i++)
-    {
-        if (mPCActionPack[i].cmd == pMsg->cmd && (mPCActionPack[i].datalen == pMsg->len || mPCActionPack[i].datalen == 0xff)) //防止接收到其他设备的数据帧
-        {
-            if(pc_send_cmd == mPCActionPack[i].cmd)
-                pc_send_wait = 0;
-            if(mPCActionPack[i].cmd != 1)
-            {
-            	pc_resend_del(pMsg->seq);
-                LOG_I("\n<-- pc cmd %x %d \n", pMsg->cmd, pMsg->seq);
-            }
-			pMsg->data[pMsg->len] = 0;
-            uint8_t ret = mPCActionPack[i].action(mPCActionPack[i].cmd, pMsg->data);
-            if (mPCActionPack[i].response)
-            {
-                mPCActionPack[i].response(pMsg, ret);
-            }
-			if(!(pc_channel_recv == 1 && !connectTcpFlag)){				
-    			pc_link_timeout = 0;    //确保TCP通信上在变灯
-			}
-            break;
-        }
-    }
-}
-

+ 1 - 0
DriverInterface/usr_lysis.c

@@ -330,6 +330,7 @@ uint32_t lysis_work(void) {
 			updateLysisState(SYS_STATE_WORKEND);
 			ptherm->firstin = false;
 			Close_therm(0);
+			beep_set(BEEP_WORKEND);
 			last10ms = conter10ms;
 		}else{			
 			if((conter10ms-last10ms)> GOTO_IDLE_GAP){

+ 2 - 2
DriverInterface/van_BSP_Scanner.c

@@ -132,9 +132,9 @@ void svanner_receive_analysis(void)
 					}
 #endif
 				}
-				sysinf.QRBeepTimeer = 100;
 				sysinf.resendeQRtimer = 1;
-				HAL_GPIO_WritePin((GPIO_TypeDef *)sysinf.beep_port, sysinf.beep_pin,GPIO_PIN_SET); 
+				       
+				beep_set(BEEP_SCANOK);
 			}
 			else{
 				Van_Device_Printf(VAN_LOG_WARN, "unpack json error \n\r %s",g_uart2_rx_buf);

+ 49 - 8
DriverInterface/ws2812.c

@@ -87,6 +87,46 @@ void ws2812_set_rgb(uint32_t rgb)
     }
 }
 
+/********************************************************************
+ *描述:蜂鸣器设置
+ ********************************************************************/
+void beep_set(BEEPTYPE beep){
+
+    switch(beep){
+        case BEEP_ERR_HW:{
+	        sysinf.QRBeepTimeer = 0xfffffff;
+	        sysinf.QRBeepFlash = 250; 
+	        sysinf.QRBeepFlashAll = 500;
+        }
+        break;
+        case BEEP_ERR_HM:{
+	        sysinf.QRBeepTimeer = 0xfffffff;
+	        sysinf.QRBeepFlash = 250; 
+	        sysinf.QRBeepFlashAll = 500;
+        }
+        break;
+        case BEEP_SCANOK:{
+	        sysinf.QRBeepTimeer = 200;
+	        sysinf.QRBeepFlash = 1; 
+	        sysinf.QRBeepFlashAll = 200;
+        }
+        break;
+        case BEEP_WORKEND:{
+	        sysinf.QRBeepTimeer = 30*1000;
+	        sysinf.QRBeepFlash = 500; 
+	        sysinf.QRBeepFlashAll = 1000;
+        }
+        break;
+        default:{
+	        sysinf.QRBeepTimeer = 0;
+	        sysinf.QRBeepFlash = 0; 
+	        sysinf.QRBeepFlashAll = 0;
+            HAL_GPIO_WritePin((GPIO_TypeDef *)sysinf.beep_port, sysinf.beep_pin,GPIO_PIN_RESET);
+        }
+    }
+}
+
+
 
 /********************************************************************
  * void light_set(uint8_t mode_select, uint16_t speed_ms, uint32_t rgb_color, uint8_t channel)
@@ -111,12 +151,12 @@ void light_set(uint8_t mode_select, uint16_t speed_ms, uint32_t rgb_color, uint8
     lihgt_ctrl.light_color[channel] = rgb_color;
 
     //两边步调同步
-    // if(lihgt_ctrl.light_mode[0] == lihgt_ctrl.light_mode[1])
-    // {
-    //     lihgt_ctrl.breath_count[0] = lihgt_ctrl.breath_count[1];
-    //     lihgt_ctrl.breath_dir[0] = lihgt_ctrl.breath_dir[1];
-    //     lihgt_ctrl.light_color_use[0] = lihgt_ctrl.light_color_use[1];
-    // }
+    if(lihgt_ctrl.light_mode[0] == lihgt_ctrl.light_mode[1])
+    {
+        lihgt_ctrl.breath_count[0] = lihgt_ctrl.breath_count[1];
+        lihgt_ctrl.breath_dir[0] = lihgt_ctrl.breath_dir[1];
+        lihgt_ctrl.light_color_use[0] = lihgt_ctrl.light_color_use[1];
+    }
 }
 
 
@@ -140,7 +180,6 @@ void light_update(void){
         light_set(MODE_NORMAL,1000, COLOR_RED,1);	//
         return ;
     } else   if(sysinf.pc_link_timeout == OFFLINE_TIME){
-        sysinf.connectHostFlag = 0;
         light_set(MODE_BLINK,1000, COLOR_YELLOW,0);	//
         light_set(MODE_BLINK,1000, COLOR_YELLOW,1);	//
         sysinf.pc_channel_recv  = PC_CONNECT_TYPE_NULL;
@@ -191,7 +230,9 @@ void light_update(void){
             break;
         }
     }
-    sysinf.pc_link_timeout++;
+    if(sysinf.system_debugFlag == 0){            
+        sysinf.pc_link_timeout++;
+    }
     
 }
 

+ 10 - 1
DriverInterface/ws2812.h

@@ -11,6 +11,15 @@
 #define WS2812_IO PA3   //引脚
 #define BREATH_NUM 50   //呼吸灯变化次数
 
+typedef enum
+{
+	BEEP_MUTE  = 0x00,/*静默*/
+	BEEP_ERR_HW = 0x01,/*设备故障*/
+	BEEP_ERR_HM = 0x02,/*操作故障*/
+	BEEP_SCANOK = 0x03,/*扫码成功*/
+	BEEP_WORKEND = 0x04/*完成*/
+} BEEPTYPE;
+
 struct str_ws2812
 {
     uint32_t light_color[2];
@@ -41,6 +50,6 @@ enum light_color_type
 void light_ctrl(void);
 void light_refresh(uint32_t rgb_left, uint32_t rgb_right);
 void light_set(uint8_t mode_select, uint16_t speed_ms, uint32_t rgb_color, uint8_t channel);
-
+void beep_set(BEEPTYPE beep);
 
 #endif

+ 1 - 1
Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h

@@ -755,7 +755,7 @@ HAL_StatusTypeDef HAL_UART_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pData
 HAL_StatusTypeDef HAL_UART_DMAPause(UART_HandleTypeDef *huart);
 HAL_StatusTypeDef HAL_UART_DMAResume(UART_HandleTypeDef *huart);
 HAL_StatusTypeDef HAL_UART_DMAStop(UART_HandleTypeDef *huart);
-HAL_StatusTypeDef HAL_UART_RX_DMAStop(UART_HandleTypeDef *huart);
+
 HAL_StatusTypeDef HAL_UARTEx_ReceiveToIdle(UART_HandleTypeDef *huart, uint8_t *pData, uint16_t Size, uint16_t *RxLen,
                                            uint32_t Timeout);
 HAL_StatusTypeDef HAL_UARTEx_ReceiveToIdle_IT(UART_HandleTypeDef *huart, uint8_t *pData, uint16_t Size);

+ 0 - 34
Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c

@@ -1573,40 +1573,6 @@ HAL_StatusTypeDef HAL_UART_DMAStop(UART_HandleTypeDef *huart)
   return HAL_OK;
 }
 
-
-/**
-  * @brief Stops the DMA Transfer.
-  * @param  huart  Pointer to a UART_HandleTypeDef structure that contains
-  *                the configuration information for the specified UART module.
-  * @retval HAL status
-  */
-HAL_StatusTypeDef HAL_UART_RX_DMAStop(UART_HandleTypeDef *huart)
-{
-  uint32_t dmarequest = 0x00U;
-  /* The Lock is not implemented on this API to allow the user application
-     to call the HAL UART API under callbacks HAL_UART_TxCpltCallback() / HAL_UART_RxCpltCallback():
-     when calling HAL_DMA_Abort() API the DMA TX/RX Transfer complete interrupt is generated
-     and the correspond call back is executed HAL_UART_TxCpltCallback() / HAL_UART_RxCpltCallback()
-     */
-
-
-  /* Stop UART DMA Rx request if ongoing */
-  dmarequest = HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR);
-  if ((huart->RxState == HAL_UART_STATE_BUSY_RX) && dmarequest)
-  {
-    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
-
-    /* Abort the UART DMA Rx channel */
-    if (huart->hdmarx != NULL)
-    {
-      HAL_DMA_Abort(huart->hdmarx);
-    }
-    UART_EndRxTransfer(huart);
-  }
-
-  return HAL_OK;
-}
-
 /**
   * @brief Receive an amount of data in blocking mode till either the expected number of data is received or an IDLE event occurs.
   * @note   HAL_OK is returned if reception is completed (expected number of data has been received)

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
MDK-ARM/mini7_V2.uvguix.Administrator


+ 39 - 60
MDK-ARM/mini7_V2.uvoptx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
 
   <SchemaVersion>1.0</SchemaVersion>
@@ -45,7 +45,7 @@
         <PageWidth>79</PageWidth>
         <PageLength>66</PageLength>
         <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
+        <ListingPath />
       </OPTLEX>
       <ListingPage>
         <CreateCListing>1</CreateCListing>
@@ -104,16 +104,16 @@
         <bSchkAxf>0</bSchkAxf>
         <bTchkAxf>0</bTchkAxf>
         <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
+        <sDll />
+        <sDllPa />
+        <sDlgDll />
+        <sDlgPa />
+        <sIfile />
+        <tDll />
+        <tDllPa />
+        <tDlgDll />
+        <tDlgPa />
+        <tIfile />
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
@@ -130,7 +130,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
+          <Name />
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -148,40 +148,7 @@
           <Name>-U-O142 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RE$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>41</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134316420</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\tshell\van_bsp_debug_uart.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../tshell/van_bsp_debug_uart.c\41</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>113</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134315854</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\tshell\van_bsp_debug_uart.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\mini7_V2\../tshell/van_bsp_debug_uart.c\113</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint />
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -216,7 +183,7 @@
         <Ww>
           <count>6</count>
           <WinNumber>1</WinNumber>
-          <ItemText>ADC1_Converted_Value</ItemText>
+          <ItemText>cmd_rx_header</ItemText>
         </Ww>
         <Ww>
           <count>7</count>
@@ -226,7 +193,7 @@
         <Ww>
           <count>8</count>
           <WinNumber>1</WinNumber>
-          <ItemText>lihgt_ctrl</ItemText>
+          <ItemText>g_cmd_rx_buf</ItemText>
         </Ww>
       </WatchWindow1>
       <MemoryWindow1>
@@ -266,19 +233,19 @@
         <newCpu>0</newCpu>
         <uProt>0</uProt>
       </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
+      <LintExecutable />
+      <LintConfigFile />
       <bLintAuto>0</bLintAuto>
       <bAutoGenD>0</bAutoGenD>
       <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
+      <pMisraName />
+      <pszMrule />
+      <pSingCmds />
+      <pMultCmds />
+      <pMisraNamep />
+      <pszMrulep />
+      <pSingCmdsp />
+      <pMultCmdsp />
       <SystemViewers>
         <Entry>
           <Name>System Viewer\GPIOA</Name>
@@ -437,7 +404,7 @@
 
   <Group>
     <GroupName>Drivers/STM32F1xx_HAL_Driver</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -917,6 +884,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\DriverInterface\van_BSP_Temp_mts01.c</PathWithFileName>
+      <FilenameWithoutPath>van_BSP_Temp_mts01.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>

+ 183 - 62
MDK-ARM/mini7_V2.uvprojx

@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" noNamespaceSchemaLocation="project_projx.xsd">
   <SchemaVersion>2.1</SchemaVersion>
-
   <Header>### uVision Project, (C) Keil Software</Header>
-
   <Targets>
     <Target>
       <TargetName>mini7_V2</TargetName>
@@ -19,28 +16,28 @@
           <PackID>Keil.STM32F1xx_DFP.2.4.1</PackID>
           <PackURL>https://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000-0x2000FFFF) IROM(0x8000000-0x807FFFF)  CLOCK(8000000) CPUTYPE("Cortex-M3") TZ</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll></FlashDriverDll>
+          <FlashUtilSpec />
+          <StartupFile />
+          <FlashDriverDll />
           <DeviceId>0</DeviceId>
-          <RegisterFile></RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <RegisterFile />
+          <MemoryEnv />
+          <Cmp />
+          <Asm />
+          <Linker />
+          <OHString />
+          <InfinionOptionDll />
+          <SLE66CMisc />
+          <SLE66AMisc />
+          <SLE66LinkerMisc />
           <SFDFile>$$Device:STM32F103RE$SVD\STM32F103xx.svd</SFDFile>
           <bCustSvd>0</bCustSvd>
           <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
+          <BinPath />
+          <IncludePath />
+          <LibPath />
+          <RegisterFilePath />
+          <DBRegisterFilePath />
           <TargetStatus>
             <Error>0</Error>
             <ExitCodeStop>0</ExitCodeStop>
@@ -55,15 +52,15 @@
           <CreateHexFile>1</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
+          <ListingPath />
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
           <BeforeCompile>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
+            <UserProg1Name />
+            <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
             <nStopU1X>0</nStopU1X>
@@ -72,8 +69,8 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
+            <UserProg1Name />
+            <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
             <nStopB1X>0</nStopB1X>
@@ -81,16 +78,16 @@
           </BeforeMake>
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
+            <RunUserProg2>1</RunUserProg2>
             <UserProg1Name>C:\Keil_v5\ARM\ARMCC\bin\fromelf   --bin --output ./mini7_V2/mini7_V2.bin ./mini7_V2/mini7_V2.axf</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
+            <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
             <nStopA1X>0</nStopA1X>
             <nStopA2X>0</nStopA2X>
           </AfterMake>
           <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
+          <SVCSIdString />
         </TargetCommonOption>
         <CommonProperty>
           <UseCPPCompiler>0</UseCPPCompiler>
@@ -104,8 +101,8 @@
           <AssembleAssemblyFile>0</AssembleAssemblyFile>
           <PublicsOnly>0</PublicsOnly>
           <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
+          <CustomArgument />
+          <IncludeLibraryModules />
           <ComprImg>0</ComprImg>
         </CommonProperty>
         <DllOption>
@@ -114,7 +111,7 @@
           <SimDlgDll>DCM.DLL</SimDlgDll>
           <SimDlgDllArguments>-pCM3</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments></TargetDllArguments>
+          <TargetDllArguments />
           <TargetDlgDll>TCM.DLL</TargetDlgDll>
           <TargetDlgDllArguments>-pCM3</TargetDlgDllArguments>
         </DllOption>
@@ -138,11 +135,11 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
+          <Flash3 />
+          <Flash4 />
+          <pFcarmOut />
+          <pFcarmGrp />
+          <pFcArmRoot />
           <FcArmLst>0</FcArmLst>
         </Utilities>
         <TargetArmAds>
@@ -175,7 +172,7 @@
             <RvctClst>0</RvctClst>
             <GenPPlst>0</GenPPlst>
             <AdsCpuType>"Cortex-M3"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
+            <RvctDeviceName />
             <mOS>0</mOS>
             <uocRom>0</uocRom>
             <uocRam>0</uocRam>
@@ -308,7 +305,7 @@
                 <Size>0x0</Size>
               </OCR_RVCT10>
             </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
+            <RvctStartVector />
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
@@ -335,9 +332,9 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
+              <MiscControls />
               <Define>USE_HAL_DRIVER,STM32F103xE,ONECHIP_MINI_ONE</Define>
-              <Undefine></Undefine>
+              <Undefine />
               <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../BoardInterface;../DriverInterface;../tshell</IncludePath>
             </VariousControls>
           </Cads>
@@ -353,10 +350,10 @@
             <useXO>0</useXO>
             <uClangAs>0</uClangAs>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
+              <MiscControls />
+              <Define />
+              <Undefine />
+              <IncludePath />
             </VariousControls>
           </Aads>
           <LDads>
@@ -366,15 +363,15 @@
             <noStLib>0</noStLib>
             <RepFail>1</RepFail>
             <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile></ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
+            <TextAddressRange />
+            <DataAddressRange />
+            <pXoBase />
+            <ScatterFile />
+            <IncludeLibs />
+            <IncludeLibsPath />
+            <Misc />
+            <LinkerInputFile />
+            <DisabledWarnings />
           </LDads>
         </TargetArmAds>
       </TargetOption>
@@ -417,6 +414,66 @@
               <FileType>1</FileType>
               <FilePath>../Core/Src/i2c.c</FilePath>
             </File>
+            <File>
+              <FileName>iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/iwdg.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                  </Cads>
+                  <Aads>
+                    <interw>2</interw>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <thumb>2</thumb>
+                    <SplitLS>2</SplitLS>
+                    <SwStkChk>2</SwStkChk>
+                    <NoWarn>2</NoWarn>
+                    <uSurpInc>2</uSurpInc>
+                    <useXO>2</useXO>
+                    <ClangAsOpt>1</ClangAsOpt>
+                  </Aads>
+                </FileArmAds>
+              </FileOption>
+            </File>
             <File>
               <FileName>tim.c</FileName>
               <FileType>1</FileType>
@@ -512,6 +569,66 @@
               <FileType>1</FileType>
               <FilePath>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32f1xx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                  </Cads>
+                  <Aads>
+                    <interw>2</interw>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <thumb>2</thumb>
+                    <SplitLS>2</SplitLS>
+                    <SwStkChk>2</SwStkChk>
+                    <NoWarn>2</NoWarn>
+                    <uSurpInc>2</uSurpInc>
+                    <useXO>2</useXO>
+                    <ClangAsOpt>1</ClangAsOpt>
+                  </Aads>
+                </FileArmAds>
+              </FileOption>
+            </File>
             <File>
               <FileName>stm32f1xx_hal_tim.c</FileName>
               <FileType>1</FileType>
@@ -647,6 +764,11 @@
               <FileType>1</FileType>
               <FilePath>..\DriverInterface\user_heater.c</FilePath>
             </File>
+            <File>
+              <FileName>van_BSP_Temp_mts01.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\DriverInterface\van_BSP_Temp_mts01.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -655,18 +777,17 @@
       </Groups>
     </Target>
   </Targets>
-
   <RTE>
-    <apis/>
+    <apis />
     <components>
       <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0" />
         <targetInfos>
-          <targetInfo name="mini7_V2"/>
+          <targetInfo name="mini7_V2" />
         </targetInfos>
       </component>
     </components>
-    <files/>
+    <files />
   </RTE>
-
 </Project>
+

+ 24 - 17
mini7_V2.ioc

@@ -56,24 +56,28 @@ Dma.USART1_TX.1.Priority=DMA_PRIORITY_LOW
 Dma.USART1_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
+IWDG.IPParameters=Prescaler,Reload
+IWDG.Prescaler=IWDG_PRESCALER_64
+IWDG.Reload=1230
 KeepUserPlacement=false
 Mcu.CPN=STM32F103RET6
 Mcu.Family=STM32F1
 Mcu.IP0=ADC1
 Mcu.IP1=DMA
-Mcu.IP10=TIM4
-Mcu.IP11=UART4
-Mcu.IP12=USART1
-Mcu.IP13=USART2
+Mcu.IP10=TIM3
+Mcu.IP11=TIM4
+Mcu.IP12=UART4
+Mcu.IP13=USART1
+Mcu.IP14=USART2
 Mcu.IP2=I2C1
 Mcu.IP3=I2C2
-Mcu.IP4=NVIC
-Mcu.IP5=RCC
-Mcu.IP6=SYS
-Mcu.IP7=TIM1
-Mcu.IP8=TIM2
-Mcu.IP9=TIM3
-Mcu.IPNb=14
+Mcu.IP4=IWDG
+Mcu.IP5=NVIC
+Mcu.IP6=RCC
+Mcu.IP7=SYS
+Mcu.IP8=TIM1
+Mcu.IP9=TIM2
+Mcu.IPNb=15
 Mcu.Name=STM32F103R(C-D-E)Tx
 Mcu.Package=LQFP64
 Mcu.Pin0=PD0-OSC_IN
@@ -109,18 +113,19 @@ Mcu.Pin35=PB5
 Mcu.Pin36=PB6
 Mcu.Pin37=PB7
 Mcu.Pin38=PB8
-Mcu.Pin39=VP_SYS_VS_Systick
+Mcu.Pin39=VP_IWDG_VS_IWDG
 Mcu.Pin4=PA1
-Mcu.Pin40=VP_TIM1_VS_ClockSourceINT
-Mcu.Pin41=VP_TIM2_VS_ClockSourceINT
-Mcu.Pin42=VP_TIM3_VS_ClockSourceINT
-Mcu.Pin43=VP_TIM4_VS_ClockSourceINT
+Mcu.Pin40=VP_SYS_VS_Systick
+Mcu.Pin41=VP_TIM1_VS_ClockSourceINT
+Mcu.Pin42=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin43=VP_TIM3_VS_ClockSourceINT
+Mcu.Pin44=VP_TIM4_VS_ClockSourceINT
 Mcu.Pin5=PA2
 Mcu.Pin6=PA3
 Mcu.Pin7=PA4
 Mcu.Pin8=PA5
 Mcu.Pin9=PA6
-Mcu.PinsNb=44
+Mcu.PinsNb=45
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F103RETx
@@ -381,6 +386,8 @@ USART1.IPParameters=VirtualMode
 USART1.VirtualMode=VM_ASYNC
 USART2.IPParameters=VirtualMode
 USART2.VirtualMode=VM_ASYNC
+VP_IWDG_VS_IWDG.Mode=IWDG_Activate
+VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM1_VS_ClockSourceINT.Mode=Internal

+ 1 - 1
tshell/van_bsp_debug_shell.c

@@ -1074,7 +1074,7 @@ void Van_Device_Printf(unsigned int printLevel, const char *cmd, ...)
 	char buf[DISBUF_LEN] = {0};
 	int	 buflen			 = 0;
 	  __disable_irq(); 
-	if ((gloublePrintLevel & printLevel) || (printLevel==VAN_LOG_ALLPRINT))
+	if ((sysinf.log_level & printLevel) || (printLevel==VAN_LOG_ALLPRINT))
 	{
 		va_list args; //定义一个va_list类型的变量,用来储存单个参数
 		va_start(args, cmd);	  //使args指向可变参数的第一个参数

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä