Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c =================================================================== diff -u -r5398b91c33e6fd39a74dbe132e50120965ef4107 -r830213bc6dcc1a684610caf78c79d55f2cb41e93 --- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c (.../ModePreGenPermeateDefeatured.c) (revision 5398b91c33e6fd39a74dbe132e50120965ef4107) +++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c (.../ModePreGenPermeateDefeatured.c) (revision 830213bc6dcc1a684610caf78c79d55f2cb41e93) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 ModePreGenPermeateDefeatured.c * -* @author (last) Michael Garthwaite -* @date (last) 28-Feb-2025 +* @author (last) “rkallala” +* @date (last) 09-Dec-2025 * * @author (original) Michael Garthwaite -* @date (original) 28-Feb-2025 +* @date (original) 08-Sep-2025 * ***************************************************************************/ @@ -151,37 +151,37 @@ { case FP_PRE_GENP_DEF_FLUSH: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_OPEN ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); preGenPermeateDefFlushTimer = getMSTimerCount(); break; case FP_PRE_GENP_DEF_INLET_WATER_CHECK: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); preGenPermeateDefWaterCheckTimer = getMSTimerCount(); break; case FP_PRE_GENP_DEF_PAUSED: setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); break; default: @@ -285,9 +285,12 @@ { BOOL result = FALSE; - result = TRUE; - pendingStartPreGenDefRequest = TRUE; - requestNewFPOperationMode( FP_MODE_DPGP ); + if ( ( FP_MODE_STAN == getCurrentFPOperationMode() ) && ( FP_STANDBY_MODE_STATE_IDLE == getCurrentFPStandbyState() ) ) + { + result = TRUE; + pendingStartPreGenDefRequest = TRUE; + requestNewFPOperationMode( FP_MODE_DPGP ); + } return result; }