Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r8defcfa32034c4068b733930c2e8b0989c55daba -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 8defcfa32034c4068b733930c2e8b0989c55daba) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -546,7 +546,7 @@ F32 pulseWidthInSecond = (F32)( pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION ) / US_PER_SECOND; BOOL isPulseWidthOut = ( pulseWidthInSecond <= CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE ); - checkPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, isPulseWidthOut, pulseWidthInSecond, CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ); + //checkPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, isPulseWidthOut, pulseWidthInSecond, CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ); if ( FALSE == isPulseWidthOut ) { Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -62,7 +62,7 @@ #define EMSTAT_PICO_GOOD_STATUS 0x10 ///< Measurement good status. #define EMSTAT_PICO_TIMING_NOT_MET_STATUS 0x11 ///< Measurement takes too long status. #define EMSTAT_PICO_FIFO_EMPTY_MASK 0x8000 ///< Emstat Pico buffer empty indication bit. -#define DATA_PUBLISH_COUNTER_START_COUNT 24 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 40 ///< Data publish counter start count. #pragma pack(push,1) /// Emstat pico measurement data package structure Index: firmware/App/Controllers/DialysateFlow.c =================================================================== diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/DialysateFlow.c (.../DialysateFlow.c) (revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d) +++ firmware/App/Controllers/DialysateFlow.c (.../DialysateFlow.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -40,7 +40,7 @@ #define DIALYSATE_FLOW_ADC_TO_LPM_FACTOR 300 ///< Conversion factor from pulse period (2us units) to flow rate (L/min) for dialysate flow rate (divide this by pulse period). #define FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL ( 12 * MS_PER_SECOND ) ///< Flow out of range time out in counts. -#define DATA_PUBLISH_COUNTER_START_COUNT 18 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 20 ///< Data publish counter start count. // ********** private data ********** Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -r8defcfa32034c4068b733930c2e8b0989c55daba -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 8defcfa32034c4068b733930c2e8b0989c55daba) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -76,7 +76,7 @@ #define SAFETY_SHUTDOWN_TIMEOUT MS_PER_SECOND ///< Drain pump safety shutdown activation timeout. #define DRAIN_PUMP_OFF_RPM_ADC_COUNT 0xFFFF ///< ADC count value when pump is off. -#define DATA_PUBLISH_COUNTER_START_COUNT 33 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 60 ///< Data publish counter start count. /// Enumeration of drain pump states. typedef enum DrainPump_States Index: firmware/App/Controllers/FluidLeak.c =================================================================== diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/FluidLeak.c (.../FluidLeak.c) (revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d) +++ firmware/App/Controllers/FluidLeak.c (.../FluidLeak.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -32,7 +32,7 @@ // ********** private definitions ********** #define FLUID_LEAK_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the fluid leak data is published on the CAN bus. -#define DATA_PUBLISH_COUNTER_START_COUNT 39 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 80 ///< Data publish counter start count. // ********** private data ********** Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -68,7 +68,7 @@ #define DELTA_TEMPERATURE_TIME_COSNTANT_C 8.6 ///< Delta temperature calculated from time constant. #define MAXIMUM_ALLOWED_TARGET_TEMPERATURE_DEVIATION_C 0.25 ///< Maximum allowed temperature deviation from target temperature in C. #define PRIMARY_HEATER_DUTY_CYCLE_PER_TEMPERATURE_C 0.03 ///< Primary heaters duty cycle per temperature in C. -#define DATA_PUBLISH_COUNTER_START_COUNT 36 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 70 ///< Data publish counter start count. static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184 / SEC_PER_MIN; ///< Water specific heat in J/KgC / 60. static const F32 PRIMARY_HEATERS_MAXIMUM_POWER_WATTS = 475 + 237.5; ///< Primary heaters maximum power (main primary = 475W and small primary = 237.5W). Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -49,7 +49,7 @@ #define MIN_INLET_WATER_PRESSURE 25 ///< Minimum water input pressure. #define INLET_WATER_PRESSURE_PERSISTENCE_PERIOD ( 5 * MS_PER_SECOND ) ///< Persistence period for pressure out of range error. #define PRESSURES_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the pressures data is published on the CAN bus. -#define DATA_PUBLISH_COUNTER_START_COUNT 13 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 10 ///< Data publish counter start count. /// Defined states for the pressures monitor state machine. typedef enum PresOccl_States Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r8defcfa32034c4068b733930c2e8b0989c55daba -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 8defcfa32034c4068b733930c2e8b0989c55daba) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -90,7 +90,7 @@ #define ROP_FEEDBACK_100_PCT_DUTY_CYCLE_VOLTAGE 2.5 ///< RO pump 100% duty cycle feedback voltage. #define ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE 0.05 ///< RO pump duty cycle out of range tolerance. -#define DATA_PUBLISH_COUNTER_START_COUNT 3 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 50 ///< Data publish counter start count. /// Enumeration of RO pump states. typedef enum ROPump_States Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -83,7 +83,7 @@ #define TEMP_SENSORS_MAX_ALLOWED_DEGREE_C 120.0 ///< Temperature sensors maximum allowed temperature in C. #define NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C 80.0 ///< Non fluid temperature sensors path maximum allowed temperature in C. #define TEMP_SENSORS_OUT_OF_RANGE_PERSISTENT_PEROID_MS ( 5 * MS_PER_SECOND ) ///< Temperature sensor out of range persistent period in milliseconds. -#define DATA_PUBLISH_COUNTER_START_COUNT 21 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 30 ///< Data publish counter start count. // The count cannot be within 0.1V of the rail on both sides therefore: // ADC count = ((2^12) - 1 / ref voltage) * voltage Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r31aa23b12f37b9d16b5160369ccb7dab6c6eca4d -rf3a37b79a275a1854bf122ccf88669eaf97e5b17 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 31aa23b12f37b9d16b5160369ccb7dab6c6eca4d) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision f3a37b79a275a1854bf122ccf88669eaf97e5b17) @@ -35,7 +35,7 @@ #define MAX_VALVE_STATE_MISMATCH_COUNT 3 ///< Maximum number of times commanded valves state can fail to match read back valve states in a row. #define VALVES_STATE_PUB_INTERVAL ( 500 / TASK_PRIORITY_INTERVAL ) ///< Interval ( ms / task time) at which valves states are published on CAN bus. -#define DATA_PUBLISH_COUNTER_START_COUNT 27 ///< Data publish counter start count. +#define DATA_PUBLISH_COUNTER_START_COUNT 50 ///< Data publish counter start count. // ********** private data **********