|
@@ -78,6 +78,8 @@ void InitTask(void *params)
|
|
|
|
|
|
InitUSART();
|
|
|
ups_megatec_init();
|
|
|
+
|
|
|
+ log_init(false);
|
|
|
|
|
|
|
|
|
|
|
@@ -135,13 +137,25 @@ void InitTask(void *params)
|
|
|
#ifdef NET_ENABLE
|
|
|
ETH_BSP_Config();
|
|
|
LwIP_Init();
|
|
|
+
|
|
|
#ifdef WEB_SERVER_ENABLE
|
|
|
-
|
|
|
- HTTPS_Init();
|
|
|
+ if(strncmp(sSettings.sFlags.testState, "T2OK", 4)){
|
|
|
+
|
|
|
+ HTTP_Init();
|
|
|
+ xTaskCreate(vTaskTesting, "Testing", 2*configMINIMAL_STACK_SIZE,
|
|
|
+ NULL, tskIDLE_PRIORITY, NULL);
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ HTTPS_Init();
|
|
|
#define SSL_TASK_PRIO ( configMAX_PRIORITIES - 3 )
|
|
|
- xTaskCreate(ssl_server, "SSL", 10*configMINIMAL_STACK_SIZE, NULL, SSL_TASK_PRIO, NULL);
|
|
|
+ xTaskCreate(ssl_server, "SSL", 10*configMINIMAL_STACK_SIZE, NULL, SSL_TASK_PRIO, NULL);
|
|
|
#endif
|
|
|
+
|
|
|
+ UDP_netsetting_init();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
+
|
|
|
#ifdef SNMP_ENABLE
|
|
|
|
|
|
SNMP_Init();
|
|
@@ -154,7 +168,7 @@ void InitTask(void *params)
|
|
|
|
|
|
#endif
|
|
|
|
|
|
-
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
SNTP_Init();
|
|
@@ -162,11 +176,9 @@ void InitTask(void *params)
|
|
|
NULL, tskIDLE_PRIORITY, &xHandleSntpOnceSinhro);
|
|
|
xTaskCreate(vTaskPeriodicSynchro, "sntpPeriodicSinhro", 2*configMINIMAL_STACK_SIZE,
|
|
|
NULL, tskIDLE_PRIORITY, NULL);
|
|
|
-#endif
|
|
|
|
|
|
|
|
|
-
|
|
|
- UDP_netsetting_init();
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -179,11 +191,6 @@ void InitTask(void *params)
|
|
|
#endif
|
|
|
|
|
|
|
|
|
-
|
|
|
- xTaskCreate(vTaskTesting, "Testing", configMINIMAL_STACK_SIZE,
|
|
|
- NULL, tskIDLE_PRIORITY, NULL);
|
|
|
- }*/
|
|
|
-
|
|
|
|
|
|
|
|
|
|