Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r5dc6f629ae40d8939fd3bd7c4e3dffb04fa137e7 -rf46193ce4cce48dee728dd93235e0452e8fe1963 --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 5dc6f629ae40d8939fd3bd7c4e3dffb04fa137e7) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision f46193ce4cce48dee728dd93235e0452e8fe1963) @@ -423,8 +423,13 @@ { HD_OP_MODE_T opMode = getCurrentOperationMode(); U16 bpRPM = getIntADCReading( INT_ADC_BLOOD_PUMP_SPEED ); - U16 bpmA = getIntADCReading( INT_ADC_BLOOD_PUMP_MOTOR_CURRENT ); + U16 bpmA = getIntADCReading( INT_ADC_BLOOD_PUMP_MOTOR_CURRENT ); + +#ifndef V1_5_SYSTEM + F32 bpFlow = ( getFPGABloodFlow() * bloodFlowCalGain ) + bloodFlowCalOffset; +#else F32 bpFlow = ( ( getFPGABloodFlow() * -1.0 ) * bloodFlowCalGain ) + bloodFlowCalOffset; // Blood flow sensor installed backwards on HD +#endif adcBloodPumpMCSpeedRPM.data = (F32)(SIGN_FROM_12_BIT_VALUE(bpRPM)) * BP_SPEED_ADC_TO_RPM_FACTOR; adcBloodPumpMCCurrentmA.data = (F32)(SIGN_FROM_12_BIT_VALUE(bpmA)) * BP_CURRENT_ADC_TO_MA_FACTOR; Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27 -rf46193ce4cce48dee728dd93235e0452e8fe1963 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision f46193ce4cce48dee728dd93235e0452e8fe1963) @@ -875,7 +875,7 @@ *************************************************************************/ void getDGCommandResponse( DG_CMD_RESPONSE_T *cmdRespPtr ) { - memcpy( &cmdRespPtr, &dgCmdResp, sizeof( DG_CMD_RESPONSE_T ) ); + memcpy( cmdRespPtr, &dgCmdResp, sizeof( DG_CMD_RESPONSE_T ) ); } Index: firmware/App/HDCommon.h =================================================================== diff -u -r778f343622819491cf644dab36f3194709ce1e95 -rf46193ce4cce48dee728dd93235e0452e8fe1963 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 778f343622819491cf644dab36f3194709ce1e95) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision f46193ce4cce48dee728dd93235e0452e8fe1963) @@ -57,7 +57,7 @@ // #define READ_FPGA_ASYNC_DATA 1 // Test build reads non-priority register page every other time // #define EMC_TEST_BUILD 1 // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button #define ALARMS_DEBUG 1 // Triggered alarms sent to debug UART - #define V1_5_SYSTEM 1 // Build for v1.5 system +// #define V1_5_SYSTEM 1 // Build for v1.5 system #include #include Index: firmware/App/Modes/Prime.c =================================================================== diff -u -r1662b3ac21c7d19e218efbe44a25285778e8ea2b -rf46193ce4cce48dee728dd93235e0452e8fe1963 --- firmware/App/Modes/Prime.c (.../Prime.c) (revision 1662b3ac21c7d19e218efbe44a25285778e8ea2b) +++ firmware/App/Modes/Prime.c (.../Prime.c) (revision f46193ce4cce48dee728dd93235e0452e8fe1963) @@ -612,6 +612,7 @@ if ( TRUE == reservoirFilledStatus[ DG_RESERVOIR_2 ] ) { + cmdSetDGActiveReservoir( DG_RESERVOIR_2 ); signalDialOutPumpHardStop(); setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );