Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -rdbdd97d883c75351fb316ac61911e189986f911e -r098272da7396d05816a266142e7a34b40f4d93d3 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision dbdd97d883c75351fb316ac61911e189986f911e) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 098272da7396d05816a266142e7a34b40f4d93d3) @@ -218,12 +218,6 @@ *************************************************************************/ void execDGInterfaceMonitor( void ) { - // Trigger alarm if not receiving new load cell data message in timely manner - checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag ); -/* =========== DN-28AUG2022 for debug only. Will re-install this line. - // Trigger alarm if not receiving new dialysate temperature data message in timely manner - checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMPERATURE_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag ); -============== */ // Trigger alarm if not receiving new reservoirs data message in timely manner checkDGDataFreshness( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, &dgReservoirsDataFreshFlag ); Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -rdbdd97d883c75351fb316ac61911e189986f911e -r098272da7396d05816a266142e7a34b40f4d93d3 --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision dbdd97d883c75351fb316ac61911e189986f911e) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 098272da7396d05816a266142e7a34b40f4d93d3) @@ -71,35 +71,6 @@ F32 tempRsrvrEndFillTrimmer; ///< Temperature reservoir end fill trimmer in C. } DG_RESERVOIRS_DATA_PAYLOAD_T; -/// Payload record structure for DG temperature sensors data message. -typedef struct -{ - F32 inletPrimaryHeater; ///< Inlet primary heater temperature sensor - F32 outletPrimaryHeater; ///< Outlet primary heater temperature sensor - F32 conductivitySensor1; ///< Conductivity sensor 1 temperature sensor - F32 conductivitySensor2; ///< Conductivity sensor 2 temperature sensor - F32 outletRedundant; ///< Outlet redundant temperature sensor - F32 inletDialysate; ///< Inlet dialysate temperature sensor - F32 primaryHeaterThermocouple; ///< Primary heaters thermocouple sensor - F32 trimmerHeaterThermocouple; ///< Trimmer heater thermocouple sensor - F32 priamyHeaterColdjunction; ///< Primary heaters cold junction temperature sensor - F32 trimmerHeaterColdjunction; ///< Trimmer heater cold junction temperature sensor - F32 primaryHeaterInternal; ///< Primary heaters internal temperature (calculated from thermocouple and cold junction) - F32 trimmerHeaterInternal; ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction) - F32 fpgaBoard; ///< FPGA board temperature sensor - F32 loadCellA1B1; ///< Load cell A1/B1 temperature sensor - F32 loadCellA2B2; ///< Load cell A2/B2 temperature sensor - F32 internalTHDORTD; ///< THDo RTD channel temperature sensor - F32 internalTDIRTD; ///< TDI RTD channel temperature sensor - F32 internalCondSnsrTemp; ///< Conductivity Sensor internal temperature sensor - U32 primaryThermoCoupleRaw; ///< Primary heaters thermocouple raw ADC value - U32 primaryColdjuncRaw; ///< Primary heaters cold junction raw ADC value - U32 trimmerThermoCoupleRaw; ///< Trimmer heater thermocouple raw ADC value - U32 trimmerColdjuncRaw; ///< Trimmer heater cold junction raw ADC value - S32 cond1Raw; ///< Conductivity sensor 1 raw temperature ADC value - S32 cond2Raw; ///< Conductivity sensor 2 raw temperature ADC value -} TEMPERATURE_SENSORS_DATA_T; - /// Payload record structure for a drain reservoir command message. typedef struct { Index: firmware/App/Drivers/Battery.c =================================================================== diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -r098272da7396d05816a266142e7a34b40f4d93d3 --- firmware/App/Drivers/Battery.c (.../Battery.c) (revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09) +++ firmware/App/Drivers/Battery.c (.../Battery.c) (revision 098272da7396d05816a266142e7a34b40f4d93d3) @@ -132,14 +132,6 @@ if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_REL_STATE_OF_CHARGE_CMD, &relStateOfCharge_pct ) ) { batteryRelStateOfCharge_pct.data = (U32)relStateOfCharge_pct; - if ( getBatteryRemainingPercent() < BATTERY_PACK_MIN_CHARGE_PCT ) - { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, getBatteryRemainingPercent() ); - } - else - { - clearAlarmCondition( ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW ); - } } if ( TRUE == getBatteryData( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_STATUS_CMD, &batteryPackStatus ) ) Index: firmware/App/Modes/SelfTests.c =================================================================== diff -u -r49a4a92ec05c597a88704d8177c30ff0f026602b -r098272da7396d05816a266142e7a34b40f4d93d3 --- firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 49a4a92ec05c597a88704d8177c30ff0f026602b) +++ firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 098272da7396d05816a266142e7a34b40f4d93d3) @@ -434,7 +434,7 @@ currentDrySelfTestsState = handleDrySelfTestPressureSensorsSetupState(); break; - case DRY_SELF_TESTS_PRESSURE_SENSORS_STATE: + case DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE: currentDrySelfTestsState = handleDrySelfTestPressureSensorsState(); break; @@ -908,7 +908,7 @@ *************************************************************************/ static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsSetupState( void ) { - DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_STATE; + DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE; if ( TRUE == doesAlarmStatusIndicateStop() ) { @@ -942,7 +942,7 @@ *************************************************************************/ static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( void ) { - DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_STATE; + DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE; F32 const arterialPressure = getFilteredArterialPressure(); F32 const venousPressure = getFilteredVenousPressure(); Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r0d60b097df179aeaa2df1f1ad5ec3b9099fc0006 -r098272da7396d05816a266142e7a34b40f4d93d3 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 0d60b097df179aeaa2df1f1ad5ec3b9099fc0006) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 098272da7396d05816a266142e7a34b40f4d93d3) @@ -118,7 +118,7 @@ #endif // Monitor processor RAM status - //execRAMMonitor(); // DN-01SEPT2022 + execRAMMonitor(); // Manage data to be transmitted to other sub-systems execSystemCommTx();