aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers/FPGA
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-07-20 14:03:17 +0300
committerAvi Levkovich <avi@twine-s.com>2020-07-20 14:03:17 +0300
commit5bcbb4e0b44ec7486e3b350a85caeb89c05bdae9 (patch)
tree939f7c65bd6e838e12bd086f565faba564703014 /Software/Embedded_SW/Embedded/Drivers/FPGA
parentd54d5b5ab23b17bb326669231d8ca5615bc54309 (diff)
downloadTango-5bcbb4e0b44ec7486e3b350a85caeb89c05bdae9.tar.gz
Tango-5bcbb4e0b44ec7486e3b350a85caeb89c05bdae9.zip
update actuator logic + reading safety
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers/FPGA')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c9
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h2
2 files changed, 6 insertions, 5 deletions
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 3988712df..24b0fce27 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
@@ -1153,15 +1153,16 @@ uint32_t Control_Dryer_Fan(bool StartStop, uint8_t PWM_Command_Precent)//use STA
return status;
}
-bool Emergency_Push_Button_Report()//TODO move to GPIO folder
+bool Safety_Incident_Report()//TODO move to GPIO folder
{
- bool IsEmergencyPressed = false;
+ bool IsSafetyIncidentOccurred = No_Safety_Event;
if(ROM_GPIOPinRead(GPIO_PORTR_BASE, GPIO_PIN_2)) //EPB_S1 (GPI_PS1_DC_OK)
- IsEmergencyPressed = true;
+ IsSafetyIncidentOccurred = Safety_Event_Occurred;
- return IsEmergencyPressed;
+ return IsSafetyIncidentOccurred;
}
+
/*
bool Dryer_Door_Switch()//move to Get_COVER_1_State
{
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 a764e69db..0ff0fa2de 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
@@ -247,7 +247,7 @@ void PumpActivation(uint32_t seconds);
bool IsDryerStopped (void);
uint32_t Control_Dryer_Fan(bool StartStop, uint8_t PWM_Command_Precent);
bool Check_Disp_Safety_Stop_Indication(uint8_t Dispenser_ID);
-bool Emergency_Push_Button_Report();
+bool Safety_Incident_Report();
//bool Dryer_Door_Switch();
uint8_t Pannel_Leds(PANEL_BUTTON_OR_CRAT_ID Pannel_Led_Id, OPERATION_MODE LED_Mode);
uint8_t Init_Machine_Leds();