Index: DGDefs.h =================================================================== diff -u -rac49504abf12c107704cf84ce4227f5c696f7785 -rd2c6bf995359c8ebcde7e6af5e8c93ca988f076d --- DGDefs.h (.../DGDefs.h) (revision ac49504abf12c107704cf84ce4227f5c696f7785) +++ DGDefs.h (.../DGDefs.h) (revision d2c6bf995359c8ebcde7e6af5e8c93ca988f076d) @@ -7,8 +7,8 @@ * * @file DGDefs.h * -* @author (last) Bill Bracken -* @date (last) 17-Jan-2023 +* @author (last) Dara Navaei +* @date (last) 14-Feb-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -340,7 +340,6 @@ F32 R1FillLevel; ///< Reservoir 1 level upon starting the heat disinfect. F32 R2FillLevel; ///< Reservoir 2 level upon starting the heat disinfect. U32 heatDisinfectUIState; ///< Heat disinfect UI state. - U32 nelsonSupportMode; ///< Nelson support mode. } MODE_HEAT_DISINFECT_DATA_T; #endif @@ -417,7 +416,6 @@ F32 R1FillLevel; ///< Reservoir 1 level upon starting the chemical disinfect. F32 R2FillLevel; ///< Reservoir 2 level upon starting the chemical disinfect. U32 chemDisinfectUIState; ///< Chemical disinfect UI state. - U32 nelsonSupportMode; ///< Nelson support mode. } MODE_CHEMICAL_DISINFECT_DATA_T; #endif @@ -636,21 +634,20 @@ NUM_OF_HEATERS_STATE, ///< Number of heaters state. } HEATERS_STATE_T; +/**@}*/ + #ifndef _RELEASE_ -/// Nelson lab disinfect efficacy support +//Nelson lab disinfect efficacy support typedef enum Nelson_States { - NELSON_NONE = 0, ///< Nelson none. - NELSON_INOCULATE, ///< Nelson inoculate. - NELSON_HEAT_DISINFECT, ///< Nelson heat disinfect. - NELSON_POS_CONTROL_CHEM_DISINFECT, ///< Nelson positive control chemical disinfect. - NELSON_POS_CONTROL_HEAT_DISINFECT, ///< Nelson positive control heat disinfect. - NELSON_CHEM_DISINFECT, ///< Nelson chemical disinfect. - NELSON_DRAIN_SAMPLES, ///< Nelson drain sample. - NUM_OF_NELSON_SUPPORT ///< Number of Nelson supports. + NELSON_NONE = 0, // Nelson none. + NELSON_INOCULATE, // Nelson inoculate. + NELSON_HEAT_DISINFECT, // Nelson heat disinfect. + NELSON_POS_CONTROL_HEAT_DISINFECT, // Nelson positive control heat disinfect. + NELSON_CHEM_DISINFECT, // Nelson chemical disinfect. + NELSON_DRAIN_SAMPLES, // Nelson drain sample. + NUM_OF_NELSON_SUPPORT // Number of Nelson supports. } NELSON_SUPPORT_T; #endif -/**@}*/ - #endif