Index: firmware/App/Modes/ModeGenPermeate.c =================================================================== diff -u -r9ad496e4c3a54e96402afd66955be575bdaa3f57 -rf8bdb3ff260a42f46e178d08979758789db7c307 --- firmware/App/Modes/ModeGenPermeate.c (.../ModeGenPermeate.c) (revision 9ad496e4c3a54e96402afd66955be575bdaa3f57) +++ firmware/App/Modes/ModeGenPermeate.c (.../ModeGenPermeate.c) (revision f8bdb3ff260a42f46e178d08979758789db7c307) @@ -5,7 +5,7 @@ * 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 ModeStandby.c +* @file ModeGenPermeate.c * * @author (last) Michael Garthwaite * @date (last) 28-Feb-2025 @@ -16,7 +16,6 @@ ***************************************************************************/ #include "DDInterface.h" -#include "FlowSensor.h" #include "FpgaRO.h" #include "Level.h" #include "ModeGenPermeate.h" @@ -34,6 +33,7 @@ */ // ********** private definitions ********** + #define GEN_PERMEATE_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the gen permeate mode data published. // ********** private data ********** @@ -59,7 +59,7 @@ *************************************************************************/ void initGenPermeateMode( void ) { - RO_GENP_MODE_STATE_T genPermeateState = RO_GENP_STATE_START; + RO_GENP_MODE_STATE_T genPermeateState = RO_GENP_STATE_START; genPermeateDataPublishInterval.data = GEN_PERMEATE_DATA_PUBLISH_INTERVAL; genPermeateDataPublishInterval.ovData = GEN_PERMEATE_DATA_PUBLISH_INTERVAL; genPermeateDataPublishInterval.ovInitData = 0; @@ -78,7 +78,7 @@ U32 transitionToGenPermeateMode( void ) { initGenPermeateMode(); - setCurrentSubState( RO_GENP_STATE_START ); + setCurrentSubState( genPermeateState ); return genPermeateState; } @@ -130,7 +130,7 @@ // Execute on running state switch( state ) { - case DD_GEND_STATE_START: + case RO_GENP_STATE_START: // Do nothing break; case RO_GENP_WATER_LOW_STATE: @@ -227,12 +227,8 @@ GEN_PERMEATE_MODE_DATA_T data; data.genPermeateExecState = (U32)getCurrentGenPermeateState(); - data.isWaterDelInProgress = 0; - data.p25Level = (U32)getLevelStatus(); data.setFlowRate = (U32)getDDPermeateFlowRate(); - data.p16FlowRate = (U32)getFilteredFlow( P16_FLOW ); - broadcastData( MSG_ID_DD_GEN_DIALYSATE_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( GEN_PERMEATE_MODE_DATA_T ) ); genPermeateDataPublicationTimerCounter = 0;