Index: Utilities.h =================================================================== diff -u -r5c486b49eeca18ec83b7d776d9052dd38800f7d0 -r15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088 --- Utilities.h (.../Utilities.h) (revision 5c486b49eeca18ec83b7d776d9052dd38800f7d0) +++ Utilities.h (.../Utilities.h) (revision 15a8d5ff98b2d88bd0f32a37b41f4eec0f7a7088) @@ -58,9 +58,10 @@ TIME_WINDOWED_COUNT_BATT_COMM_ERROR, ///< Battery communication error #endif #ifdef _DD_ - TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES, ///< FPGA communication failure (NAK, CRC, timeout) - TIME_WINDOWED_COUNT_FPGA_FRESH_DIALYSATE_PUMP_HALL_SENSOR_ERROR,///< FPGA fresh dialysate pump hall sensor failure - TIME_WINDOWED_COUNT_FPGA_SPENT_DIALYSATE_PUMP_HALL_SENSOR_ERROR,///< FPGA spent dialysate pump hall sensor failure + TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, ///< FPGA Conductivity sensor error + TIME_WINDOWED_COUNT_FPGA_TEMPERATURE_SENSOR_ERROR, ///< FPGA Temperature sensor error + TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES, ///< FPGA communication failure (NAK, CRC, timeout) + TIME_WINDOWED_COUNT_FPGA_DRAIN_PUMP_HALL_SENSOR_ERROR, ///< FPGA Drain pump hall sensor failure #endif NUM_OF_TIME_WINDOWED_COUNTS ///< Number of pressure sensors } TIME_WINDOWED_COUNT_T; @@ -108,6 +109,8 @@ U08 crc8( const U08 *address, U32 len ); U08 crc4( U16* buffer, U32 byteCount ); +S16 signExtend16( U16 value, U32 signBit ); + U32 u32DiffWithWrap( U32 start, U32 end ); S32 u32BiDiffWithWrap( U32 start, U32 end ); U16 u16DiffWithWrap( U16 start, U16 end );