Invert the polarity of Jogging and Thread Load Switches

4 files changed, 23 insertions, 21 deletions

diff --git a/Software/Embedded_SW/.jxbrowser-data/Login Data b/Software/Embedded_SW/.jxbrowser-data/Login Data
index 3cf4f42f8..344eacb15 100644
--- a/Software/Embedded_SW/.jxbrowser-data/Login Data
+++ b/Software/Embedded_SW/.jxbrowser-data/Login Data
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
index de196fdc2..342a9d759 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
@@ -763,7 +763,7 @@ bool Get_Thread_Jogging_Button()
 {
     bool IsThreadJoggingPressed = false;
 
-    if(F3_GPI_02_Reg.bits.Thread_Jogging_Switch == true)
+    if(F3_GPI_02_Reg.bits.Thread_Jogging_Switch == false)
         IsThreadJoggingPressed = true;
 
         return IsThreadJoggingPressed;
@@ -773,7 +773,7 @@ bool Get_Thread_Load_Button()
 {
     bool IsThreadLoadPressed = false;
 
-    if(F3_GPI_02_Reg.bits.Thread_Load_Switch == true)
+    if(F3_GPI_02_Reg.bits.Thread_Load_Switch == false)
         IsThreadLoadPressed = true;
 
         return IsThreadLoadPressed;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.c
index 89940b062..790f77f8a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.c
@@ -208,20 +208,20 @@ uint8_t TCA9534TestRelay(uint8_t Dispenser_ID, TCA9534Regs* Regs, bool EnableTes
             Write_Buf[1] = Regs->Config[Dispenser_ID].Uchar;
             status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
 
-
             //Set the RELAY_TEST pin to LOW
             Regs->Output[Dispenser_ID].bit.RELAY_TEST = LOW;
             Write_Buf[0] = TCA9534_OUTPUT_REG;
             Write_Buf[1] = Regs->Output[Dispenser_ID].Uchar;
             status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
         }
-/*
-        //Set RELAY_TEST to input:
-        Regs->Config[Dispenser_ID].bit.RELAY_TEST = TCA9534_INPUT;
-        Write_Buf[0] = TCA9534_CONFIG_REG;
-        Write_Buf[1] = Regs->Config[Dispenser_ID].Uchar;
-        status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
-*/
+        /*else
+        {
+            //Set RELAY_TEST to input:
+            Regs->Config[Dispenser_ID].bit.RELAY_TEST = TCA9534_INPUT;
+            Write_Buf[0] = TCA9534_CONFIG_REG;
+            Write_Buf[1] = Regs->Config[Dispenser_ID].Uchar;
+            status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
+        }*/
     }
     return status;
 
@@ -247,20 +247,21 @@ uint8_t TCA9534ByPass(uint8_t Dispenser_ID, TCA9534Regs* Regs, bool EnableByPass
             Write_Buf[1] = Regs->Config[Dispenser_ID].Uchar;
             status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
 
-
             //Set the BYPASS pin to LOW
             Regs->Output[Dispenser_ID].bit.BYPASS = LOW;
             Write_Buf[0] = TCA9534_OUTPUT_REG;
             Write_Buf[1] = Regs->Output[Dispenser_ID].Uchar;
             status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
         }
-/*
-        //Set BYPASS to input:
-        Regs->Config[Dispenser_ID].bit.BYPASS = TCA9534_INPUT;
-        Write_Buf[0] = TCA9534_CONFIG_REG;
-        Write_Buf[1] = Regs->Config[Dispenser_ID].Uchar;
-        status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
-        */
+        /*else
+        {
+            //Set BYPASS to input:
+            Regs->Config[Dispenser_ID].bit.BYPASS = TCA9534_INPUT;
+            Write_Buf[0] = TCA9534_CONFIG_REG;
+            Write_Buf[1] = Regs->Config[Dispenser_ID].Uchar;
+            status |= I2C_Write(I2C_ID_DISP_MUX, TCA9534_ADDRESS, Write_Buf, 2);
+        }*/
+
     }
     return status;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dispenser.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dispenser.c
index 02821fab3..f3efa3b67 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dispenser.c
@@ -36,10 +36,11 @@ void Stub_DispenserRequest(MessageContainer* requestContainer)
 
     TCA9534Regs Regs;
 
-    /*static bool first_time = true;
+    //static bool first_time = true;
 
-    if(first_time == true)
-    {*/
+    //if(first_time == true)
+    //if ((Regs.Config[request->dispenserid].bit.DISP_DOWN != TCA9534_INPUT) || (Regs.Config[request->dispenserid].bit.DISP_UP!= TCA9534_INPUT))
+    //{
         status |= TCA9534Init(request->dispenserid, &Regs);
         //first_time = false;
     //}