Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -re58e3385eaf5e920335f963937b2e9f654a32cfe -rdcca963aa54aeae4f1f5a3995ce63066156eb517 --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision e58e3385eaf5e920335f963937b2e9f654a32cfe) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision dcca963aa54aeae4f1f5a3995ce63066156eb517) @@ -44,14 +44,14 @@ F32 getLoadCellLargeFilteredWeight( LOAD_CELL_ID_T loadCellID ); F32 getLoadCellVelocity( LOAD_CELL_ID_T loadCellID ); -void getLoadCellsTareValues( U08* bufferAddress ); -void setLoadCellsTareValues( U08* bufferAddress ); - BOOL testSetLoadCellOverride( U32 loadCellID, F32 value, BOOL raw ); BOOL testResetLoadCellOverride( U32 loadCellID, BOOL raw ); BOOL testSetLoadCellDataPublishIntervalOverride( U32 value ); BOOL testResetLoadCellDataPublishIntervalOverride( void ); +void getLoadCellsTareValues( U08* bufferAddress ); +void setLoadCellsTareValues( U08* bufferAddress ); + /**@}*/ #endif Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r3d87e97b9345aec63ca88d741e3bcd548f90422b -rdcca963aa54aeae4f1f5a3995ce63066156eb517 --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 3d87e97b9345aec63ca88d741e3bcd548f90422b) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision dcca963aa54aeae4f1f5a3995ce63066156eb517) @@ -55,6 +55,11 @@ #define DATA_PUBLISH_COUNTER_START_COUNT 5 ///< Data publish counter start count. #define NUM_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK 1 ///< Number of acid and bicarb non-volatile data to check. +// The gain and offset are for the equation to account for the loss of temperature during the transition from DG to HD and back +/* + * Qd = 100 mL/min Tloss = 1.5C + * Qd = 500 mL/min Tloss = 0.5C + */ #define TRIMMER_HEATER_TARGET_TEMP_GAIN -0.002F ///< Trimmer heater target temperature gain. #define TRIMMER_HEATER_TARGET_TEMP_OFFSET 1.7F ///< Trimmer heater target temperature offset.