firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-4248: Fixed merge conflicts.

    • -22
    • +33
    ./App/Services/AlarmMgmtSWFaults.h
Merge branch 'staging' into bugfix/LDT-4160-request-get-function-for-full-d

Fixed warning and resolved commnets

What is the 3rd modality?

What is the 3rd modality?

Return type should be an enum (TREATMENT_TYPE_T).

Return type should be an enum (TREATMENT_TYPE_T).

Return type should be an enum (FLUID_BOLUS_MEDIUM_T).

Return type should be an enum (FLUID_BOLUS_MEDIUM_T).

Move after Modes so they are alphabetized.

Move after Modes so they are alphabetized.

Merge branch 'develop' of bitbucket.org:diality-cloud/td-firmware into develop

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

Merge branch 'LDT-4875-td-h12-is-not-actuating-during' into develop

Fixes

Crucible fixes

Merge conflicts

Fixes

Remove extra ;

Remove extra ;

Can we align comments?

Can we align comments?

Missing pinch valves (H1 and H19).

Missing pinch valves (H1 and H19).

Yes removed

Yes removed

Agree! Fixed

Agree! Fixed

Remove this blank line.

Remove this blank line.

I don't think this is needed. You can't get to this else until the delay counter reaches this count.

I don't think this is needed. You can't get to this else until the delay counter reaches this count.

Is this necessary? Treatment paused state will do this.

Is this necessary? Treatment paused state will do this.

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

New Fixes

Please typecast alarmID to resolve warning. ALARM_T alarm = getAlarmProperties( ( ALARM_ID_T )alarmID );

Please typecast alarmID to resolve warning.

ALARM_T alarm = getAlarmProperties( ( ALARM_ID_T )alarmID );

Fix merge conflict stuff here.

Fix merge conflict stuff here.

Fix merge conflict stuff here.

Fix merge conflict stuff here.

LDT-4028:Update Pre-Tx States