aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers/FPGA
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-11-05 17:15:49 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-11-05 17:15:49 +0200
commit2f01062dca5a8e1bb9388cd4420d39125ebd3561 (patch)
treeee4c364007b467aa5a8e628269e154c5c2415c9f /Software/Embedded_SW/Embedded/Drivers/FPGA
parentdd646f34a3108d5321ea2d09e5ba807d6ee50240 (diff)
downloadTango-2f01062dca5a8e1bb9388cd4420d39125ebd3561.tar.gz
Tango-2f01062dca5a8e1bb9388cd4420d39125ebd3561.zip
alarm handling improved, including fan alarms
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers/FPGA')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c10
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h1
2 files changed, 6 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
index 95651eba2..0b308408c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
@@ -350,15 +350,15 @@ uint32_t Dryer_Read_Blower_Tach()
return RPM;
}
*/
+uint32_t Drayer_Fan_Speed_RPM = 0;
+uint32_t Get_Dryer_Fan_Tacho()
+{
+ return Drayer_Fan_Speed_RPM;
+}
uint32_t Read_Dryer_Fan_Tacho()
{
-
- uint32_t Drayer_Fan_Speed_RPM = 0;
-
Drayer_Fan_Speed_RPM = Calculate_Tacho_Fan_Speed(FPGA_Freq, 12, F1_Prescaler1_reg5, F1_Tacho_reg8);
-
-
return Drayer_Fan_Speed_RPM;
}
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h
index e660b450a..121211c69 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h
@@ -15,6 +15,7 @@ void Control_Dryer_Fan_PWM(uint8_t PWM_Command_Precent);
void Machine_Idle_Breathing_Led();
uint32_t Read_Dryer_Fan_Tacho();
+uint32_t Get_Dryer_Fan_Tacho();
void Set_Speed_Sensor_TypeII_Registers(uint32_t Counter, uint32_t Prescaler);
uint32_t Read_Speed_Sensor_TypeII();