Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -rbd896114f304304a7096b30b2a85067a64645e82 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 830213bc6dcc1a684610caf78c79d55f2cb41e93) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision bd896114f304304a7096b30b2a85067a64645e82) @@ -7,8 +7,8 @@ * * @file Interrupts.c * -* @author (last) Vinayakam Mani -* @date (last) 30-Aug-2024 +* @author (last) Michael Garthwaite +* @date (last) 26-Jan-2026 * * @author (original) Vinayakam Mani * @date (original) 07-Aug-2024 @@ -22,6 +22,9 @@ #include "AlarmMgmtDD.h" #include "Comm.h" +#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ +#include "ConductivityTeensy.h" +#endif #include "FPGA.h" #include "Interrupts.h" #include "SystemCommDD.h" @@ -236,8 +239,18 @@ case DMA_CH2: // FPGA transmit channel clearSCI2DMATransmitInterrupt(); signalFPGATransmitCompleted(); + break; +#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + case DMA_CH1: // Conductivity receive channel + clearSCIDMAReceiveInterrupt(); + signalConductivityReceiptCompleted(); + break; + + case DMA_CH3: // Conductivity transmit channel + clearSCIDMATransmitInterrupt(); + signalConductivityTransmitCompleted(); break; - +#endif default: // TODO - ignore? break;