Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r1d44cf33cf4461b81b19a8ab0e402c609649786b -r0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 1d44cf33cf4461b81b19a8ab0e402c609649786b) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 0dec8744af40d0c87a6d7cd1923920c1c2bd1d2f) @@ -1,18 +1,19 @@ -/************************************************************************** - * - * Copyright (c) 2019-2020 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 TaskPriority.c - * - * @date 19-Sep-2019 - * @author S. Nash - * - * @brief Priority task handler. - * - **************************************************************************/ +/************************************************************************** +* +* Copyright (c) 2019-2020 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 TaskPriority.c +* +* @author (last) Quang Nguyen +* @date (last) 13-Jul-2020 +* +* @author (original) Dara Navaei +* @date (original) 05-Nov-2019 +* +***************************************************************************/ #include "gio.h" @@ -26,7 +27,8 @@ #include "TemperatureSensors.h" #include "Valves.h" #include "WatchdogMgmt.h" -#include "TemperatureSensors.h" +#include "TemperatureSensors.h" +#include "ConductivitySensors.h" #include "Heaters.h" /************************************************************************* @@ -55,7 +57,10 @@ #ifndef DISABLE_HEATERS_AND_TEMPS // Temperature sensors read execTemperatureSensors(); -#endif +#endif + + // conductivity sensors read + execConductivitySensors(); // control valves execValves();