Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -rf7c714a1a09b10d85a8b013712532d37b4d7b97a -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file Interrupts.c * -* @author (last) Vinayakam Mani -* @date (last) 06-Aug-2024 +* @author (last) Michael Garthwaite +* @date (last) 26-Jan-2026 * * @author (original) Vinayakam Mani -* @date (original) 05-Aug-2024 +* @date (original) 07-Aug-2024 * ***************************************************************************/ @@ -22,6 +22,7 @@ #include "AlarmMgmtDD.h" #include "Comm.h" +#include "ConductivityTeensy.h" #include "FPGA.h" #include "Interrupts.h" #include "SystemCommDD.h" @@ -236,7 +237,17 @@ case DMA_CH2: // FPGA transmit channel clearSCI2DMATransmitInterrupt(); signalFPGATransmitCompleted(); - break; + break; + + case DMA_CH1: // Conductivity receive channel + clearSCIDMAReceiveInterrupt(); + signalConductivityReceiptCompleted(); + break; + + case DMA_CH3: // Conductivity transmit channel + clearSCIDMATransmitInterrupt(); + signalConductivityTransmitCompleted(); + break; default: // TODO - ignore?