Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14736 : IMP: Updated MsgID 0x2D00

/*!

* \brief The MDGTemperatures class

* \details The DG temperatures data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2D00| 0x080 | 8 | 2 Hz | N | DG | All | DG Temperatures Data |

*

* | Payload ||

* | ||

* | #01:(F32) | \ref Data::mInletPrimaryHeater |

* | #02:(F32) | \ref Data::mHeatDisinfect |

* | #03:(F32) | \ref Data::mOutletPrimaryHeater |

* | #04:(F32) | \ref Data::mConductivitySensor1 |

* | #05:(F32) | \ref Data::mConductivitySensor2 |

* | #06:(F32) | \ref Data::mOutletRedundancy |

* | #07:(F32) | \ref Data::mInletDialysate |

* | #08:(F32) | \ref Data::mPrimaryHeaterThermoCouple |

* | #09:(F32) | \ref Data::mTrimmerHeaterThermoCouple |

* | #10:(F32) | \ref Data::mPrimaryHeaterColdJunction |

* | #11:(F32) | \ref Data::mTrimmerHeaterColdJunction |

* | #12:(F32) | \ref Data::mPrimaryHeaterInternal |

* | #13:(F32) | \ref Data::mTrimmerHeaterInternal |

* | #14:(F32) | \ref Data::mFpgaBoard |

* | #15:(F32) | \ref Data::mLoadCellA1B1 |

* | #16:(F32) | \ref Data::mLoadCellA2B2 |

* | #17:(F32) | \ref Data::mInternalTHDORTD |

* | #18:(F32) | \ref Data::mInternalTDIRTD |

* | #19:(F32) | \ref Data::mInteralTHDRTD |

* | #20:(F32) | \ref Data::mInternalCondSnsrTemp |

* | #21:(F32) | \ref Data::mBaroTempSensor |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Temperatures |

*

*/

    • -13
    • +45
    ./dg/data/MDGTemperaturesData.cpp
  1. … 5 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x2000

/*!

* \brief The MDGPressures class

* \details The DG pressures data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2000| 0x080 | 8 | 1 Hz | N | DG | All | DG Pressures Data |

*

* | Payload ||

* | ||

* | #1:(F32) | \ref Data::mROInletPSI |

* | #2:(F32) | \ref Data::mROOutletPSI |

* | #3:(F32) | \ref Data::mDrainInletPSI |

* | #4:(F32) | \ref Data::mDrainOutletPSI |

* | #5:(F32) | \ref Data::mBarometricPSI |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Pressures |

*

*/

  1. … 3 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x5C00

/*!

* \brief The MTreatmentStates class

* \details The treatment states data model

* These are states of the current treatment.

* It also includes the ultrafiltration states, saline bolus states.

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x5C00| 0x040 | 7 | 1 Hz | N | HD | All | Pre-Treatment States Data |

*

* | Payload ||

* | ||

* | #1:(U32) | \ref Data::mSubMode |

* | #2:(U32) | \ref Data::mWaterSampleState |

* | #3:(U32) | \ref Data::mSelfTestConsumablesState |

* | #4:(U32) | \ref Data::mSelfTestNoCartridgeState |

* | #5:(U32) | \ref Data::mInstallationState |

* | #6:(U32) | \ref Data::mSelfTestDryState |

* | #7:(U32) | \ref Data::mPrimeState |

* | #8:(U32) | \ref Data::mRecirculateState |

* | #9:(U32) | \ref Data::mPatientConnectionState |

* | #9:(U32) | \ref Data::mWetSelfTestsState |

* | #9:(U32) | \ref Data::mPreTreatmentRsrvrState |

*

* \sa Data

* \sa HD_Pre_Treatment_Mode_States

* \sa HD_Pre_Treatment_Sample_Water_States

* \sa HD_Pre_Treatment_Consumable_Self_Test_States

* \sa HD_Pre_Treatment_No_Cart_Self_Tests_States

* \sa HD_Pre_Treatment_Dry_Self_Tests_States

* \sa HD_Pre_Treatment_Prime_States

* \sa HD_Pre_Treatment_Recirc_States

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | HD |

* | infoText | PreTreatmentStates |

*

*/

  1. … 3 more files in changeset.
DEN-14736 : IMP: Updated MsgID 0x2C00

/*!

* \brief The MDGHeaters class

* \details The DG heaters data model

*

* | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |

* |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |

* |0x2C00| 0x080 | 8 | 2 Hz | N | DG | All | DG Heaters Data |

*

* | Payload ||

* | ||

* | # 1:(F32) | \ref Data::mMainPrimayHeaterDC |

* | # 2:(F32) | \ref Data::mSmallPrimaryHeaterDC |

* | # 3:(F32) | \ref Data::mTrimmerHeaterDC |

* | # 4:(F32) | \ref Data::mPrimaryTargetTemp |

* | # 5:(F32) | \ref Data::mTrimmerTargetTemp |

* | # 6:(F32) | \ref Data::mPrimaryHeaterState |

* | # 7:(F32) | \ref Data::mTrimmerHeaterState |

* | # 8:(F32) | \ref Data::mPrimaryEfficiency |

* | # 9:(F32) | \ref Data::mPrimaryCalcTargetTemp |

* | #10:(F32) | \ref Data::mTrimmerCalcCurrentTemp |

* | #11:(F32) | \ref Data::mTrimmerUseLastDC |

*

* \sa Data

*

* <h2 class="groupheader">Logging info</h2>

* | ||

* | ||

* | typeText | Datum |

* | unitText | DG |

* | infoText | Heaters |

*

*/

  1. … 5 more files in changeset.
DEN-14736 : IMP: DEN-14486

- DEN-14486 : Incorrect alarm notification appears during DG Flush

  1. … 6 more files in changeset.
DEN-14736 : IMP: Dry-Demo Support

- added the CLI switch -D : --enable-dry-demo

- added the CLI switch -A : --active-can-bus <CANBus>

- added the CLI switch -F : --disable-fault-screen

- will send confirmation response with ConfirmationID of 99 and as accepted(1):

- e.g. 03:32:29.560,bb00,UI,Confirm,99,1

  1. … 11 more files in changeset.
DEN-14736 : IMP: Unhandled Msg ID log

- Added the messaged Id to the Unhandled messages log

  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

Bamboo Commit: Updated MAlarmMapping.cpp

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

  1. … 14 more files in changeset.
DEN-14736 IMP: Confirm Always on Top

- The Alarm won't cancel the Confirmation anymore

- The Alarm Dialog will still get updated while minimized.

- The Alarm Dialog will get maximized if the confirmation dialog gets closed.

  1. … 7 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

Bamboo Commit: Updated MAlarmMapping.cpp

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

Bamboo Commit: Updated MAlarmMapping.cpp

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

Bamboo Commit: Updated MAlarmMapping.cpp

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

  1. … 594 more files in changeset.
Cherry Pick [DEN-13053-S82-JI : 86d954] ClousSync device Registration Error

Fixed syntax of cloudsync post in run.sh file so that cloudsync runs on post

Changed UI serial implementation to trim off any whitespace or invalid characters in serials received from HD and DG

Changed CloudSync controller to only send messages to CloudSync if device is registered

  1. … 2 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

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

  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated MAlarmMapping.cpp

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

Bamboo Commit: Updated MAlarmMapping.cpp

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

Bamboo Commit: Updated MAlarmMapping.cpp