Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

4 files changed, 84 insertions, 77 deletions

diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index c10727a14..78663e678 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -105,6 +105,9 @@ enum
 #define FALLING 2
 #define RISING 3
 
+#define CLOSE 0
+#define OPEN  1
+
 #define DOUBLE_BUFFER 2
 
 //#define FPGA_Reg_Size_Bits 16
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
index f634c3348..dd817765c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
@@ -1022,34 +1022,34 @@ typedef union
     unsigned short ushort;
 }GP_Out_01;
 
-
-//372 F3_VALVE_OUT
+//F3_VALVE_OUT
 typedef union
-{
-    struct
-    {
-        //Dry air Valves
-        bool MIDTANK2MANIF4_VALVE_2 : 1; //0
-        bool MIDTANK2MANIF4_VALVE_1 : 1; //1
-        bool MIDTANK2MANIF3_VALVE_2 : 1; //2
-        bool MIDTANK2MANIF3_VALVE_1 : 1; //3
-        bool MIDTANK2MANIF2_VALVE_2 : 1; //4
-        bool MIDTANK2MANIF2_VALVE_1 : 1; //5
-        bool MIDTANK2MANIF1_VALVE_2 : 1; //6
-        bool MIDTANK2MANIF1_VALVE_1 : 1; //7
-        //
-        bool CART2MIDTANK4_VALVE_2  : 1; //8
-        bool CART2MIDTANK4_VALVE_1  : 1; //9
-        bool CART2MIDTANK3_VALVE_2  : 1; //10
-        bool CART2MIDTANK3_VALVE_1  : 1; //11
-        bool CART2MIDTANK2_VALVE_2  : 1; //12
-        bool CART2MIDTANK2_VALVE_1  : 1; //13
-        bool CART2MIDTANK1_VALVE_2  : 1; //14
-        bool CART2MIDTANK1_VALVE_1  : 1; //15
-    }bits;
-    unsigned short ushort;
+{                                                                    //--------------------------//
+    struct                                                           //        A - Air           //
+    {                                                                //        C - Cartridge     //
+        //Dry air Valves                                             //        L - Left          //
+        bool VALVE_2W_MID_AIR_LF   : 1; //0 MIDTANK2MANIF4_VALVE_2   //        R - Right         //
+        bool VALVE_2W_MID_AIR_RF   : 1; //1 MIDTANK2MANIF4_VALVE_1   //        F - Front         //
+        bool VALVE_2W_MID_AIR_LMF  : 1; //2 MIDTANK2MANIF3_VALVE_2   //        B - Back          //
+        bool VALVE_2W_MID_AIR_RMF  : 1; //3 MIDTANK2MANIF3_VALVE_1   //        M - Middle        //
+        bool VALVE_2W_MID_AIR_LMB  : 1; //4 MIDTANK2MANIF2_VALVE_2   //   --------------------   //
+        bool VALVE_2W_MID_AIR_RMB  : 1; //5 MIDTANK2MANIF2_VALVE_1   //     A   [LB]    A [RB]   //
+        bool VALVE_2W_MID_AIR_LB   : 1; //6 MIDTANK2MANIF1_VALVE_2   //     C   [LB]    C [RB]   //
+        bool VALVE_2W_MID_AIR_RB   : 1; //7 MIDTANK2MANIF1_VALVE_1   //                          //
+                                                                     //     A   [LMB]   A [RMB]  //
+        bool VALVE_2W_CART_MID_LF  : 1; //8  CART2MIDTANK4_VALVE_2   //     C   [LMB]   C [RMB]  //
+        bool VALVE_2W_CART_MID_RF  : 1; //9  CART2MIDTANK4_VALVE_1   //                          //
+        bool VALVE_2W_CART_MID_LMF : 1; //10 CART2MIDTANK3_VALVE_2   //     A   [LMF]   A [RMF]  //
+        bool VALVE_2W_CART_MID_RMF : 1; //11 CART2MIDTANK3_VALVE_1   //     C   [LMF]   C [RMF]  //
+        bool VALVE_2W_CART_MID_LMB : 1; //12 CART2MIDTANK2_VALVE_2   //                          //
+        bool VALVE_2W_CART_MID_RMB : 1; //13 CART2MIDTANK2_VALVE_1   //     A   [LF]    A [RF]   //
+        bool VALVE_2W_CART_MID_LB  : 1; //14 CART2MIDTANK1_VALVE_2   //     C   [LF]    C [RF]   //
+        bool VALVE_2W_CART_MID_RB  : 1; //15 CART2MIDTANK1_VALVE_1   //                          //
+    }bits;                                                           //            FRONT         //
+    unsigned short ushort;                                           //--------------------------//
 }VALVE_GPO_REG;
 
+
 //F1_gpo_01
 typedef union
 {
diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
index 7eea21fd3..9ea2c3ed8 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
@@ -58,61 +58,61 @@ typedef enum
 callback_fptr Valve3WayModuleCallback[Number_Of_Disopensers] = {0, 0, 0, 0, 0, 0, 0, 0,};
 uint32_t Valve3WayControlId[Number_Of_Disopensers] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
-void Valve_Command(Valves_t Valve_Id)
+void Valve_Command(Valves_t Valve_Id) //1 - OPEN, 0 - CLOSE
 {
 
     switch(Valve_Id)
     {
     //Dry air Valves
-        case VALVE_MIDTANK_To_MANIF_8:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF4_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_LF:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_MIDTANK_To_MANIF_4:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF4_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_RF:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_MIDTANK_To_MANIF_7:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF3_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_LMF:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LMF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_MIDTANK_To_MANIF_3:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF3_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_RMF:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RMF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_MIDTANK_To_MANIF_6:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF2_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_LMB:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LMB = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_MIDTANK_To_MANIF_2:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF2_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_RMB:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RMB = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_MIDTANK_To_MANIF_5:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF1_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_LB:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LB = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_MIDTANK_To_MANIF_1:
-                Valve_GPO_Reg.bits.MIDTANK2MANIF1_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_RB:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RB = ValveRequest[Valve_Id].Direction;
             break;
 
         //Dispenser Valves
-        case VALVE_CART_To_MIDTANK_8:
-                Valve_GPO_Reg.bits.CART2MIDTANK4_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_LF:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_CART_To_MIDTANK_4:
-                Valve_GPO_Reg.bits.CART2MIDTANK4_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_RF:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_CART_To_MIDTANK_7:
-                Valve_GPO_Reg.bits.CART2MIDTANK3_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_LMF:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LMF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_CART_To_MIDTANK_3:
-                Valve_GPO_Reg.bits.CART2MIDTANK3_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_RMF:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RMF = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_CART_To_MIDTANK_6:
-                Valve_GPO_Reg.bits.CART2MIDTANK2_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_LMB:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LMB = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_CART_To_MIDTANK_2:
-                Valve_GPO_Reg.bits.CART2MIDTANK2_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_RMB:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RMB = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_CART_To_MIDTANK_5:
-                Valve_GPO_Reg.bits.CART2MIDTANK1_VALVE_2 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_LB:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LB = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_CART_To_MIDTANK_1:
-                Valve_GPO_Reg.bits.CART2MIDTANK1_VALVE_1 = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_RB:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RB = ValveRequest[Valve_Id].Direction;
             break;
 
         // Waste Valves
diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.h b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.h
index 933c96815..364314928 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.h
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.h
@@ -22,25 +22,29 @@ typedef enum
     VALVE_DISPENSER_7,
     VALVE_DISPENSER_8,
 
-    //Dry air - Middle Tank
-    VALVE_MIDTANK_To_MANIF_8,//VALVE_MIDTANK_To_MANIF_4_2,
-    VALVE_MIDTANK_To_MANIF_4,//VALVE_MIDTANK_To_MANIF_4_1,
-    VALVE_MIDTANK_To_MANIF_7,//VALVE_MIDTANK_To_MANIF_3_2,
-    VALVE_MIDTANK_To_MANIF_3,//VALVE_MIDTANK_To_MANIF_3_1,
-    VALVE_MIDTANK_To_MANIF_6,//VALVE_MIDTANK_To_MANIF_2_2,
-    VALVE_MIDTANK_To_MANIF_2,//VALVE_MIDTANK_To_MANIF_2_1,
-    VALVE_MIDTANK_To_MANIF_5,//VALVE_MIDTANK_To_MANIF_1_2,
-    VALVE_MIDTANK_To_MANIF_1,//VALVE_MIDTANK_To_MANIF_1_1,
-
-    //Cartridge - Middle Tank
-    VALVE_CART_To_MIDTANK_8,//VALVE_CART_To_MIDTANK_4_2,
-    VALVE_CART_To_MIDTANK_4,//VALVE_CART_To_MIDTANK_4_1,
-    VALVE_CART_To_MIDTANK_7,//VALVE_CART_To_MIDTANK_3_2,
-    VALVE_CART_To_MIDTANK_3,//VALVE_CART_To_MIDTANK_3_1,
-    VALVE_CART_To_MIDTANK_6,//VALVE_CART_To_MIDTANK_2_2,
-    VALVE_CART_To_MIDTANK_2,//VALVE_CART_To_MIDTANK_2_1,
-    VALVE_CART_To_MIDTANK_5,//VALVE_CART_To_MIDTANK_1_2,
-    VALVE_CART_To_MIDTANK_1,//VALVE_CART_To_MIDTANK_1_1,
+    //---------------------------------------------------------------------------//
+    //Dry Air - Middle Tank                          //        A - Air           //
+    VALVE_2W_MID_AIR_LF,   //MIDTANK2MANIF4_VALVE_2  //        C - Cartridge     //
+    VALVE_2W_MID_AIR_RF,   //MIDTANK2MANIF4_VALVE_1  //        L - Left          //
+    VALVE_2W_MID_AIR_LMF,  //MIDTANK2MANIF3_VALVE_2  //        R - Right         //
+    VALVE_2W_MID_AIR_RMF,  //MIDTANK2MANIF3_VALVE_1  //        F - Front         //
+    VALVE_2W_MID_AIR_LMB,  //MIDTANK2MANIF2_VALVE_2  //        B - Back          //
+    VALVE_2W_MID_AIR_RMB,  //MIDTANK2MANIF2_VALVE_1  //        M - Middle        //
+    VALVE_2W_MID_AIR_LB,   //MIDTANK2MANIF1_VALVE_2  //   --------------------   //
+    VALVE_2W_MID_AIR_RB,   //MIDTANK2MANIF1_VALVE_1  //     A   [LB]    A [RB]   //
+                                                     //     C   [LB]    C [RB]   //
+                                                     //                          //
+                                                     //     A   [LMB]   A [RMB]  //
+    //Cartridge - Middle Tank                        //     C   [LMB]   C [RMB]  //
+    VALVE_2W_CART_MID_LF,  //CART2MIDTANK4_VALVE_2   //                          //
+    VALVE_2W_CART_MID_RF,  //CART2MIDTANK4_VALVE_1   //     A   [LMF]   A [RMF]  //
+    VALVE_2W_CART_MID_LMF, //CART2MIDTANK3_VALVE_2   //     C   [LMF]   C [RMF]  //
+    VALVE_2W_CART_MID_RMF, //CART2MIDTANK3_VALVE_1   //                          //
+    VALVE_2W_CART_MID_LMB, //CART2MIDTANK2_VALVE_2   //     A   [LF]    A [RF]   //
+    VALVE_2W_CART_MID_RMB, //CART2MIDTANK2_VALVE_1   //     C   [LF]    C [RF]   //
+    VALVE_2W_CART_MID_LB,  //CART2MIDTANK1_VALVE_2   //                          //
+    VALVE_2W_CART_MID_RB,  //CART2MIDTANK1_VALVE_1   //            FRONT         //
+    //---------------------------------------------------------------------------//
 
     // Waste Valves
     VALVE_WASTE_TANK,