Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -rf2d00ceb224ce5f7a239379fff23ee63d919cfb7 -rb135150a91ea70889433dd23420fdbe91745fc91 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision f2d00ceb224ce5f7a239379fff23ee63d919cfb7) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision b135150a91ea70889433dd23420fdbe91745fc91) @@ -98,12 +98,105 @@ * The testSetLoadCellA1Override function overrides the measured \n * load cell A1. \n * The testResetLoadCellA1Override function resets the override of the \n - * load cell A1. + * load cell A1. \n * @details * Inputs : none - * Outputs : raw adc value for load cell A1 - * @param value : override measured blood pump current (in mA) + * Outputs : loadCellA1raw + * @param value : override measured load cell A1 raw * @return TRUE if override successful, FALSE if not *************************************************************************/ -DATA_OVERRIDE_FUNC( F32, testSetMeasuredBloodPumpMCCurrentOverride, testResetMeasuredBloodPumpMCCurrentOverride, adcBloodPumpMCCurrentmA ) +DATA_OVERRIDE_FUNC( U32, testSetLoadCellA1Override, testResetLoadCellA1Override, loadCellA1raw ) +/************************************************************************* + * @brief testSetLoadCellA2Override and testResetLoadCellA2Override + * The testSetLoadCellA2Override function overrides the measured \n + * load cell A2. \n + * The testResetLoadCellA1Override function resets the override of the \n + * load cell A2. \n + * @details + * Inputs : none + * Outputs : loadCellA2raw + * @param value : override measured load cell A2 raw + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +DATA_OVERRIDE_FUNC( U32, testSetLoadCellA2Override, testResetLoadCellA2Override, loadCellA2raw ) + +/************************************************************************* + * @brief testSetLoadCellB1Override and testResetLoadCellB1Override + * The testSetLoadCellB1Override function overrides the measured \n + * load cell B1. \n + * The testResetLoadCellB1Override function resets the override of the \n + * load cell B1. \n + * @details + * Inputs : none + * Outputs : loadCellB1raw + * @param value : override measured load cell B1 raw + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +DATA_OVERRIDE_FUNC( U32, testSetLoadCellB1Override, testResetLoadCellB1Override, loadCellB1raw ) + +/************************************************************************* + * @brief testSetLoadCellB2Override and testResetLoadCellB2Override + * The testSetLoadCellB2Override function overrides the measured \n + * load cell B2. \n + * The testResetLoadCellB2Override function resets the override of the \n + * load cell B2. \n + * @details + * Inputs : none + * Outputs : loadCellB2raw + * @param value : override measured load cell B2 raw + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +DATA_OVERRIDE_FUNC( U32, testSetLoadCellB2Override, testResetLoadCellB2Override, loadCellB2raw ) + +/************************************************************************* + * @brief getLoadCellA1raw + * The getLoadCellA1raw function gets the measured load cell A1 \n + * current. + * @details + * Inputs : loadCellA1raw + * Outputs : none + * @param none + * @return the load cell A1 raw value. + *************************************************************************/ +DATA_GET( U32, getLoadCellA1raw, loadCellA1raw ) + + +/************************************************************************* + * @brief getLoadCellA2raw + * The getLoadCellA2raw function gets the measured load cell A2 \n + * current. + * @details + * Inputs : loadCellA2raw + * Outputs : none + * @param none + * @return the load cell A2 raw value. + *************************************************************************/ +DATA_GET( U32, getLoadCellA2raw, loadCellA2raw ) + +/************************************************************************* + * @brief getLoadCellB1raw + * The getLoadCellB1raw function gets the measured load cell B1 \n + * current. + * @details + * Inputs : loadCellB1raw + * Outputs : none + * @param none + * @return the load cell B1 raw value. + *************************************************************************/ +DATA_GET( U32, getLoadCellB1raw, loadCellB1raw ) + +/************************************************************************* + * @brief getLoadCellB2raw + * The getLoadCellB2raw function gets the measured load cell B2 \n + * current. + * @details + * Inputs : loadCellB2raw + * Outputs : none + * @param none + * @return the load cell B2 raw value. + *************************************************************************/ +DATA_GET( U32, getLoadCellB2raw, loadCellB2raw ) + + +