Services

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14328-hd-event-issues' into develop

  1. … 4 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 10 more files in changeset.
Old transfer was 600mL, new is 300mL. Res 1 should end up with 1500 so added 300 to baseline, Res 2 was previously ending with 500. Do we want it to end R2 with 300?

Old transfer was 600mL, new is 300mL. Res 1 should end up with 1500 so added 300 to baseline, Res 2 was previously ending with 500. Do we want it to end R2 with 300?

Updated for only reservoir 2 fill state.

Updated for only reservoir 2 fill state.

There are two dialysate prime states. First goes through dialyzer and both DPs are running and we still want 300 rate. Second bypasses dialyzer and only DPi is running and we want 600 rate.

There are two dialysate prime states. First goes through dialyzer and both DPs are running and we still want 300 rate. Second bypasses dialyzer and only DPi is running and we want 600 rate.

This looks like we're skipping draining of reservoirs before doing any filling if priming disabled. I think we always want to drain both reservoirs first. Also, if we go to fill state like this, wi...

This looks like we're skipping draining of reservoirs before doing any filling if priming disabled. I think we always want to drain both reservoirs first.
Also, if we go to fill state like this, will it do a flush or a normal fill? I think it will do a flush fill since flushed flag is still FALSE.

Remove extra blank line.

Remove extra blank line.

We should initialize these with a loop iterating through each reservoir (in case a reservoir is added/removed at some point).

We should initialize these with a loop iterating through each reservoir (in case a reservoir is added/removed at some point).

This should probably be 600 since we'll only be transferring 300 to R1 in wet self-tests.

This should probably be 600 since we'll only be transferring 300 to R1 in wet self-tests.

Alignment

Alignment

DEN-14559 updated the code to be able to run POST requested by the Dialin user

  1. … 10 more files in changeset.
Merge branch 'staging' into DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-treatment

  1. … 2 more files in changeset.
RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DEN-14549: Added function to see if an alarm condition is detected. Added a function to determine whether A/C power loss condition is detected and used them where needed.

  1. … 5 more files in changeset.
Yes, may need to be done when merging to Staging. Is this flag used independently anywhere? Or planned to be?

Yes, may need to be done when merging to Staging. Is this flag used independently anywhere? Or planned to be?

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

I don't think I have this bug fix in my branch. Needs to be addressed in a more recent branch.

I don't think I have this bug fix in my branch. Needs to be addressed in a more recent branch.

Good catch. Updated Voltages.c to behave same as Battery.c (trigger the correction alarm depending on whether in a treatment mode).

Good catch. Updated Voltages.c to behave same as Battery.c (trigger the correction alarm depending on whether in a treatment mode).

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

This check for _IN_TREATMENT may need to be added to Valves.c ALARM_ID_HD_AC_POWER_LOST check from recent bug fix. Both look to be checked in every case. Is this flag used independently anywhere?

This check for _IN_TREATMENT may need to be added to Valves.c ALARM_ID_HD_AC_POWER_LOST check from recent bug fix. Both look to be checked in every case. Is this flag used independently anywhere?

Treatment mode check is not done in Voltages.c, so ALARM_ID_HD_AC_POWER_LOST will be set there in addition to ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT here. Is this the expected behavior?

Treatment mode check is not done in Voltages.c, so ALARM_ID_HD_AC_POWER_LOST will be set there in addition to ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT here. Is this the expected behavior?

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

This config check is unnecessary and should be removed. The vars should always be initialized. Enable/Disable Alarms are done when checking the direction, etc.

This config check is unnecessary and should be removed. The vars should always be initialized. Enable/Disable Alarms are done when checking the direction, etc.

HD-DEN-14561_Release Preprocessor Flag Specifies Code That Conflicts With SW Config Debug

Corrected _RELEASE_ logic, release build executes the same block as non debug selection

  1. … 3 more files in changeset.
They're kind of different. The stop function is fairly straightforward and is part of syringe pump driver. The start function is a lot more complex as it needs to figure out what it should be doing...

They're kind of different. The stop function is fairly straightforward and is part of syringe pump driver. The start function is a lot more complex as it needs to figure out what it should be doing and is part of treatment mode module.

Inconsistent naming here. StopSyringePump, StartHeparinPump. Suggest using same name for both.

Inconsistent naming here. StopSyringePump, StartHeparinPump. Suggest using same name for both.