update

NESCAR · Apr 25, 2019 · 2ee315f · 2ee315f
1 parent d529aad
commit 2ee315f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/HARDWARE/CAN/can1.c b/HARDWARE/CAN/can1.c
@@ -157,14 +157,6 @@ void CAN1_RX0_IRQHandler(void){
 			queue_arr_memcpy(&can_queue, (u8 *)&SYSTEMTIME , sizeof(SYSTEMTIME));
 			/* CAN1数据拷贝至queue.arr尾部，并更新tail*/
 			queue_arr_memcpy(&can_queue, (u8 *)&RxMessage , sizeof(RxMessage));		
-
-//		#if PRINT_UART_LOG
-//			printf("CAN1 Data : ");
-//			for(int i = 0; i < RxMessage.DLC;i++){
-//				printf("%d ",RxMessage.Data[i]);
-//			}
-//			printf("\r\n");
-//		#endif
 		}
 	 }
 	 CAN_ClearITPendingBit(CAN1, CAN_IT_FMP0);

diff --git a/HARDWARE/CAN/can2.c b/HARDWARE/CAN/can2.c
@@ -175,14 +175,7 @@ void CAN2_RX1_IRQHandler(void)
 			/* 加入CAN的接收时间*/
 			queue_arr_memcpy(&can_queue, (u8 *)&SYSTEMTIME , sizeof(SYSTEMTIME));
 			/* CAN2数据拷贝至queue.arr尾部，并更新tail*/
-			queue_arr_memcpy(&can_queue, (u8 *)&RxMessage , sizeof(RxMessage));
-//		#if PRINT_UART_LOG
-//			printf("CAN2 Data : ");
-//			for(int i = 0; i < RxMessage.DLC;i++){
-//				printf("%d ",RxMessage.Data[i]);
-//			}
-//			printf("\r\n");
-//		#endif			
+			queue_arr_memcpy(&can_queue, (u8 *)&RxMessage , sizeof(RxMessage));		
 		}
 	 }
 	 CAN_ClearITPendingBit(CAN2, CAN_IT_FMP1);

diff --git a/HARDWARE/TIMER/timer.c b/HARDWARE/TIMER/timer.c
@@ -173,15 +173,16 @@ void TIM3_IRQHandler(void)
 					if(MS_TIME%1000==0){
 						WORKING_LED_CONV();//工作灯
 						BEEP_ON(0);//关蜂鸣器
-						char msg[8] = {1,2,3,4,5,6,7,8};
-						CAN1_Send_Msg((u8 *)msg,8);
-						CAN2_Send_Msg((u8 *)msg,8);
 					}
 				}else if(RSI_WIFI_OPER_MODE == RSI_WIFI_AP_MODE_VAL){/*!< AP模式下快速闪烁>*/
-					if(MS_TIME%150==0){
-						WORKING_LED_CONV();//工作灯
-						BEEP_CONV();//蜂鸣器取反
-					}	
+					if(MS_TIME%150==0){   //工作灯快闪
+						WORKING_LED_CONV();
+					}
+					if((MS_TIME%900) < 150){   //蜂鸣器900ms周期鸣叫
+						BEEP_ON(1);
+					}else{
+						BEEP_ON(0);
+					}
 				}
 			#endif			
 		}else if((BOARD_STA == BOARD_INITING) || (BOARD_STA == BOARD_INITING)){

diff --git a/USER/config.c b/USER/config.c
@@ -419,7 +419,7 @@ void writeSectorPara(void){
 	#endif
 	}else{
 	#if PRINT_UART_LOG
-		printf("Main flash Writen Successfully!\r\n\r\n");
+		printf("Main flash Writen Successfully!\r\n");
 	#endif
 	}
 	status = FLASH_EraseSector(FLASH_SAVE_SECTOR_BACKUP,VoltageRange_3);//擦除掉变量主存储区的所有数据