Răsfoiți Sursa

BT6706: fix service sw

balbekova 7 ani în urmă
părinte
comite
1ea0180f40

+ 3 - 3
config/board_bt6706.h

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

+ 19 - 7
service_hw/Commands/bt_6701_commands.c

@@ -100,10 +100,22 @@ void Test_U232(void)
 void Test_DRY(void)
 {
     uint8_t inputState;
-    
+#ifdef HARDWARE_BT6706
+    uint8_t start_state = 0;
+    uint8_t end_state = 1;
+    set_state_douts(DOUT1, 1);
+    set_state_douts(DOUT2, 1);
+    set_state_douts(DOUT3, 1);
+#endif
+
+#ifdef HARDWARE_BT6702
+    uint8_t start_state = 1;
+    uint8_t end_state = 0;
+#endif
+    vTaskDelay(10);
     inputState = get_state_din_outs(DIN1);
     
-    set_state_douts(DOUT1, 0);
+    set_state_douts(DOUT1, start_state);
     
     vTaskDelay(10);
         
@@ -113,7 +125,7 @@ void Test_DRY(void)
         return;
     }  
 
-    set_state_douts(DOUT1, 1);
+    set_state_douts(DOUT1, end_state);
     
     vTaskDelay(10);
     
@@ -125,7 +137,7 @@ void Test_DRY(void)
     
     inputState = get_state_din_outs(DIN1);
 
-	set_state_douts(DOUT2, 0);
+	set_state_douts(DOUT2, start_state);
 
 	vTaskDelay(10);
 
@@ -135,7 +147,7 @@ void Test_DRY(void)
 		return;
 	}
 
-	set_state_douts(DOUT2, 1);
+	set_state_douts(DOUT2, end_state);
 
 	vTaskDelay(10);
 
@@ -149,7 +161,7 @@ void Test_DRY(void)
 #ifdef HARDWARE_BT6706
     inputState = get_state_din_outs(DIN1);
 
-	set_state_douts(DOUT3, 0);
+	set_state_douts(DOUT3, start_state);
 
 	vTaskDelay(10);
 
@@ -159,7 +171,7 @@ void Test_DRY(void)
 		return;
 	}
 
-	set_state_douts(DOUT3, 1);
+	set_state_douts(DOUT3, end_state);
 
 	vTaskDelay(10);
 

+ 0 - 1
service_hw/Commands/commands_api.c

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

+ 1 - 1
service_hw/Ethernet/netconf.c

@@ -20,7 +20,7 @@
 #include <string.h>
 
 
-#define MAX_DHCP_TRIES 3
+#define MAX_DHCP_TRIES 10
 
 #define TIME_COUNTER_10_MIN   600
 #define TIME_COUNTER_1_MIN    60

+ 2 - 2
service_hw/Makefile

@@ -1,9 +1,9 @@
 TARGET := stm32$(HARDWARE)service
 
 
-#ifeq ($(DEBUG), 1)
+ifeq ($(DEBUG), 1)
 	CFLAGS += -DDEBUG -g
-#endif
+endif
 
 ifeq ($(MAC),)
 	#Print default MAC