dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14786: removed log_can feature. Moved mutex lock and acquires to encapsulate the entire message processing than only callback handling.

Merge branch 'DEN-14786-dialin-not-tread-safe-with-canbus-messages' into develop

DEN-14786: fixed tests

Added MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS msg_id

Bamboo Commit: generated the code change report

Merge branch 'DEN-14786-dialin-not-tread-safe-with-canbus-messages' into develop

DEN-14786: implemented socket can timestamps to DG module and submodules

    • -4
    • +5
    /dialin/dg/chemical_disinfect_flush.py
  1. … 22 more files in changeset.
Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

DEN-14763 applied the stashed changes from staging

Bamboo Commit: generated the code change report

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DEN-14160-hd-blood-leak-override-not-working' into staging

DEN-14786: remaining HD submodules for timestamp implementation.

DEN-14786: Sub modules H-R. removed unused data fields in pressure_occlusion

DEN-14786: timestamp implmenation for submodules B-F

DEN-14786: fixed air bubbles publish. timestamp implementation for A submodules.

DEN-14786: updated messages to handle timestamps directly from socket can

DEN-14786: implemented mutexes around CAN callbacks and sync_response dictionary.

Merge branch 'DEN-14662-nfr-battery-related' into develop

Merge branch 'DEN-14647-get_battery_manager_values' into DEN-14662-nfr-battery-related

DEN-14647: fixed battery fields to have the correct data description.

Bamboo Commit: generated the code change report

Merge branch 'DEN-13154-heparin-syringe-empty-position-incorrect' into develop

DEN-13154: Added integrated volume to get dialysate fill data function per DEN-14732.

DEN-13154: Added handling of new blood and dialysate flow broadcast data (prescribed flow) per DEN-13152.

Bamboo Commit: generated the code change report

Merge branch 'DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10' into develop

DEN-14763, DIAL-233 added a command to be able to set the dialysate mixing ratios and added an event to send the average conductivity of acid and bicarb at the end of the fill

Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

    • -12
    • +1
    /tests/test_nelson_labs_disinfect.py
Bamboo Commit: generated the code change report