aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-07-24 09:15:08 +0300
committerAvi Levkovich <avi@twine-s.com>2018-07-24 09:15:08 +0300
commit7aaa8cb0c4b3c39c7583af89fcee5ea24e7b60ce (patch)
tree3c28da76209e999558e31b549a22cbfad4374e05 /Software/Embedded_SW/Embedded/Modules
parent330ceb91550c91a42cabc2b536c282dcc4186b6e (diff)
parentcf743ba7e969541d729365f4a76e59c7c83d7d58 (diff)
downloadTango-7aaa8cb0c4b3c39c7583af89fcee5ea24e7b60ce.tar.gz
Tango-7aaa8cb0c4b3c39c7583af89fcee5ea24e7b60ce.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 4c25aa508..42c31bf9a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -523,7 +523,7 @@ void EightMilliSecondHeatersInterrupt(UArg arg0)
ROM_TimerIntClear(Heater_timerBase, TIMER_TIMA_TIMEOUT); // Clear the timer interrupt
- ROM_IntMasterDisable();
+ //ROM_IntMasterDisable();
HeatersControlMessageStruc Message;
//bool retcode = false;
@@ -544,7 +544,7 @@ void EightMilliSecondHeatersInterrupt(UArg arg0)
//
// Enable all interrupts.
//
- ROM_IntMasterEnable();
+ //ROM_IntMasterEnable();
return ;
}