update to midtank new order

6 files changed, 87 insertions, 87 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
index 1ecedf00c..ede5df6a4 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
@@ -1034,23 +1034,23 @@ typedef union
     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   //                          //
+        bool VALVE_2W_MID_AIR_8   : 1; //0 MIDTANK2MANIF4_VALVE_2   //        R - Right         //
+        bool VALVE_2W_MID_AIR_4   : 1; //1 MIDTANK2MANIF4_VALVE_1   //        F - Front         //
+        bool VALVE_2W_MID_AIR_7  : 1; //2 MIDTANK2MANIF3_VALVE_2   //        B - Back          //
+        bool VALVE_2W_MID_AIR_3  : 1; //3 MIDTANK2MANIF3_VALVE_1   //        M - Middle        //
+        bool VALVE_2W_MID_AIR_6  : 1; //4 MIDTANK2MANIF2_VALVE_2   //   --------------------   //
+        bool VALVE_2W_MID_AIR_2  : 1; //5 MIDTANK2MANIF2_VALVE_1   //     A   [7]    A [8]   //
+        bool VALVE_2W_MID_AIR_5   : 1; //6 MIDTANK2MANIF1_VALVE_2   //     C   [7]    C [8]   //
+        bool VALVE_2W_MID_AIR_1   : 1; //7 MIDTANK2MANIF1_VALVE_1   //                          //
+                                                                     //     A   [5]   A [6]  //
+        bool VALVE_2W_CART_MID_8  : 1; //8  CART2MIDTANK4_VALVE_2   //     C   [5]   C [6]  //
+        bool VALVE_2W_CART_MID_4  : 1; //9  CART2MIDTANK4_VALVE_1   //                          //
+        bool VALVE_2W_CART_MID_7 : 1; //10 CART2MIDTANK3_VALVE_2   //     A   [3]   A [4]  //
+        bool VALVE_2W_CART_MID_3 : 1; //11 CART2MIDTANK3_VALVE_1   //     C   [3]   C [4]  //
+        bool VALVE_2W_CART_MID_6 : 1; //12 CART2MIDTANK2_VALVE_2   //                          //
+        bool VALVE_2W_CART_MID_2 : 1; //13 CART2MIDTANK2_VALVE_1   //     A   [1]    A [2]   //
+        bool VALVE_2W_CART_MID_5  : 1; //14 CART2MIDTANK1_VALVE_2   //     C   [1]    C [2]   //
+        bool VALVE_2W_CART_MID_1  : 1; //15 CART2MIDTANK1_VALVE_1   //                          //
     }bits;                                                           //            FRONT         //
     unsigned short ushort;                                           //--------------------------//
 }VALVE_GPO_REG;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c
index 7d27ec2db..330ffb2a8 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c
@@ -120,35 +120,35 @@ uint32_t Read_MidTank_Pressure_Sensor(MidTank_t MidTank_ID) //0-7
 
     switch(MidTank_ID)
     {
-        case MIDTANK_RB:
+        case MIDTANK_1:
                 I2C_Slave_Add = 0x44;
                 Channel = 0x20;
             break;
-        case MIDTANK_RMB:
+        case MIDTANK_2:
                 I2C_Slave_Add = 0x44;
                 Channel = 0x10;
             break;
-        case MIDTANK_RMF:
+        case MIDTANK_3:
                 I2C_Slave_Add = 0x44;
                 Channel = 0x08;
             break;
-        case MIDTANK_RF:
+        case MIDTANK_4:
                 I2C_Slave_Add = 0x44;
                 Channel = 0x04;
             break;
-        case MIDTANK_LB:
+        case MIDTANK_5:
                 I2C_Slave_Add = 0x46;
                 Channel = 0x80;
             break;
-        case MIDTANK_LMB:
+        case MIDTANK_6:
                 I2C_Slave_Add = 0x46;
                 Channel = 0x40;
             break;
-        case MIDTANK_LMF:
+        case MIDTANK_7:
                 I2C_Slave_Add = 0x46;
                 Channel = 0x20;
             break;
-        case MIDTANK_LF:
+        case MIDTANK_8:
                 I2C_Slave_Add = 0x46;
                 Channel = 0x10;
             break;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.h
index fb50a2a73..974628f6a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.h
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.h
@@ -12,14 +12,14 @@
 
 typedef enum
 {
-    MIDTANK_RB,
-    MIDTANK_RMB,
-    MIDTANK_RMF,
-    MIDTANK_RF,
-    MIDTANK_LB,
-    MIDTANK_LMB,
-    MIDTANK_LMF,
-    MIDTANK_LF,
+    MIDTANK_1,
+    MIDTANK_2,
+    MIDTANK_3,
+    MIDTANK_4,
+    MIDTANK_5,
+    MIDTANK_6,
+    MIDTANK_7,
+    MIDTANK_8,
     NUM_OF_MIDTANKS,
 } MidTank_t;
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
index 3c7b9847a..66d6c457b 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
@@ -64,55 +64,55 @@ void Valve_Command(Valves_t Valve_Id) //1 - OPEN, 0 - CLOSE
     switch(Valve_Id)
     {
     //Dry air Valves
-        case VALVE_2W_MID_AIR_LF:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_8:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_8 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_MID_AIR_RF:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_4:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_4 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_MID_AIR_LMF:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LMF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_7:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_7 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_MID_AIR_RMF:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RMF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_3:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_3 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_MID_AIR_LMB:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LMB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_6:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_6 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_MID_AIR_RMB:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RMB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_2:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_2 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_MID_AIR_LB:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_LB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_5:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_5 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_MID_AIR_RB:
-                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_RB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_MID_AIR_1:
+                Valve_GPO_Reg.bits.VALVE_2W_MID_AIR_1 = ValveRequest[Valve_Id].Direction;
             break;
 
         //Dispenser Valves
-        case VALVE_2W_CART_MID_LF:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_8:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_8 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_CART_MID_RF:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_4:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_4 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_CART_MID_LMF:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LMF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_7:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_7 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_CART_MID_RMF:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RMF = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_3:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_3 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_CART_MID_LMB:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LMB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_6:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_6 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_CART_MID_RMB:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RMB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_2:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_2 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_CART_MID_LB:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_LB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_5:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_5 = ValveRequest[Valve_Id].Direction;
             break;
-        case VALVE_2W_CART_MID_RB:
-                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_RB = ValveRequest[Valve_Id].Direction;
+        case VALVE_2W_CART_MID_1:
+                Valve_GPO_Reg.bits.VALVE_2W_CART_MID_1 = 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 593076eb9..ec6de35e1 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.h
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.h
@@ -49,26 +49,26 @@ typedef enum
 */
     //---------------------------------------------------------------------------//
     //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]   //
+    VALVE_2W_MID_AIR_8,   //MIDTANK2MANIF4_VALVE_2  //        C - Cartridge     //
+    VALVE_2W_MID_AIR_4,   //MIDTANK2MANIF4_VALVE_1  //        L - Left          //
+    VALVE_2W_MID_AIR_7,  //MIDTANK2MANIF3_VALVE_2  //        R - Right         //
+    VALVE_2W_MID_AIR_3,  //MIDTANK2MANIF3_VALVE_1  //        F - Front         //
+    VALVE_2W_MID_AIR_6,  //MIDTANK2MANIF2_VALVE_2  //        B - Back          //
+    VALVE_2W_MID_AIR_2,  //MIDTANK2MANIF2_VALVE_1  //        M - Middle        //
+    VALVE_2W_MID_AIR_5,   //MIDTANK2MANIF1_VALVE_2  //   --------------------   //
+    VALVE_2W_MID_AIR_1,   //MIDTANK2MANIF1_VALVE_1  //     A   [7]    A [8]   //
+                                                     //     C   [7]    C [8]   //
                                                      //                          //
-                                                     //     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         //
+                                                     //     A   [5]   A [6]  //
+    //Cartridge - Middle Tank                        //     C   [5]   C [6]  //
+    VALVE_2W_CART_MID_8,  //CART2MIDTANK4_VALVE_2   //                          //
+    VALVE_2W_CART_MID_4,  //CART2MIDTANK4_VALVE_1   //     A   [3]   A [4]  //
+    VALVE_2W_CART_MID_7, //CART2MIDTANK3_VALVE_2   //     C   [3]   C [4]  //
+    VALVE_2W_CART_MID_3, //CART2MIDTANK3_VALVE_1   //                          //
+    VALVE_2W_CART_MID_6, //CART2MIDTANK2_VALVE_2   //     A   [1]    A [2]   //
+    VALVE_2W_CART_MID_2, //CART2MIDTANK2_VALVE_1   //     C   [1]    C [2]   //
+    VALVE_2W_CART_MID_5,  //CART2MIDTANK1_VALVE_2   //                          //
+    VALVE_2W_CART_MID_1,  //CART2MIDTANK1_VALVE_1   //            FRONT         //
     //---------------------------------------------------------------------------//
 
     // Waste Valves
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index e376175d4..dfd45ec3d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -182,7 +182,7 @@ uint32_t DispenserHomingRequestCallback(uint32_t deviceID, uint32_t ReadValue)
     uint8_t DispenserId = deviceID-HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1;
 
     //close dry air valve in the dispenser
-    Valve_Set((Valves_t) (DispenserId+VALVE_2W_MID_AIR_LF), Atm_MidTank_OFF);
+    Valve_Set((Valves_t) (DispenserId+VALVE_2W_MID_AIR_8), Atm_MidTank_OFF);
     MotorSetMicroStep(deviceID, MotorsCfg[deviceID].microstep);
 
     responseContainer = createContainer(MESSAGE_TYPE__DispenserHomingResponse, HomingToken[deviceID], true, &response, &motor_homing_response__pack, &motor_homing_response__get_packed_size);
@@ -229,7 +229,7 @@ uint32_t DispenserHomingRequestFunc(MessageContainer* requestContainer)
                 Control3WayValvesWithCallback ((Valves_t) request->index, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
                 //Valve_Set((Valves_t) request->index, MidTank_Dispenser);
                 //open dry air valve in the dispenser
-                Valve_Set((Valves_t) (request->index+VALVE_2W_MID_AIR_LF), Atm_MidTank_ON);
+                Valve_Set((Valves_t) (request->index+VALVE_2W_MID_AIR_8), Atm_MidTank_ON);
 
                 MotorSetMicroStep(MotorId, 1);
 
@@ -253,7 +253,7 @@ uint32_t DispenserAbortHomingRequestFunc(MessageContainer* requestContainer)
     TimerMotors_t MotorId = (request->index)+HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1;
     MotorAbortMovetoLimitSwitch(MotorId);
     //close dry air valve in the dispenser
-    Valve_Set((Valves_t) ((request->index)+VALVE_2W_MID_AIR_LF), Atm_MidTank_OFF);
+    Valve_Set((Valves_t) ((request->index)+VALVE_2W_MID_AIR_8), Atm_MidTank_OFF);
 
     responseContainer = createContainer(MESSAGE_TYPE__DispenserAbortHomingResponse,  requestContainer->token, false, &response, &dispenser_abort_homing_response__pack, &dispenser_abort_homing_response__get_packed_size);
     responseContainer.continuous = false;