Эх сурвалжийг харах

BT6706: add test relay3 in service soft

balbekova 7 жил өмнө
parent
commit
427c76c58a

+ 3 - 3
config/board_bt6706.h

@@ -31,9 +31,9 @@ SPI2_TABLE(X)
 X( DIN1,       GPIOA,   0, GPIO_IN)
 X( DIN1,       GPIOA,   0, GPIO_IN)
 
 
 #define RELAYS(X) \
 #define RELAYS(X) \
-X( DOUT1,      GPIOE,  3, GPIO_OUT)\
-X( DOUT2,      GPIOE,  4, GPIO_OUT)\
-X( DOUT3,      GPIOE,  5, GPIO_OUT)\
+X( DOUT1,      GPIOE,  3, GPIO_OUT | GPIO_SET)\
+X( DOUT2,      GPIOE,  4, GPIO_OUT | GPIO_SET)\
+X( DOUT3,      GPIOE,  5, GPIO_OUT | GPIO_SET)\
 
 
 #define LEDS(X) \
 #define LEDS(X) \
 X( LED_INIT_R,  GPIOA,  4,  GPIO_OUT | GPIO_INV) \
 X( LED_INIT_R,  GPIOA,  4,  GPIO_OUT | GPIO_INV) \

+ 33 - 3
service_hw/Commands/bt_6701_commands.c

@@ -15,7 +15,11 @@
 #include "commands_api.h"
 #include "commands_api.h"
 #include "common_config.h"
 #include "common_config.h"
 #include "gpio.h"
 #include "gpio.h"
+#if defined HARDWARE_BT6702
 #include "board_bt6702.h"
 #include "board_bt6702.h"
+#elif defined HARDWARE_BT6706
+#include "board_bt6706.h"
+#endif
 #include "buttons.h"
 #include "buttons.h"
 #include "led.h"
 #include "led.h"
 #include "netconf.h"
 #include "netconf.h"
@@ -99,7 +103,7 @@ void Test_DRY(void)
     
     
     inputState = get_state_din_outs(DIN1);
     inputState = get_state_din_outs(DIN1);
     
     
-    set_state_douts(DOUT1, 1);
+    set_state_douts(DOUT1, 0);
     
     
     vTaskDelay(10);
     vTaskDelay(10);
         
         
@@ -109,7 +113,7 @@ void Test_DRY(void)
         return;
         return;
     }  
     }  
 
 
-    set_state_douts(DOUT1, 0);
+    set_state_douts(DOUT1, 1);
     
     
     vTaskDelay(10);
     vTaskDelay(10);
     
     
@@ -121,17 +125,41 @@ void Test_DRY(void)
     
     
     inputState = get_state_din_outs(DIN1);
     inputState = get_state_din_outs(DIN1);
 
 
+	set_state_douts(DOUT2, 0);
+
+	vTaskDelay(10);
+
+	if (get_state_din_outs(DIN1) == inputState) {
+		printf("DRY FAIL\r\n");
+		TEST_SetTest(TEST_WAIT);
+		return;
+	}
+
 	set_state_douts(DOUT2, 1);
 	set_state_douts(DOUT2, 1);
 
 
 	vTaskDelay(10);
 	vTaskDelay(10);
 
 
+	if (get_state_din_outs(DIN1) != inputState) {
+		printf("DRY FAIL\r\n");
+		TEST_SetTest(TEST_WAIT);
+		return;
+	}
+
+	vTaskDelay(10);
+#ifdef HARDWARE_BT6706
+    inputState = get_state_din_outs(DIN1);
+
+	set_state_douts(DOUT3, 0);
+
+	vTaskDelay(10);
+
 	if (get_state_din_outs(DIN1) == inputState) {
 	if (get_state_din_outs(DIN1) == inputState) {
 		printf("DRY FAIL\r\n");
 		printf("DRY FAIL\r\n");
 		TEST_SetTest(TEST_WAIT);
 		TEST_SetTest(TEST_WAIT);
 		return;
 		return;
 	}
 	}
 
 
-	set_state_douts(DOUT2, 0);
+	set_state_douts(DOUT3, 1);
 
 
 	vTaskDelay(10);
 	vTaskDelay(10);
 
 
@@ -142,6 +170,7 @@ void Test_DRY(void)
 	}
 	}
 
 
 	vTaskDelay(10);
 	vTaskDelay(10);
+#endif
 
 
     printf("DRY OK\r\n");
     printf("DRY OK\r\n");
     TEST_SetTest(TEST_WAIT);
     TEST_SetTest(TEST_WAIT);
@@ -278,6 +307,7 @@ void Test_Ethernet(void)
     if (ethernetInit == false)
     if (ethernetInit == false)
     {
     {
         ethernetInit = true;
         ethernetInit = true;
+        COM_SetMAC();
         ETH_BSP_Config();
         ETH_BSP_Config();
         LwIP_Init();
         LwIP_Init();
         sys_thread_new("HTTP", vTaskTcpServer, NULL, 4*configMINIMAL_STACK_SIZE, tskIDLE_PRIORITY);
         sys_thread_new("HTTP", vTaskTcpServer, NULL, 4*configMINIMAL_STACK_SIZE, tskIDLE_PRIORITY);

+ 1 - 0
service_hw/Commands/commands_api.c

@@ -119,6 +119,7 @@ void vTestCommands(void *params)
         switch (testState)
         switch (testState)
         {
         {
             case TEST_WAIT :
             case TEST_WAIT :
+            	Test_Ethernet();
             break;
             break;
               
               
             case TEST_U232 :
             case TEST_U232 :

+ 4 - 0
service_hw/Hardware/hw_init.c

@@ -65,6 +65,8 @@ void BT_6702_Init(void)
    
    
 	InitUSART();
 	InitUSART();
 	MICRORL_Init();
 	MICRORL_Init();
+
+	init_settings();
   
   
     SETTINGS_Load();
     SETTINGS_Load();
     /*SETTINGS_SetTempWebParamsDef();
     /*SETTINGS_SetTempWebParamsDef();
@@ -88,6 +90,8 @@ void BT_6702_Init(void)
     xTaskCreate(vTestCommands, "TestProcessing", 2*configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL);
     xTaskCreate(vTestCommands, "TestProcessing", 2*configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL);
   
   
     printf("Hello world\r\n");
     printf("Hello world\r\n");
+
+
 }
 }