Merge fixes.

This commit is contained in:
Sonny Jeon
2013-10-29 19:28:44 -06:00
parent 4402a9f74a
commit b8f0a2399e
6 changed files with 1 additions and 15 deletions

View File

@ -67,7 +67,6 @@ ISR(LIMIT_INT_vect)
if (sys.state != STATE_ALARM) {
if (bit_isfalse(sys.execute,EXEC_ALARM)) {
mc_reset(); // Initiate system kill.
report_alarm_message(ALARM_HARD_LIMIT);
sys.execute |= EXEC_CRIT_EVENT; // Indicate hard limit critical event
}
}