Fisheye: Tag 851ee579efc2add1f16a5012bdaac93658e760ea refers to a dead (removed) revision in file `firmware/App/Controllers/DialysateFlow.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 851ee579efc2add1f16a5012bdaac93658e760ea refers to a dead (removed) revision in file `firmware/App/Controllers/DialysateFlow.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Controllers/FlowSensors.c =================================================================== diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r851ee579efc2add1f16a5012bdaac93658e760ea --- firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 8074ecece0b11532c173ad951a98036f0c54ca52) +++ firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) @@ -81,9 +81,10 @@ { SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; BOOL calStatus = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD ); - result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED ); + NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD ); + result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED ); + return result; } @@ -106,7 +107,7 @@ if ( TRUE == isNewCalibrationRecordAvailable() ) { getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD ); + NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD ); } for ( i = 0; i < NUM_OF_FLOW_SENSORS; i++ ) @@ -146,7 +147,7 @@ } // TODO dialysate flow alarm. Is it needed? - //currentFlow = getMeasuredDialysateFlowRate(); + //currentFlow = getMeasuredFlowRateLPM( DIALYSATE_FLOW_SENSOR ); //isFlowOutOfUpperRange = ( currentFlow > MAX_DIALYSATE_FLOWRATE_LPM ? TRUE : FALSE ); //checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_RATE_OUT_OF_RANGE, isFlowOutOfUpperRange, currentFlow, MAX_DIALYSATE_FLOWRATE_LPM ); @@ -205,7 +206,6 @@ dataPublicationCounter = 0; broadcastData( MSG_ID_DG_FLOW_SENSORS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( FLOW_SENSORS_DATA_T ) ); - } } Index: firmware/App/Controllers/FlowSensors.h =================================================================== diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r851ee579efc2add1f16a5012bdaac93658e760ea --- firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 8074ecece0b11532c173ad951a98036f0c54ca52) +++ firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) @@ -26,14 +26,6 @@ NUM_OF_FLOW_SENSORS, ///< Number of flow sensors. } FLOW_SENSORS_T; -/// Flow meters data struct. -typedef struct -{ - F32 ROFlowRateLPM; ///< RO flow rate in L/min. - F32 ROFlowRateWithCPsLPM; ///< RO flow rate with concentrate pumps in L/min. - F32 dialysateFlowRateLPM; ///< Dialysate flow rate L/min. -} FLOW_SENSORS_DATA_T; - // ********** public function prototypes ********** void initFlowSensors( void ); Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r851ee579efc2add1f16a5012bdaac93658e760ea --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 8074ecece0b11532c173ad951a98036f0c54ca52) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) @@ -128,7 +128,6 @@ RO_PUMP_DATA_PUB_INTERVAL, 0, 0 }; ///< Interval (in ms) at which to publish RO flow data to CAN bus. static U32 roControlTimerCounter; ///< Determines when to perform control on RO pump. static F32 roPumpOpenLoopTargetDutyCycle; ///< Target RO pump open loop PWM. -static DG_RO_PUMP_CAL_RECORD_T roPumpCalRecord; ///< RO pump calibration record. static F32 roVolumeL; ///< RO water generated in liters. // ********** private function prototypes ********** @@ -459,21 +458,8 @@ SELF_TEST_STATUS_T execROPumpSelfTest( void ) { SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; - BOOL calStatus = FALSE; - calStatus = getNVRecord2Driver( GET_CAL_RO_PUMP_RECORD, (U08*)&roPumpCalRecord, sizeof( DG_RO_PUMP_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_NO_ALARM ); - - if ( TRUE == calStatus ) - { - result = SELF_TEST_STATUS_PASSED; - } - else - { - result = SELF_TEST_STATUS_FAILED; - } - - return result; + // TODO is there anything else needed in POST for the RO pump? } /*********************************************************************//** Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r8fc97ad09c8cbdf76dc19929c4751df3feacb40d -r851ee579efc2add1f16a5012bdaac93658e760ea --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 8fc97ad09c8cbdf76dc19929c4751df3feacb40d) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) @@ -19,9 +19,9 @@ #include "ConcentratePumps.h" #include "ConductivitySensors.h" #include "CPLD.h" -#include "DialysateFlow.h" #include "DrainPump.h" #include "Fans.h" +#include "FlowSensors.h" #include "FPGA.h" #include "Integrity.h" #include "LoadCell.h" @@ -30,7 +30,6 @@ #include "OperationModes.h" #include "Pressures.h" #include "Reservoirs.h" -#include "ROPump.h" #include "RTC.h" #include "SafetyShutdown.h" #include "SystemCommMessages.h" @@ -177,11 +176,6 @@ postState = handlePOSTStatus( testStatus ); break; - case DG_POST_STATE_RO_PUMP: - testStatus = execROPumpSelfTest(); - postState = handlePOSTStatus( testStatus ); - break; - case DG_POST_STATE_DRAIN_PUMP: testStatus = execDrainPumpSelfTest(); postState = handlePOSTStatus( testStatus ); @@ -228,8 +222,8 @@ postState = handlePOSTStatus( testStatus ); break; - case DG_POST_STATE_DIALYSATE_FLOW_SENSOR: - testStatus = execDialysateFlowMeterSelfTest(); + case DG_POST_STATE_FLOW_SENSORS: + testStatus = execFlowSensorsSelfTest(); postState = handlePOSTStatus( testStatus ); break; Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -ra4669c80291e85fa5ce17d77ebcfd0c882831202 -r851ee579efc2add1f16a5012bdaac93658e760ea --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision a4669c80291e85fa5ce17d77ebcfd0c882831202) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) @@ -28,7 +28,6 @@ #include "LoadCell.h" #include "Pressures.h" #include "ROPump.h" -#include "DialysateFlow.h" #include "TaskPriority.h" #include "TemperatureSensors.h" #include "Valves.h" @@ -71,9 +70,6 @@ // Monitor load cells execLoadCell(); - - // Monitor dialysate flow meter - execDialysateFlowMeterMonitor(); // Temperature sensors read execTemperatureSensors(); @@ -99,6 +95,7 @@ // Monitor fluid leak detector execFluidLeak(); + // Monitor flow sensors execFlowSesnorsMonitor(); // Second pass for FPGA Index: firmware/source/sys_main.c =================================================================== diff -u -r8fc97ad09c8cbdf76dc19929c4751df3feacb40d -r851ee579efc2add1f16a5012bdaac93658e760ea --- firmware/source/sys_main.c (.../sys_main.c) (revision 8fc97ad09c8cbdf76dc19929c4751df3feacb40d) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) @@ -68,10 +68,10 @@ #include "ConductivitySensors.h" #include "ConcentratePumps.h" #include "CPLD.h" -#include "DialysateFlow.h" #include "DrainPump.h" #include "Fans.h" #include "FluidLeak.h" +#include "FlowSensors.h" #include "FPGA.h" #include "Heaters.h" #include "Integrity.h" @@ -180,7 +180,7 @@ initInterrupts(); initFPGA(); initInternalADC(); - initDialysateFlowMeter(); + initFlowSensors(); initPressures(); initLoadCell(); initNVDataMgmt();