Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -rd0f8958c30ff294da7e5088b89226f0ac30f3a36 -rc29d60cd59d549a617ed077248f5d19dfec74e76 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision d0f8958c30ff294da7e5088b89226f0ac30f3a36) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision c29d60cd59d549a617ed077248f5d19dfec74e76) @@ -1097,6 +1097,7 @@ if ( ++dialInFlowDataPublicationTimerCounter >= getU32OverrideValue( &dialInFlowDataPublishInterval ) ) { DIALIN_PUMP_STATUS_PAYLOAD_T payload; + HD_OP_MODE_T opMode = getCurrentOperationMode(); payload.setPoint = targetDialInFlowRate; payload.measFlow = getMeasuredDialInFlowRate(); @@ -1106,6 +1107,14 @@ payload.measMCCurr = getMeasuredDialInPumpMCCurrent(); payload.pwmDC = dialInPumpPWMDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR; payload.rotorCount = getDialInPumpRotorCount(); + if ( ( MODE_PRET == opMode ) || ( MODE_TREA == opMode ) || ( MODE_POST == opMode ) ) + { // prescribed flow only available in treatment modes + payload.presFlow = getTreatmentParameterS32( TREATMENT_PARAM_DIALYSATE_FLOW ); + } + else + { + payload.presFlow = 0.0F; + } broadcastData( MSG_ID_DIALYSATE_FLOW_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( DIALIN_PUMP_STATUS_PAYLOAD_T ) ); dialInFlowDataPublicationTimerCounter = 0; } Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r6cbbccc4ba658765d63a4028d16d2423d506a305 -rc29d60cd59d549a617ed077248f5d19dfec74e76 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 6cbbccc4ba658765d63a4028d16d2423d506a305) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision c29d60cd59d549a617ed077248f5d19dfec74e76) @@ -74,6 +74,7 @@ #define PSI_TO_MMHG ( 51.7149F ) ///< Conversion factor for converting PSI to mmHg. +// The new arterial pressure sensor is the same as the venous pressure sensor #define VENOUS_PRESSURE_NORMAL_OP 0 ///< Venous pressure status bits indicate normal operation. #define VENOUS_PRESSURE_CMD_MODE 1 ///< Venous pressure status bits indicate sensor in command mode. #define VENOUS_PRESSURE_STALE_DATA 2 ///< Venous pressure status bits indicate data is stale (no new data since last fpga read). @@ -637,7 +638,6 @@ } } } - // Check for occlusion in Treatment modes where pumps are moving else if ( MODE_TREA == getCurrentOperationMode() ) { Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -r3b4158ff08e5116996f07bb2a670630119e440fc -rc29d60cd59d549a617ed077248f5d19dfec74e76 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 3b4158ff08e5116996f07bb2a670630119e440fc) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision c29d60cd59d549a617ed077248f5d19dfec74e76) @@ -156,8 +156,10 @@ #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD 0.05F ///< Minimum syringe pump speed to be considered not stalled. #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS ( 2 * MS_PER_SECOND ) ///< Syringe pump ADC FPGA error timeout in milliseconds. + #define SYRINGE_PUMP_DAC_MAX_RETRIES 5 ///< Syringe pump DAC retries to write. #define SYRINGE_PUMP_DAC_TIMER ( 200 / TASK_PRIORITY_INTERVAL ) ///< Syringe pump DAC timer between retries. + /// Defined states for the syringe pump control state machine. typedef enum SyringePump_States { Index: firmware/App/Modes/SelfTests.c =================================================================== diff -u -r3b4158ff08e5116996f07bb2a670630119e440fc -rc29d60cd59d549a617ed077248f5d19dfec74e76 --- firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 3b4158ff08e5116996f07bb2a670630119e440fc) +++ firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision c29d60cd59d549a617ed077248f5d19dfec74e76) @@ -363,7 +363,7 @@ } else { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState ); +// SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState ); } } }