aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers/FPGA
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-12-24 16:20:59 +0200
committerAvi Levkovich <avi@twine-s.com>2020-12-24 16:20:59 +0200
commit71f7f59a5345c2df5d2fa8c641a88bf1d12bf063 (patch)
treebea86c782bb1a56cef3c824468680e8f0b9df476 /Software/Embedded_SW/Embedded/Drivers/FPGA
parent49251db3f95a2c3146fc94ef2d487042891a6220 (diff)
parenta7d02907a37ba35da13b03264ba5110bd08f83c1 (diff)
downloadTango-71f7f59a5345c2df5d2fa8c641a88bf1d12bf063.tar.gz
Tango-71f7f59a5345c2df5d2fa8c641a88bf1d12bf063.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers/FPGA')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c4
1 files changed, 3 insertions, 1 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 4b343a383..d9315f9af 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
@@ -18,6 +18,7 @@
#include "Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h"
#include <Drivers/I2C_Communication/I2C_Task.h>
+#include <Utilities/utils.h>
#include <Utilities/delay.h>
FPGA_GPI FPGA_Gpi;
@@ -487,9 +488,9 @@ uint32_t DeActivateCleanerPump()
return OK;
}
//----------------------------------
-
void Power_Off()//Power Down
{
+ utilsStoreLocalTime();
#ifdef WATCHDOG
ROM_WatchdogResetDisable(WATCHDOG0_BASE);
#endif
@@ -499,6 +500,7 @@ void Power_Off()//Power Down
void Power_Reset()// Resets the MCU
{
+ utilsStoreLocalTime();
F3_SW_RESET_reg &= ~BIT0;
SysCtlDelay(1000);
F3_SW_RESET_reg |= BIT0;