diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-13 12:51:32 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-13 12:51:32 +0300 |
| commit | aa1f5080ef2aaacababbabe2a1deac10d5b87c57 (patch) | |
| tree | 9f42ee6ceaf1866dd5cc31a8dbf36898b74f33f4 /Software/Embedded_SW/Embedded | |
| parent | 00a6a3d47d6643fe8ae501967c21f90b7cef0325 (diff) | |
| download | Tango-aa1f5080ef2aaacababbabe2a1deac10d5b87c57.tar.gz Tango-aa1f5080ef2aaacababbabe2a1deac10d5b87c57.zip | |
fix internal alarm bug
Diffstat (limited to 'Software/Embedded_SW/Embedded')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c index 36d9c16bd..c2ba38b5a 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c @@ -424,7 +424,7 @@ void FPGA_SetMotorsInit() F2_Moto_Driver_NSTBYRST1 = 0; F3_Moto_Driver_NSTBYRST1 = 0; - SysCtlDelay(100); + SysCtlDelay(120000); F1_Moto_Driver_NSTBYRST1 = 0xFFFF; F1_Moto_Driver_NSTBYRST2 = 0xFFFF; diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 87b439fab..3a08bc42a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -254,7 +254,7 @@ uint32_t HeatersTestInternalAlarmsCBFunction(uint32_t IfIndex, uint32_t readValu InternalAlarmActive[index] = true; ReportWithPackageFilter(HeatersFilter,"Internal Over the max temperature, turned off",__FILE__,index,readValue,RpWarning, 0,0); - AlarmHandlingSetAlarm(EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE, true); + AlarmHandlingSetAlarm(EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE, false); } } |