bool Waste_OverFull()

bool Waste_Flow_Switch()
bool Dryer_Door_Switch()

4 files changed, 32 insertions, 15 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
index 9852bf874..7c052fcde 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Comm.h
@@ -1303,7 +1303,7 @@ typedef union
         bool F1_LS_LSPARE1         : 1; //3
         bool F1_LS_LPIVOT_UP       : 1; //4
         bool F1_LS_LPIVOT_DOWN     : 1; //5
-        bool F1_LS_LOADARM_RIGHT   : 1; //6
+        bool F1_DR_DOOR_SW_NO      : 1; //6 F1_LS_LOADARM_RIGHT
         bool F1_LS_LOADARM_LEFT    : 1; //7
         bool F1_LS_LLOADMOTOR_UP   : 1; //8
         bool F1_LS_LLOADMOTOR_DOWN : 1; //9
@@ -1527,9 +1527,9 @@ typedef union
 {
     struct
     {
-        bool F2_GPI_CHILLER_STAT1 : 1; //0
+        bool F2_WASTE_OVERFULL_NO : 1; //0 F2_GPI_CHILLER_STAT1
         bool F2_GPI_CHILLER_FAULT : 1; //1
-        bool F2_GPI_AIRFLOW_FLAP  : 1; //2
+        bool F2_WASTE_FLOW_SW_NO  : 1; //2 F2_GPI_AIRFLOW_FLAP
         unsigned short RESERVE    :13; //3-15
     }bits;
     unsigned short ushort;
@@ -1543,7 +1543,7 @@ typedef union
     {
         bool F3_GPI_WCONTAINER_WARN : 1; //0
         bool F3_GPI_WCONTAINER_FULL : 1; //1
-        bool F3_GPI_SW_FILTER_PRES  : 1; //2
+        bool F3_GPI_SW_FILTER_PRES  : 1; //2 FILTER_PRES_SW_NO
         bool F3_GPI_PANSW6          : 1; //3
         bool F3_GPI_PANSW5          : 1; //4
         bool F3_GPI_PANSW4          : 1; //5
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 e12863077..eb99cbdc1 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
@@ -546,19 +546,19 @@ void WHS_Read_GPI_Registers()
     F3_GPI_01_Reg.ushort = F3_GPI_01_D;
 }
 
-bool WHS_GET_GPI_AIRFLOW_FLAP()
-{
-    return F2_GPI_Reg.bits.F2_GPI_AIRFLOW_FLAP;
-}
+//bool WHS_GET_GPI_AIRFLOW_FLAP()
+//{
+//    return F2_GPI_Reg.bits.F2_GPI_AIRFLOW_FLAP;
+//}
 
 bool WHS_GPI_CHILLER_FAULT()
 {
     return F2_GPI_Reg.bits.F2_GPI_CHILLER_FAULT;
 }
 
-bool WHS_GPI_CHILLER_STAT1()
+bool Waste_OverFull()
 {
-    return F2_GPI_Reg.bits.F2_GPI_CHILLER_STAT1;
+    return F2_GPI_Reg.bits.F2_WASTE_OVERFULL_NO;
 }
 
 bool WHS_GPI_SW_FILTER_PRES()
@@ -576,6 +576,12 @@ bool WHS_GPI_WCONTAINER_WARN()
     return F3_GPI_01_Reg.bits.F3_GPI_WCONTAINER_WARN;
 }
 
+bool Waste_Flow_Switch()
+{
+        return F2_GPI_Reg.bits.F2_WASTE_FLOW_SW_NO;
+}
+
+
 //--------------------------------------
 bool Get_COVER_1_State(COVERS_ENUM CoverId)
 {
@@ -735,12 +741,21 @@ bool Emergency_Push_Button_Report()//TODO move to GPIO folder
 {
     bool IsEmergencyPressed = false;
 
-    if(ROM_GPIOPinRead(GPIO_PORTR_BASE, GPIO_PIN_2))
+    if(ROM_GPIOPinRead(GPIO_PORTR_BASE, GPIO_PIN_2)) //EPB_S1 (GPI_PS1_DC_OK)
         IsEmergencyPressed = true;
 
         return IsEmergencyPressed;
 }
 
+bool Dryer_Door_Switch()
+{
+    if(LS_Left.bits.F1_DR_DOOR_SW_NO)
+        return OPEN;
+
+    return CLOSE;
+}
+
+
 
 
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h
index 1d794bbe0..47dc04bb5 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h
@@ -204,7 +204,8 @@ uint32_t ReadBreakSensor();
 void WHS_Read_GPI_Registers();
 bool WHS_GET_GPI_AIRFLOW_FLAP();
 bool WHS_GPI_CHILLER_FAULT();
-bool WHS_GPI_CHILLER_STAT1();
+bool Waste_OverFull();
+bool Waste_Flow_Switch();
 bool WHS_GPI_SW_FILTER_PRES();
 bool WHS_GPI_WCONTAINER_FULL();
 bool WHS_GPI_WCONTAINER_WARN();
@@ -231,6 +232,7 @@ void Pumps_Control(PUMPS_ENUM Pump_Id, bool Direction);
 uint32_t Control_Dryer_Fan(bool StartStop, uint8_t PWN_Command_Precent);
 bool Check_Disp_Sfaty_Stop_Indication(uint8_t Dispenser_ID);
 bool Emergency_Push_Button_Report();
+bool Dryer_Door_Switch();
 
 
 #endif /* DRIVERS_FPGA_FPGA_GPIO_FPGA_GPIO_H_ */
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Rename.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Rename.h
index b86cde869..4675dad9f 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Rename.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_Rename.h
@@ -29,10 +29,10 @@
 //#define ANALOG_DYEINGH_TEMP6_3      aaaaaaaa
 //#define ANALOG_DYEINGH_TEMP6_4      aaaaaaaa
 //#define                             aaaaaaaa
-#define DR_DOOR_SW_NO               GPI_LS_RLOADRAM_UP
-#define WASTE_FLOW_SW_NO            F2_GPI_AIRFLOW_FLAP
+//#define DR_DOOR_SW_NO               GPI_LS_RLOADRAM_UP
+//#define WASTE_FLOW_SW_NO            F2_GPI_AIRFLOW_FLAP
 #define FILTER_PRES_SW_NO           F3_GPI_SW_FILTER_PRES
-#define WASTE_OVERFULL_NO           F2_GPI_CHILLER_STAT1
+//#define WASTE_OVERFULL_NO           F2_GPI_CHILLER_STAT1
 //#define CHILLER_RS485_p             aaaaaaaa
 //#define CHILLER_RS485_n             aaaaaaaa
 //#define WHS_TEMP_RS485_p            aaaaaaaa