Forráskód Böngészése

change for production

balbekova 7 éve
szülő
commit
6c8191e10b

+ 3 - 1
modules/testing/testing.c

@@ -78,6 +78,8 @@ void vTaskTesting(void *params)
 	  /* Если все прошло хорошо*/
 	  if (fServer)
 	  {
+		  SETTINGS_SetAllDefault();
+		  SETTINGS_Save();
         LED_On(LED_INIT_R);
 		/* Устанавливаем статус тестирования "T2OK" и сохраняем настройки */
 		SETTINGS_SetT2OK();
@@ -85,7 +87,7 @@ void vTaskTesting(void *params)
         LED_Off(LED_INIT_R);
 	    fServer = false;
 	    vTaskDelay(2000);
-	    Reboot();
+	  //  Reboot();
 	    vTaskDelete(NULL);
       }
       

+ 0 - 1
service_hw/Commands/bt_6701_commands.c

@@ -327,7 +327,6 @@ void Test_Ethernet(void)
         if (eth_ready_flag == 0) {
         	if(!ethernetInit){
         		ethernetInit = true;
-				COM_SetMAC();
 				ETH_BSP_Config();
 				 LwIP_Init();
         	}

+ 3 - 1
service_hw/Commands/commands_api.c

@@ -95,8 +95,8 @@ void vTestCommands(void *params)
         		 }
         	}
             //COM_TestEthernet();
-        	COM_SetMAC();
 
+        	SETTINGS_SetInfoDef();
             Test_Ethernet();
             vTaskDelay(8000);
 
@@ -116,6 +116,7 @@ void vTestCommands(void *params)
             //sSettings.bootParams.loadMode = 1;
             SetLoadMode();
             COM_TestSerno();
+
             COM_SetTestState(T2READY);
             vTaskDelay(1000);
             NVIC_SystemReset();
@@ -159,6 +160,7 @@ void vTestCommands(void *params)
             break;
 
             case TEST_ETHERNET :
+            	COM_SetMAC();
                 Test_Ethernet();
             break;
             

+ 0 - 2
user/init_task.c

@@ -151,8 +151,6 @@ void InitTask(void *params)
 #endif
 	   // UDP for net settings 
 	   if(strncmp(sSettings.sFlags.testState, "T2OK", 4)){
-		   SETTINGS_SetAllDefault();
-		   SETTINGS_Save();
 		   xTaskCreate(vTaskTesting, "Testing", 2*configMINIMAL_STACK_SIZE,
                 NULL, tskIDLE_PRIORITY, NULL);
 	   }