Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r2e6fa30976d3fd57cf43c7e4667d165c973c17b2 -reb40fb713ed387f87aa4d9ed9b9f42f91881064e --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 2e6fa30976d3fd57cf43c7e4667d165c973c17b2) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision eb40fb713ed387f87aa4d9ed9b9f42f91881064e) @@ -58,7 +58,7 @@ #define CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION ( 0.50F / ( US_PER_SECOND * SEC_PER_MIN ) ) ///< Convert step period resolution (0.50 us) to minute. /// Volume output per pulse. -#define CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER ) +#define CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER ( CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER / CONCENTRATE_PUMP_PULSE_PER_REV ) #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL ( 1000 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is monitored. #define CONCENTRATE_PUMP_CONTROL_INTERVAL ( 100 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is controlled. Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -r1b110e3b2462fda74aa8f2811aad9ce61cb80309 -reb40fb713ed387f87aa4d9ed9b9f42f91881064e --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 1b110e3b2462fda74aa8f2811aad9ce61cb80309) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision eb40fb713ed387f87aa4d9ed9b9f42f91881064e) @@ -78,7 +78,7 @@ #define DEGAS_PUMP_INTERCEPT_FACTOR 0.1153F ///< Dialysate pump target pressure addition factor ( b factor in 'y = mx + b' equation) #define MAX_ALLOWED_RPM_OUT_OF_RANGE 300 ///< Maximum allowed RPM out of range from target RPM in open loop. -#define PUMP_TRANS_TO_RAMP_SPEED_THRESHOLD 20.0F ///< Speed change that alters the state to ramp during control state. +#define PUMP_TRANS_TO_RAMP_SPEED_THRESHOLD 100.0F ///< Speed change that alters the state to ramp during control state. #define RPM_OUT_OF_RANGE_TIME_OUT ( 10 * MS_PER_SECOND ) ///< Open loop RPM out of range time out in ms. #define SAFETY_SHUTDOWN_TIMEOUT ( 1 * MS_PER_SECOND ) ///< Dialysate pump safety shutdown activation timeout. Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r7b86d1b35cf958e077b7d173005d5cfe1acffac8 -reb40fb713ed387f87aa4d9ed9b9f42f91881064e --- firmware/App/Monitors/Level.c (.../Level.c) (revision 7b86d1b35cf958e077b7d173005d5cfe1acffac8) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision eb40fb713ed387f87aa4d9ed9b9f42f91881064e) @@ -264,15 +264,15 @@ if ( FPGA_LEVEL_LOW == levelStatus ) { - currentLevelStatus = LEVEL_STATE_HIGH ; + currentLevelStatus = LEVEL_STATE_LOW ; } else if ( FPGA_LEVEL_MEDIUM == levelStatus ) { currentLevelStatus = LEVEL_STATE_MEDIUM ; } else if ( FPGA_LEVEL_HIGH == levelStatus ) { - currentLevelStatus = LEVEL_STATE_LOW ; + currentLevelStatus = LEVEL_STATE_HIGH ; } else { Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r275ee4fdc1ace09febcf9788c80171f7a6372c99 -reb40fb713ed387f87aa4d9ed9b9f42f91881064e --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 275ee4fdc1ace09febcf9788c80171f7a6372c99) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision eb40fb713ed387f87aa4d9ed9b9f42f91881064e) @@ -91,7 +91,7 @@ #define FPGA_D12_PUMP_ERROR_BIT 0x01 ///< Fresh dialysate pump error bit mask. #define FPGA_D48_PUMP_ERROR_BIT 0x02 ///< Spent dialysate pump error bit mask. -#define FPGA_D6_FLOATER_LEVEL_BIT 0x03 ///< Floater level bit mask. +#define FPGA_D6_FLOATER_LEVEL_BIT 0x07 ///< Floater level bit mask. #define FPGA_D5_HEATER_CNTRL_BIT 0x01 ///< FPGA GIO D5 heater control bit mask #define FPGA_D5_HEATER_PWM_ENABLE_BIT 0x02 ///< FPGA D5 PWM based heater control bit mask