Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r5e3a46112ebab361a33b9f7cadb619eb12b44c0f -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 5e3a46112ebab361a33b9f7cadb619eb12b44c0f) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,7 +8,7 @@ * @file ConcentratePumps.c * * @author (last) Dara Navaei -* @date (last) 03-Nov-2022 +* @date (last) 21-Dec-2022 * * @author (original) Quang Nguyen * @date (original) 22-Oct-2020 Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r335d28f954aed9522d5cc71863cd8dc253070758 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 335d28f954aed9522d5cc71863cd8dc253070758) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ConcentratePumps.h * -* @author (last) Dara Navaei -* @date (last) 18-Aug-2022 +* @author (last) Sean Nash +* @date (last) 20-Dec-2022 * * @author (original) Quang Nguyen * @date (original) 22-Oct-2020 Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r5e3a46112ebab361a33b9f7cadb619eb12b44c0f -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 5e3a46112ebab361a33b9f7cadb619eb12b44c0f) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,7 +8,7 @@ * @file ConductivitySensors.c * * @author (last) Dara Navaei -* @date (last) 03-Nov-2022 +* @date (last) 21-Dec-2022 * * @author (original) Quang Nguyen * @date (original) 13-Jul-2020 Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,7 +8,7 @@ * @file Pressures.c * * @author (last) Dara Navaei -* @date (last) 22-Nov-2022 +* @date (last) 21-Dec-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ROPump.c * -* @author (last) Michael Garthwaite -* @date (last) 21-Nov-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r5e3a46112ebab361a33b9f7cadb619eb12b44c0f -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 5e3a46112ebab361a33b9f7cadb619eb12b44c0f) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,7 +8,7 @@ * @file TemperatureSensors.c * * @author (last) Dara Navaei -* @date (last) 03-Nov-2022 +* @date (last) 21-Dec-2022 * * @author (original) Dara Navaei * @date (original) 08-Apr-2020 Index: firmware/App/Controllers/TemperatureSensors.h =================================================================== diff -u -r5e3a46112ebab361a33b9f7cadb619eb12b44c0f -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 5e3a46112ebab361a33b9f7cadb619eb12b44c0f) +++ firmware/App/Controllers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file TemperatureSensors.h * -* @author (last) Dong Nguyen -* @date (last) 27-Sep-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Dara Navaei * @date (original) 08-Apr-2020 Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -reea0132d751dfd21ef8ae0212ebed184fb2528ff -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision eea0132d751dfd21ef8ae0212ebed184fb2528ff) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,7 +8,7 @@ * @file Valves.c * * @author (last) Dara Navaei -* @date (last) 03-Nov-2022 +* @date (last) 17-Nov-2022 * * @author (original) Sean * @date (original) 06-May-2020 Index: firmware/App/Modes/ModeChemicalDisinfect.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,7 +7,7 @@ * * @file ModeChemicalDisinfect.c * -* @author (last) Steve Jarpe +* @author (last) Dara Navaei * @date (last) 21-Dec-2022 * * @author (original) Sean Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeChemicalDisinfectFlush.c (.../ModeChemicalDisinfectFlush.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeChemicalDisinfectFlush.c (.../ModeChemicalDisinfectFlush.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,7 +7,7 @@ * * @file ModeChemicalDisinfectFlush.c * -* @author (last) Sean Nash +* @author (last) Dara Navaei * @date (last) 21-Dec-2022 * * @author (original) Dara Navaei Index: firmware/App/Modes/ModeDrain.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,7 +8,7 @@ * @file ModeDrain.c * * @author (last) Dara Navaei -* @date (last) 01-Dec-2022 +* @date (last) 21-Dec-2022 * * @author (original) Leonardo Baloa * @date (original) 20-Dec-2019 Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -rd48e02f028dbd430bedda41be0173fbfc45116d7 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision d48e02f028dbd430bedda41be0173fbfc45116d7) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ModeFault.c * -* @author (last) Dara Navaei -* @date (last) 12-Oct-2022 +* @author (last) Sean Nash +* @date (last) 19-Dec-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Modes/ModeFault.h =================================================================== diff -u -r335d28f954aed9522d5cc71863cd8dc253070758 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 335d28f954aed9522d5cc71863cd8dc253070758) +++ firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ModeFault.h * -* @author (last) Dara Navaei -* @date (last) 24-Oct-2021 +* @author (last) Sean Nash +* @date (last) 20-Dec-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ModeFill.c * -* @author (last) Michael Garthwaite -* @date (last) 21-Nov-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Leonardo Baloa * @date (original) 19-Nov-2019 Index: firmware/App/Modes/ModeFlush.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ModeFlush.c * -* @author (last) Steve Jarpe -* @date (last) 06-Dec-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Leonardo Baloa * @date (original) 20-Dec-2019 Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,8 +8,8 @@ * * @file ModeGenIdle.c * -* @author (last) Michael Garthwaite -* @date (last) 21-Nov-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Quang Nguyen * @date (original) 06-Aug-2021 Index: firmware/App/Modes/ModeHeatDisinfect.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ModeHeatDisinfect.c * -* @author (last) Bill Bracken -* @date (last) 06-Dec-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Sean * @date (original) 20-Apr-2020 Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c =================================================================== diff -u -rce659127f12060b21cb725240ff9ed919ab5f94d -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision ce659127f12060b21cb725240ff9ed919ab5f94d) +++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -1,3 +1,19 @@ +/************************************************************************** +* +* Copyright (c) 2022-2022 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 ModeHeatDisinfectActiveCool.c +* +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 +* +* @author (original) Dara Navaei +* @date (original) 18-Dec-2022 +* +***************************************************************************/ #include "ConcentratePumps.h" #include "CPLD.h" Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.h =================================================================== diff -u -r73c6b6fb7bbb934277157ce1e218358c573a6af1 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeHeatDisinfectActiveCool.h (.../ModeHeatDisinfectActiveCool.h) (revision 73c6b6fb7bbb934277157ce1e218358c573a6af1) +++ firmware/App/Modes/ModeHeatDisinfectActiveCool.h (.../ModeHeatDisinfectActiveCool.h) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -1,3 +1,19 @@ +/************************************************************************** +* +* Copyright (c) 2022-2022 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 ModeHeatDisinfectActiveCool.h +* +* @author (last) Dara Navaei +* @date (last) 18-Dec-2022 +* +* @author (original) Dara Navaei +* @date (original) 18-Dec-2022 +* +***************************************************************************/ #ifndef APP_MODES_MODEHEATDISINFECTACTIVECOOL_H_ Index: firmware/App/Modes/ModeService.c =================================================================== diff -u -r335d28f954aed9522d5cc71863cd8dc253070758 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) +++ firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ModeService.c * -* @author (last) Dara Navaei -* @date (last) 21-Sep-2022 +* @author (last) Sean Nash +* @date (last) 20-Dec-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Modes/ModeStandby.h =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file ModeStandby.h * -* @author (last) Steve Jarpe -* @date (last) 30-Nov-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file OperationModes.c * -* @author (last) Steve Jarpe -* @date (last) 20-Dec-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision eceb190a5d66fdbee779478ac8bb50a846ed9241) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file AlarmMgmt.c * -* @author (last) Darren Cox -* @date (last) 28-Nov-2022 +* @author (last) Dara Navaei +* @date (last) 21-Dec-2022 * * @author (original) Sean * @date (original) 04-Feb-2020 Index: firmware/App/Services/FPGA.c =================================================================== diff -u -rb36964ca0398c4a4eefd07f334f09b043a5e2b8b -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision b36964ca0398c4a4eefd07f334f09b043a5e2b8b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,8 +8,8 @@ * * @file FPGA.c * -* @author (last) Dara Navaei -* @date (last) 10-Nov-2022 +* @author (last) Sean Nash +* @date (last) 20-Dec-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Services/FPGA.h =================================================================== diff -u -reae0635792a827b7cf9197cf6f6e253f2a094260 -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision eae0635792a827b7cf9197cf6f6e253f2a094260) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -7,8 +7,8 @@ * * @file FPGA.h * -* @author (last) Dara Navaei -* @date (last) 09-Nov-2022 +* @author (last) Sean Nash +* @date (last) 16-Dec-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r5e3a46112ebab361a33b9f7cadb619eb12b44c0f -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 5e3a46112ebab361a33b9f7cadb619eb12b44c0f) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,7 +8,7 @@ * @file Reservoirs.c * * @author (last) Dara Navaei -* @date (last) 03-Nov-2022 +* @date (last) 21-Dec-2022 * * @author (original) Sean * @date (original) 18-Mar-2020 Index: firmware/checkAlarms.sh =================================================================== diff -u -reea0132d751dfd21ef8ae0212ebed184fb2528ff -r81769c6bea6ed32d70698fb03ad5823de1814b27 --- firmware/checkAlarms.sh (.../checkAlarms.sh) (revision eea0132d751dfd21ef8ae0212ebed184fb2528ff) +++ firmware/checkAlarms.sh (.../checkAlarms.sh) (revision 81769c6bea6ed32d70698fb03ad5823de1814b27) @@ -8,8 +8,8 @@ # # @file checkAlarms.sh # -# @author (last) Quang Nguyen -# @date (last) 29-Jul-2021 +# @author (last) Dara Navaei +# @date (last) 17-Nov-2022 # @author (original) Quang Nguyen # @date (original) 29-May-2021 # @@ -74,7 +74,7 @@ { if ( alarm != ALARM_MANUAL_TABLE[ alarm ].alarmID ) { - // The current alarm number is the starting line number of the ALARM_MANUAL_TABLE + 2 since the alarms enum start from 0 + // The current alarm number is the starting line number of the ALARM_MANUAL_TABLE + 2 since the alarms enum start from 0 alarmManualLineNumber += alarm + 2; printf(\"\\\"AlarmDefs.h\\\", line %d: error #9999: Alarm %i NOT MATCH Alarm Table ID %i!\n\", alarmManualLineNumber, alarm, ALARM_TABLE[ alarm ].alarmID); exit(1);