Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12224 updated the code

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

Done.

Done.

DEN11250 Added code to allow resume after syringe pump occlusion has been removed - moved here from commit 1bb17047684 in DEN-11250 branch

DEN-11250 Fixed syringe pump occlusion alarm not triggered - moved commit 269329748ff from DEN-11250 to here

DEN-11928 Addressed peer review comments

Removed // if ( TRUE == getNoNewTreatmentStatus() ) //{ // rejReason = REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED; // }

Removed
// if ( TRUE == getNoNewTreatmentStatus() )
//

Unknown macro: { // rejReason = REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED; // }
Removed line // payload.alarmsFlags |= ( almStatus.noNewTreatment ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT) : 0 );

Removed line // payload.alarmsFlags |= ( almStatus.noNewTreatment ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT) : 0 );

Removed line //noNewTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoNewTreatment ? TRUE : noNewTreatment );

Removed line //noNewTreatment = ( TRUE == ALARM_TABLE[ a ].alarmNoNewTreatment ? TRUE : noNewTreatment );

Just delete this line of code.

Just delete this line of code.

Just delete this line of code.

Just delete this line of code.

Just delete this code.

Just delete this code.

It looks like staging branch has things the way it was too.

It looks like staging branch has things the way it was too.

Should be since last service (not last treatment).

Should be since last service (not last treatment).

This was part of the merge from staging branch.

This was part of the merge from staging branch.

DEN-11928 Fixed compile errors

DEN-11928 Merged commit 2df3175ad36 to DEN-11928 branch

DEN-12224 updated the standbymode states

What is the reason for these changes? Just reading the code, it makes more sense to me that way it was.

What is the reason for these changes? Just reading the code, it makes more sense to me that way it was.

staging branch merge to resolve compiler errors from common header files.

DEN-10974 Fix Syringe Removed Alarm.

DEN_12224 merged CodeClinic's changes and resolved the merge conflicts

DEN-12224 updated the standby mode

DEN-12224 updated the disinfect modes to look at the rejection reasons

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop