commit 87a6fdcf511a4b8df63d7a531084c21016faae3c
author Brian Silverman <bsilver16384@gmail.com> Wed Mar 14 00:10:30 2018 -0700
committer Gerrit Code Review <gerrit@robotics.mvla.net> Wed Mar 14 00:10:30 2018 -0700
tree a74e7e02085f9b9b9cc23655dc7cf11692ef9b4f
parent 33eb5fab67e6653137e0a93308ba0979816c15db
parent dec012c32028ca2804c674bb714c0864cf118bf1

Merge "Make fault_isr better for what we do"

motors/core/mk20dx128.c

diff --git a/motors/core/mk20dx128.c b/motors/core/mk20dx128.c
index eef0488..07570b9 100644
--- a/motors/core/mk20dx128.c
+++ b/motors/core/mk20dx128.c
@@ -65,14 +65,12 @@
 
 void fault_isr(void) {
   FTM0_C0V = FTM0_C1V = FTM0_C2V = FTM0_C3V = FTM0_C4V = FTM0_C5V = 0;
+  FTM3_C0V = FTM3_C1V = FTM3_C2V = FTM3_C3V = FTM3_C4V = FTM3_C5V = 0;
   printf("fault_isr\n");
   while (1) {
     // keep polling some communication while in fault
     // mode, so we don't completely die.
     if (SIM_SCGC4 & SIM_SCGC4_USBOTG) usb_isr();
-    if (SIM_SCGC4 & SIM_SCGC4_UART0) uart0_status_isr();
-    if (SIM_SCGC4 & SIM_SCGC4_UART1) uart1_status_isr();
-    if (SIM_SCGC4 & SIM_SCGC4_UART2) uart2_status_isr();
   }
 }