Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -rf4076df3a44bf9751a7fa5a2d8642b450d30a536 -ra6e25a99f4e9d99b83d9a7a4ed3837ed98d188a9 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision f4076df3a44bf9751a7fa5a2d8642b450d30a536) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision a6e25a99f4e9d99b83d9a7a4ed3837ed98d188a9) @@ -750,7 +750,7 @@ if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) { - result = (U32)getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] ); + result = getU32OverrideValue( &pumpTargetRevCnt[ pumpId ] ); } else { @@ -776,7 +776,7 @@ if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) { - result = (U32)getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] ); + result = getU32OverrideValue( &pumpMesauredRevCnt[ pumpId ] ); } else { @@ -1265,10 +1265,10 @@ data.d10_PumpCurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpSetSpeed * -1.0F : d10_PumpSetSpeed ); data.d10_PumpMeasuredSpeed = getMeasuredPumpSpeedMLPM( D10_PUMP ); data.d10_PumpTargetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == d10_PumpDirection ? d10_PumpTgtSpeed * -1.0F : d10_PumpTgtSpeed ); - data.d11_PumpTargetRevCount = (U32)getConcPumpTargetRevolutionCount( D11_PUMP ); - data.d11_PumpMeasuredRevCount= (U32)getConcPumpCurrentMeasuredRevolutionCount( D11_PUMP ); - data.d10_PumpTargetRevCount = (U32)getConcPumpTargetRevolutionCount( D10_PUMP ); - data.d10_PumpMeasuredRevCount= (U32)getConcPumpCurrentMeasuredRevolutionCount( D10_PUMP ); + data.d11_PumpTargetRevCount = getConcPumpTargetRevolutionCount( D11_PUMP ); + data.d11_PumpMeasuredRevCount= getConcPumpCurrentMeasuredRevolutionCount( D11_PUMP ); + data.d10_PumpTargetRevCount = getConcPumpTargetRevolutionCount( D10_PUMP ); + data.d10_PumpMeasuredRevCount= getConcPumpCurrentMeasuredRevolutionCount( D10_PUMP ); data.d11_PumpState = concentratePumps[ D11_PUMP ].execState; data.d10_PumpState = concentratePumps[ D10_PUMP ].execState; data.d11_PumpPulseUS = concentratePumps[ D11_PUMP ].pulseWidthUS; Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rf4076df3a44bf9751a7fa5a2d8642b450d30a536 -ra6e25a99f4e9d99b83d9a7a4ed3837ed98d188a9 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f4076df3a44bf9751a7fa5a2d8642b450d30a536) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision a6e25a99f4e9d99b83d9a7a4ed3837ed98d188a9) @@ -212,8 +212,7 @@ U08 fpgaValveSpPWMStates; ///< Reg 599. Spare Valves PWM states U08 fpgaD11_D10_PumpFault; ///< Reg 600. Concentrate pump fault register for D11_Pump and D10_Pump U08 fpgaRTDCountErrorCycles; ///< Reg 601. Count of each incomplete seq of reads from RTD ADC. - U16 fpga_UnUsed_4; ///< Reg 602. Not Used - U16 fpga_UnUsed_5; ///< Reg 604. Not Used + U32 fpgaD10PumpStepCountStatus; ///< Reg 602. Bicarb concentrate pump revolution down count status U32 fpgaD78Temp; ///< Reg 606. Outlet heat exchanger temperature U32 fpgaD1Temp; ///< Reg 610. Inlet heat exchanger temperature U32 fpgaD4Temp; ///< Reg 614. Hydraulics primary heater temperature @@ -230,15 +229,13 @@ U08 fpgaD6FloaterStatus; ///< Reg 636. Floater 1 level sensor status U08 fpgaFloater2Status; ///< Reg 637. Floater 2 level sensor status U32 fpgaD11PumpStepCountStatus; ///< Reg 638. Acid concentrate pump revolution down count status - U32 fpgaD10PumpStepCountStatus; ///< Reg 640. Bicarb concentrate pump revolution down count status U16 fpgaAdcTemp; ///< Reg 642. TBD U16 fpgaAdcVccInt; ///< Reg 644. TBD U16 fpgaAdcVccAux; ///< Reg 646. TBD U16 fpgaAdcVpVn; ///< Reg 648. TBD U16 fpgaD12PumpSpeedFeedback; ///< Reg 650. D12 Pump speed feedback U16 fpgaD48PumpSpeedFeedback; ///< Reg 652. D48 Pump Speed feedback - U16 fpga_UnUsed_6; ///< Reg 654. Not used - U32 fpgaD76PumpStepCountStatus; ///< Reg 656. UF pump revolution down count status + U32 fpgaD76PumpStepCountStatus; ///< Reg 654. UF pump revolution down count status U08 fpgaD76PumpFault; ///< Reg 658: UF pump fault U08 fpga_UnUsed_3; ///< Reg 659: Not used @@ -320,8 +317,7 @@ U16 fpgaD18PresTemp; ///< Reg 534. D18 MPM pressure sensor RAW temperature data U16 fpgaD41PresPressure; ///< Reg 536. D41 MPM pressure sensor RAW pressure data U16 fpgaD41PresTemp; ///< Reg 538. D41 MPM pressure sensor RAW temperature data - U16 fpgaAvailableRegister1; ///< Reg 540. Available register 1 - U16 fpgaAvailableRegister2; ///< Reg 542. Available register 2 + U32 fpgaAvailableRegister1; ///< Reg 540. Available register 1 U08 fpgaHallSensInputs; ///< Reg 544. Hall sensor Inputs U08 fpgaD42TxFIFOCnt; ///< Reg 545. Blood leak sensor transmit FIFO count U16 fpgaD42RxErrorCnt; ///< Reg 546. Blood leak sensor Receive error count @@ -336,8 +332,7 @@ U08 fpgaValveSpPWMStates; ///< Reg 559. Spare Valves PWM states U08 fpgaD11_D10_PumpFault; ///< Reg 560. Concentrate pump fault register for D11_Pump and D10_Pump U08 fpgaRTDCountErrorCycles; ///< Reg 561. Count of each incomplete seq of reads from RTD ADC. - U16 fpgaAvailableRegister3; ///< Reg 562. Available register 3 - U16 fpgaAvailableRegister4; ///< Reg 564. Available register 4 + U32 fpgaD10PumpStepCountStatus; ///< Reg 562. Bicarb concentrate pump revolution down count status U32 fpgaD78Temp; ///< Reg 566. Outlet heat exchanger temperature U32 fpgaD1Temp; ///< Reg 570. Inlet heat exchanger temperature U32 fpgaD4Temp; ///< Reg 574. Hydraulics primary heater temperature @@ -354,16 +349,14 @@ U08 fpgaD48HallStatus; ///< Reg 595. Spent dialysate pump hall sensor direction status U08 fpgaD6FloaterStatus; ///< Reg 596. Floater 1 level sensor status U08 fpgaConductiveLevelStatus; ///< Reg 597. Conductive level sensor status - U16 fpgaD11PumpStepCountStatus; ///< Reg 598. Acid concentrate pump revolution down count status - U16 fpgaD10PumpStepCountStatus; ///< Reg 600. Bicarb concentrate pump revolution down count status + U32 fpgaD11PumpStepCountStatus; ///< Reg 598. Acid concentrate pump revolution down count status U16 fpgaAdcTemp; ///< Reg 602. TBD U16 fpgaAdcVccInt; ///< Reg 604. TBD U16 fpgaAdcVccAux; ///< Reg 606. TBD U16 fpgaAdcVpVn; ///< Reg 608. TBD U16 fpgaD12PumpSpeedFeedback; ///< Reg 610. D12 Pump speed feedback U16 fpgaD48PumpSpeedFeedback; ///< Reg 612. D48 Pump Speed feedback - U16 fpgaAvailableRegister5; ///< Reg 614. Available register 5 - U16 fpgaD76PumpStepCountStatus; ///< Reg 616. UF pump revolution down count status + U32 fpgaD76PumpStepCountStatus; ///< Reg 614. UF pump revolution down count status U08 fpgaD76PumpFault; ///< Reg 618: UF pump fault U08 fpgaHallSensorStatus; ///< Reg 619: HDF Hall sensor status @@ -489,10 +482,9 @@ U08 fpgaD12PumpControl; ///< Reg 36. DGP Control U08 fpgaD48PumpControl; ///< Reg 37. SDP Control U16 fpgaD48PumpSpeed; ///< Reg 38. SDP Speed/RPM Control - U16 fpgaNotUsed_1; ///< Reg 40. Not used - U08 fpgaD11PumpControl; ///< Reg 42. Acid Concentrate Pump Control - U08 fpgaD10PumpControl; ///< Reg 43. BiCarb Concentrate Pump Control - U16 fpgaNotUsed_2; ///< Reg 44. Not used + U32 fpgaD10PumpRevCount; ///< Reg 40. Bicarb Concentrate pump revolution count + U08 fpgaD11PumpControl; ///< Reg 44. Acid Concentrate Pump Control + U08 fpgaD10PumpControl; ///< Reg 45. BiCarb Concentrate Pump Control U08 fpgaD42SensorTest; ///< Reg 46. Blood leak sensor test U08 fpgaD42UARTControl; ///< Reg 47. Blood leak sensor UART control U08 fpgaD42FIFOTx; ///< Reg 48. Blood leak sensor FIFO transmit control @@ -506,13 +498,11 @@ U16 fpgaVSPPWMPeriod; ///< Reg 60. VSP PWM period U16 fpgaVSPPWMPullIn; ///< Reg 62. VSP PWM pull in U32 fpgaD11PumpRevCount; ///< Reg 64. Acid Concentrate pump revolution count - U32 fpgaD10PumpRevCount; ///< Reg 66. Bicarb Concentrate pump revolution count U08 fpgaADCControl; ///< Reg 68. FPGA internal ADC Control register for debugging U08 fpgaGPIOControl; ///< Reg 69. FPGA GPIO control interface U16 fpgaACRelayPWMLow; ///< Reg 70. Length of time in 10us resoultion that PWM output stays low. U16 fpgaACRelayPWMPeriod; ///< Reg 72. PWM period for AC relay/heater. - U16 fpgaNotUsed_3; ///< Reg 74. Not Used - U32 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count + U32 fpgaD76PumpRevCount; ///< Reg 74. UF pump revolution count U08 fpgaD76PumpControl; ///< Reg 78. UF Pump Control U08 notused; ///< Reg 79. Not used @@ -572,10 +562,9 @@ U08 fpgaD12PumpControl; ///< Reg 36. DGP Control U08 fpgaD48PumpControl; ///< Reg 37. SDP Control U16 fpgaD48PumpSpeed; ///< Reg 38. SDP Speed/RPM Control - U16 unusedRegister; ///< Reg 40. Unused register - U08 fpgaD11PumpControl; ///< Reg 42. Acid Concentrate Pump Control - U08 fpgaD10PumpControl; ///< Reg 43. BiCarb Concentrate Pump Control - U16 unusedRegister1; ///< Reg 44. Unused register1 + U32 fpgaD10PumpRevCount; ///< Reg 40. Bicarb Concentrate pump revolution count + U08 fpgaD11PumpControl; ///< Reg 44. Acid Concentrate Pump Control + U08 fpgaD10PumpControl; ///< Reg 45. BiCarb Concentrate Pump Control U08 fpgaD42SensorTest; ///< Reg 46. Blood leak sensor test U08 fpgaD42UARTControl; ///< Reg 47. Blood leak sensor UART control U08 fpgaD42FIFOTx; ///< Reg 48. Blood leak sensor FIFO transmit control @@ -589,13 +578,11 @@ U16 fpgaVSPPWMPeriod; ///< Reg 60. VSP PWM period U16 fpgaVSPPWMPullIn; ///< Reg 62. VSP PWM pull in U32 fpgaD11PumpRevCount; ///< Reg 64. Acid Concentrate pump revolution count - U32 fpgaD10PumpRevCount; ///< Reg 66. Bicarb Concentrate pump revolution count U08 fpgaADCControl; ///< Reg 68. FPGA internal ADC Control register for debugging U08 fpgaGPIOControl; ///< Reg 69. FPGA GPIO control interface U16 fpgaACRelayPWMLow; ///< Reg 70. Length of time in 10us resoultion that PWM output stays low. U16 fpgaACRelayPWMPeriod; ///< Reg 72. PWM period for AC relay/heater. - U16 unusedRegister2; ///< Reg 74. Unsed register2 - U32 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count + U32 fpgaD76PumpRevCount; ///< Reg 74. UF pump revolution count U08 fpgaD76PumpControl; ///< Reg 78. UF Pump Control U08 notused; ///< Reg 79. Not used