Parcourir la source

新增:文件读写,网络测试。
结果:刷写通过,故障未复现。

CHENJIE-PC\QiXiang_CHENJIE il y a 4 ans
Parent
commit
89fab4b24e
3 fichiers modifiés avec 40 ajouts et 46 suppressions
  1. 16 2
      inc/hal_module_adapter.h
  2. 19 39
      src/app.c
  3. 5 5
      src/hal_module_adapter.c

+ 16 - 2
inc/hal_module_adapter.h

@@ -7,7 +7,8 @@ extern "C" {
 #include "commontypedef.h"
 #include "sensor.h"
 #include "can.h"
-//#define USING_PRINTF 
+#define USING_PRINTF 
+#define BL_FILE_LOG    								 (1)
 #define GPS_DATA_RECV_BUFFER_SIZE     						(1024)
 
 #define I2C_INT1_REQ_BITMAP    								 (0x1)
@@ -134,7 +135,15 @@ typedef struct  _GPS_INFO
 	uint32_t latitude;
 	uint32_t longitude;
 }GPS_INFO;
-
+#ifdef BL_FILE_LOG
+typedef enum
+{
+	BL_LEVEL0, 
+	BL_LEVEL1, 
+	BL_LEVEL2, 
+	BL_LEVEL3, 
+}BlLogLevel;
+#endif
 typedef void (*posGGACallBack )(UINT8 res, UINT8 * params);
 void PowerPinConfig(IOType iotype);
 
@@ -162,6 +171,11 @@ void HAL_Can_Init(Can_InitType param);
 INT32 HAL_Can_Reset(void);
 INT32 HAL_Can_Transmit(Can_TxMsgType Can_TxMsg);
 UINT8  HAL_Can_Receive(UINT8 *CAN_RX_Buf);
+#ifdef BL_FILE_LOG
+void bluejoy_printf(BlLogLevel level, const UINT8 *format, ...);
+void bluejoy_read_logfile(void);
+void bluejoy_del_logfile(void);
+#endif
 #ifdef __cplusplus
 }
 #endif

+ 19 - 39
src/app.c

@@ -23,10 +23,10 @@
 #include "plat_config.h"
 
 //空间及变量定义
-#define PROC_MAIN_TASK_STACK_SIZE           (1024)
+#define PROC_MAIN_TASK_STACK_SIZE           (2048)
 #define PROC_UART_TASK_STACK_SIZE           (1024)
 #define PROC_CAN_TASK_STACK_SIZE           (1024)
-#define PROC_TCP_TASK_STACK_SIZE           (1024)
+#define PROC_TCP_TASK_STACK_SIZE           (2048)
 #define APP_EVENT_QUEUE_SIZE    (10)
 uint8_t deepslpTimerID          = DEEPSLP_TIMER_ID7;
 uint8_t MainSlpHandler          = 0xff;
@@ -127,7 +127,7 @@ static process_TCP 		    gProcess_Tcp_Task = PROCESS_TCP_STATE_IDLE;
 #define PROC_TCP_STATE_SWITCH(a)  (gProcess_Tcp_Task = a)
 //堆栈申请
 static StaticTask_t             gProcess_Main_Task_t;
-static UINT8                  gProcess_Main_TaskStack[PROC_UART_TASK_STACK_SIZE];
+static UINT8                  gProcess_Main_TaskStack[PROC_MAIN_TASK_STACK_SIZE];
 static StaticTask_t             gProcess_Uart_Task_t;
 static UINT8                  gProcess_Uart_TaskStack[PROC_UART_TASK_STACK_SIZE];
 static StaticTask_t             gProcess_Can_Task_t;
@@ -227,16 +227,10 @@ static void Main_Task(void* arg)
     #ifdef USING_PRINTF
         printf("slpstate:%d \n",slpstate);
     #endif
-    #ifdef BL_FILE_LOG
-	    bluejoy_printf(BL_LEVEL3,"slpstate:%d \n",slpstate);
-    #endif
     Wakeup_source =  slpManGetWakeupSrc();//获取唤醒源
     #ifdef USING_PRINTF
         printf("Wakeup_source:%d \n",Wakeup_source);
     #endif
-    #ifdef BL_FILE_LOG
-	    bluejoy_printf(BL_LEVEL3,"Wakeup_source:%d \n",Wakeup_source);
-    #endif
     if (Wakeup_source==0)
     {
         sleep_time_flag = Wakeup_Work_time;
@@ -356,7 +350,7 @@ static void Main_Task(void* arg)
                     printf("which slpstate can go now :%d \n",slpstate);
                 #endif
                 #ifdef BL_FILE_LOG
-	                bluejoy_printf(BL_LEVEL3,"which slpstate can go now :%d \n",slpstate);
+	                bluejoy_printf(BL_LEVEL3,"sleep\n");
                 #endif
                 slpManDeepSlpTimerStart(deepslpTimerID, Sleep_Time);
                 while(1)
@@ -557,7 +551,7 @@ static void Uart_Task(void* arg)
             case PROCESS_UART_STATE_WORK:
             {
                 #ifdef USING_PRINTF
-                        printf("UART_STATE_WORK!\n");
+                        //printf("UART_STATE_WORK!\n");
                 #endif
                 Uart_task = false;
                 Uart_Rece_buffer = (uint8_t *)malloc(Uart_Rece_LEN);
@@ -986,9 +980,6 @@ static INT32 socketRegisterPSUrcCallback(urcID_t eventID, void *param, UINT32 pa
             #ifdef USING_PRINTF
                 printf("SIM ready(imsi=%s)\n",(UINT8 *)imsi->contents);
             #endif
-            #ifdef BL_FILE_LOG
-	            bluejoy_printf(BL_LEVEL3,"SIM ready(imsi=%s)\n",(UINT8 *)imsi->contents);
-            #endif
             break;
         }
         case NB_URC_ID_MM_SIGQ:
@@ -997,9 +988,6 @@ static INT32 socketRegisterPSUrcCallback(urcID_t eventID, void *param, UINT32 pa
             #ifdef USING_PRINTF
                 printf("RSSI signal=%d\n",rssi);
             #endif
-            #ifdef BL_FILE_LOG
-	            bluejoy_printf(BL_LEVEL3,"RSSI signal=%d\n",rssi);
-            #endif
             ECOMM_TRACE(UNILOG_PLA_APP, socketRegisterPSUrcCallback_1, P_INFO, 1, "RSSI signal=%d", rssi);
             break;
         }
@@ -1008,9 +996,6 @@ static INT32 socketRegisterPSUrcCallback(urcID_t eventID, void *param, UINT32 pa
             #ifdef USING_PRINTF
                 printf("Default bearer activated\n");
             #endif
-            #ifdef BL_FILE_LOG
-	            bluejoy_printf(BL_LEVEL3,"Default bearer activated\n");
-            #endif
             break;
         }
         case NB_URC_ID_PS_BEARER_DEACTED:
@@ -1018,9 +1003,6 @@ static INT32 socketRegisterPSUrcCallback(urcID_t eventID, void *param, UINT32 pa
             #ifdef USING_PRINTF
                 printf("Default bearer Deactivated\n");
             #endif
-            #ifdef BL_FILE_LOG
-	            bluejoy_printf(BL_LEVEL3,"Default bearer Deactivated\n");
-            #endif
             break;
         }
         case NB_URC_ID_PS_CEREG_CHANGED:
@@ -1030,9 +1012,6 @@ static INT32 socketRegisterPSUrcCallback(urcID_t eventID, void *param, UINT32 pa
             #ifdef USING_PRINTF
                 printf("URCCallBack:CEREG changed act:%d celId:%d locPresent:%d tac:%d\n", cereg->act, cereg->celId, cereg->locPresent, cereg->tac);
             #endif
-            #ifdef BL_FILE_LOG
-	            bluejoy_printf(BL_LEVEL3,"URCCallBack:CEREG changed act:%d celId:%d locPresent:%d tac:%d\n", cereg->act, cereg->celId, cereg->locPresent, cereg->tac);
-            #endif
             break;
         }
         case NB_URC_ID_PS_NETINFO:
@@ -1040,9 +1019,6 @@ static INT32 socketRegisterPSUrcCallback(urcID_t eventID, void *param, UINT32 pa
             netif = (NmAtiNetifInfo *)param;
             if (netif->netStatus == NM_NETIF_ACTIVATED)
                 //sendQueueMsg(QMSG_ID_NW_IP_READY, 0);
-                #ifdef BL_FILE_LOG
-	                bluejoy_printf(BL_LEVEL3,"QMSG_ID_NW_IP_READY\n");
-                #endif
                 Tcp_statuts = 1;
             break;
         }
@@ -1208,6 +1184,7 @@ static void Tcp_Task(void* arg)
         bluejoy_read_logfile();
         bluejoy_printf(BL_LEVEL3,"processAppTask\r\n");
 	#endif
+    NetSocDisplay(LED_SOC_2,LED_TURN_ON);
     appSetCFUN(1);
     while(true)
     {
@@ -1215,8 +1192,6 @@ static void Tcp_Task(void* arg)
         {
             case PROCESS_TCP_STATE_IDLE:
             {
-                NetSocDisplay(LED_SOC_0,LED_TURN_OFF);
-                NetSocDisplay(LED_SOC_1,LED_TURN_OFF);
                 osDelay(100);
                 break;
             }
@@ -1242,6 +1217,9 @@ static void Tcp_Task(void* arg)
                             #ifdef USING_PRINTF
                                 printf("TCP connect unresolved dns\n");
                             #endif
+                            #ifdef BL_FILE_LOG
+	                            bluejoy_printf(BL_LEVEL3,"TCP connect unresolved dns\n");
+                            #endif
                         }
                         Tcp_statuts=2;
                         break;
@@ -1257,6 +1235,9 @@ static void Tcp_Task(void* arg)
                             #ifdef USING_PRINTF
                                 printf("socket create error\n");
                             #endif
+                            #ifdef BL_FILE_LOG
+	                            bluejoy_printf(BL_LEVEL3,"socket create error\n");
+                            #endif
                             Tcp_statuts=1;
                         }
                         else
@@ -1275,13 +1256,14 @@ static void Tcp_Task(void* arg)
                             }
                             else
                             {
+                                NetSocDisplay(LED_SOC_0,LED_TURN_OFF);
                                 Tcp_statuts=3;
                                 Reconnect_Num = 0;
                             }
                             if(Reconnect_Num>=20)
                             {
                                 #ifdef BL_FILE_LOG
-	                                bluejoy_printf(BL_LEVEL3,"Connect failed!%d,Reconnect:%d\n",TcpconnectID,Reconnect_Num));
+	                                bluejoy_printf(BL_LEVEL3,"20 Connect failed!%d,Reconnect:%d\n",TcpconnectID,Reconnect_Num);
                                 #endif
                                 appSetCFUN(0);
                                 osDelay(10);
@@ -1364,6 +1346,9 @@ static void Tcp_Task(void* arg)
                             free(TcpSendBuffer);
                             if (TcpsendID<0)
                             {
+                                #ifdef BL_FILE_LOG
+	                                bluejoy_printf(BL_LEVEL3,"send failed,ConnectID:%d,TcpSend:%d,data length:%d\n",sockfd,TcpsendID,NB_send_len);
+                                #endif
                                 closesocket(sockfd);
                                 TcpconnectID = -1;
                                 Tcp_Index=-1;
@@ -1404,21 +1389,16 @@ static void Tcp_Task(void* arg)
                             free(TcpSendBuffer);
                             if (TcpsendID<0)
                             {
-                                #ifdef BL_FILE_LOG
-	                                bluejoy_printf(BL_LEVEL3,"ConnectID:%d,TcpSend:%d,data length:%d\n",sockfd,TcpsendID,NB_send_len);
-                                #endif
                                 closesocket(sockfd);
                                 TcpconnectID = -1;
                                 Tcp_Index=-1;
                                 Tcp_statuts = 4;
+                                NetSocDisplay(LED_SOC_1,LED_TURN_ON);
                             }
                             else
                             {
-                                NetSocDisplay(LED_SOC_1,LED_TURN_ON);
+                                NetSocDisplay(LED_SOC_1,LED_TURN_OFF);
                                 Tcp_Index=3;
-                                #ifdef BL_FILE_LOG
-	                                bluejoy_printf(BL_LEVEL3,"ConnectID:%d,TcpSend:%d,data length:%d\n",sockfd,TcpsendID,NB_send_len);
-                                #endif
                             }
                             break;
                         }

+ 5 - 5
src/hal_module_adapter.c

@@ -266,20 +266,20 @@ static void bluejoy_write_logfile(UINT8 * buf)
 	blLogFileNux=1;
 	file = OsaFopen("blLog","wb");
 	if(file==NULL){
-		//printf("blLog open fail!\r\n");
+		printf("blLog open fail!\r\n");
 		blLogFileNux=0;
 		return;
 	}
 	if(OsaFseek(file, 0, SEEK_END) != 0)
 	{
-	    //printf("Seek file failed [%d] \r\n",__LINE__);
+	    printf("Seek file failed [%d] \r\n",__LINE__);
 	    OsaFclose(file);
 	    blLogFileNux=0;
 	    return;
 	}
 	Count = OsaFwrite(buf, 1, strlen(buf), file);
 	if(Count != (strlen(buf))){
-		//printf("blLog write fail!\r\n");
+		printf("blLog write fail!\r\n");
 
 	}
 	OsaFclose(file);
@@ -330,7 +330,7 @@ void bluejoy_read_logfile(void)
 void bluejoy_del_logfile(void)
 {
 	UINT32 ret;
-	//printf("%s start! \r\n",__FUNCTION__);
+	printf("%s start! \r\n",__FUNCTION__);
 	while(blLogFileNux){
 		 osDelay(10/portTICK_PERIOD_MS);
 	}
@@ -368,7 +368,7 @@ void bluejoy_printf(BlLogLevel level, const UINT8 *format, ...)
 	va_start(args, format);
 	vsnprintf(buf+strlen(buf), 128-strlen(buf), format, args);
 	va_end(args);
-	//printf("%s", buf);
+	printf("%s begin! \r\n",__FUNCTION__);
 	bluejoy_write_logfile(buf);
 }
 #endif