瀏覽代碼

增加下线检测存储,屏蔽ADC采集

CHENJIE-PC\QiXiang_CHENJIE 3 年之前
父節點
當前提交
fd13f0fd78
共有 6 個文件被更改,包括 8 次插入5 次删除
  1. 2 0
      src/AppGlobalVar.c
  2. 1 0
      src/AppGlobalVar.h
  3. 1 1
      src/AppTaskCan.c
  4. 1 1
      src/AppTaskUart1.c
  5. 1 1
      src/hal_adapter.c
  6. 2 2
      src/main.c

+ 2 - 0
src/AppGlobalVar.c

@@ -44,7 +44,9 @@ const uint16 WebSitePort = 8712;
 #include "Eep_MemMap.h"
 VAR_ALIGN(uint8 dataWrTestPatt[EEP_WRTESTPATT_SIZE],4)
 VAR_ALIGN(uint8 BufferRead[EEP_WRTESTPATT_SIZE],4)
+VAR_ALIGN(uint8 EolDoneFlg,1)
 /* Data write to eeprom device */
+uint8 EolDoneFlg = 0;
 uint8 dataWrTestPatt[EEP_WRTESTPATT_SIZE]=
 {
     0x01, 0x02, 0x03, 0x04,

+ 1 - 0
src/AppGlobalVar.h

@@ -61,6 +61,7 @@ extern char IccidNum[20];
 
 VAR_ALIGN(extern uint8 dataWrTestPatt[EEP_WRTESTPATT_SIZE],4)
 VAR_ALIGN(extern uint8 BufferRead[EEP_WRTESTPATT_SIZE],4)
+VAR_ALIGN(extern uint8 EolDoneFlg,1)
 
 /*以下变量均为串口协议相关变量*/
 #define BMS_CELLNUM 120

+ 1 - 1
src/AppTaskCan.c

@@ -54,7 +54,7 @@ void CanTask(void *pvParameters)
 			//ζȲɼ¯
 			for (ADC_TP_Channel_Type channel = 0; channel < ChannelCounter; channel++)
 			{
-				ADC_ReadValue(channel, &BattTempR[channel]);
+				//ADC_ReadValue(channel, &BattTempR[channel]);
 			}
 		}
 //		if(BattTempR[1]==0x00)

+ 1 - 1
src/AppTaskUart1.c

@@ -65,7 +65,7 @@ void Uart_4G_Task(void *pvParameters)
 			{
 				PROC_TCP_STATE_SWITCH(PROCESS_TCP_REGCHK);
 			}
-			else if ((TimerCounter -SendTimerCounter)>1000)
+			else if ((TimerCounter -SendTimerCounter)>1000 && EolDoneFlg==1)
 			{
 				SendTimerCounter = TimerCounter;
 				PROC_TCP_STATE_SWITCH(PROCESS_TCP_SEND);

+ 1 - 1
src/hal_adapter.c

@@ -422,7 +422,7 @@
 	 VarNotification_0 = 0;
 	 Adc_StartGroupConversion(AdcGroupSoftwareOneShot);
 
-	 while(VarNotification_0 == 0)
+	 while(VarNotification_0 == 0 && VarNotification_1==0)
 	 {}
 	 Status = Adc_ReadGroup(AdcGroupSoftwareOneShot, AdcReadGroupBuffer);
 	 if(Status == E_NOT_OK)

+ 2 - 2
src/main.c

@@ -157,8 +157,8 @@ int main(void)
 	Dio_WriteChannel(DioConf_DioChannel_PTE8_GPIO_OUT_MCU_LED4, STD_OFF);
 	Dio_WriteChannel(DioConf_DioChannel_PTE9_GPIO_OUT_MCU_LED5, STD_OFF);
 
-	xTaskCreate(MainTask, (const char *const)"MainTask", 128, (void *)0, main_TASK_PRIORITY + 3, NULL);
-	xTaskCreate(Uart0Task, (const char *const)"Uart0_Bms_Task", 256, (void *)0, main_TASK_PRIORITY + 2, NULL);
+	xTaskCreate(MainTask, (const char *const)"MainTask", 512, (void *)0, main_TASK_PRIORITY + 3, NULL);
+	xTaskCreate(Uart0Task, (const char *const)"Uart0_Bms_Task", 512, (void *)0, main_TASK_PRIORITY + 2, NULL);
 	xTaskCreate(CanTask, (const char *const)"CanTask", 512, (void *)0, main_TASK_PRIORITY + 2, NULL);
 	xTaskCreate(GpsTask, (const char *const)"GpsTask", 512, (void *)0, main_TASK_PRIORITY + 1, NULL);
 	xTaskCreate(Uart_4G_Task, (const char *const)"Uart_4G_Task", 2048, (void *)0, main_TASK_PRIORITY + 0, NULL);