Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -rd9b5f588d81e15ed3849222bed3362e15dbf4b0a -r65a7fc82d6eb8fca3cd74d7071137bca3615deb8 --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision d9b5f588d81e15ed3849222bed3362e15dbf4b0a) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision 65a7fc82d6eb8fca3cd74d7071137bca3615deb8) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2025 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 Valves.h * -* @author (last) Sean -* @date (last) 08-Oct-2024 +* @author (last) Dara Navaei +* @date (last) 19-Dec-2025 * -* @author (original) Sean -* @date (original) 08-Oct-2024 +* @author (original) Sean Nash +* @date (original) 24-Oct-2024 * ***************************************************************************/ @@ -37,9 +37,10 @@ typedef enum valveStatesNames { VALVE_POSITION_NOT_IN_POSITION = 0, ///< Valve position is unknown (cannot be used as a command) - VALVE_POSITION_A_INSERT_EJECT, ///< Position A, Insert/Eject (current position or commanded) - VALVE_POSITION_B_OPEN, ///< Position B, Open (current position or commanded) - VALVE_POSITION_C_CLOSE, ///< Position C, Close (current position or commanded) + VALVE_POSITION_A_INSERT_EJECT, ///< Position A, Insert/Eject + VALVE_POSITION_B_OPEN, ///< Position B, Open + VALVE_POSITION_C_CLOSE, ///< Position C, Close + VALVE_POSITION_D_PARTIAL_CLOSE, ///< Position D, partial close NUM_OF_VALVE_POSITIONS, ///< Number of valve positions } VALVE_POSITION_T; @@ -52,6 +53,11 @@ U32 currentPosID; ///< Current position (enum) S16 currentPos; ///< Current position in encoder counts S16 cmdPos; ///< Commanded position (enum) + S16 posA; ///< Position A (count) + S16 posB; ///< Position B (count) + S16 posC; ///< Position C (count) + S16 posD; ///< Position D (count) + S16 maxHomingPos; ///< Maximum homing position } TD_VALVE_DATA_T; #pragma pack(pop)