application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14796-UI-BN-S91' into staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-14799 IMP: General Implementation

DEN-14787: UI failing POST after upgrade

DEN-14773: UI POST failing. Touch screen not configuring.

DEN-12140: UI does not pass Touch POST

DEN-14743 Add pairing confirmation dialog

DEN-14743 Modify to only require single time pairing for data sync

    • -26
    • +106
    /sources/bluetooth/BluetoothInterface.cpp
    • -3
    • +16
    /sources/bluetooth/BluetoothInterface.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/cloudsync/CloudSyncController.h
  1. … 36 more files in changeset.
Merge branch 'DEN-14733-UI-BN-S90-2' into staging

    • -5
    • +5
    /sources/canbus/MessageInterpreter.cpp
  1. … 29 more files in changeset.
Merge branch 'DEN-14517-UI-BN-S88' into staging

DEN-14736 : IMP: DEN-14768 : InTx UF Adj

DEN-14768

Ultrafiltration Adjustment Screen Slider Does Not Update Maximum UF Vol after Duration Settings Adjustment

    • -10
    • +12
    /sources/gui/qml/components/Slider.qml
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
    /sources/model/dg/data/MDGTemperaturesData.cpp
    • -26
    • +50
    /sources/model/dg/data/MDGTemperaturesData.h
    • -13
    • +21
    /sources/view/dg/data/VDGTemperaturesData.cpp
    • -0
    • +8
    /sources/view/dg/data/VDGTemperaturesData.h
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 |

*

*/

    • -12
    • +16
    /sources/model/dg/data/MDGPressuresData.cpp
    • -4
    • +7
    /sources/model/dg/data/MDGPressuresData.h
    • -4
    • +5
    /sources/view/dg/data/VDGPressuresData.cpp
    • -4
    • +5
    /sources/view/dg/data/VDGPressuresData.h
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 |

*

*/

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 |

*

*/

    • -9
    • +42
    /sources/model/dg/data/MDGHeatersData.cpp
    • -10
    • +33
    /sources/model/dg/data/MDGHeatersData.h
    • -3
    • +11
    /sources/view/dg/data/VDGHeatersData.cpp
    • -4
    • +12
    /sources/view/dg/data/VDGHeatersData.h
DEN-14736 : IMP: DEN-14486

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -3
    • +32
    /sources/view/hd/alarm/VAlarmActiveList.cpp
    • -1
    • +6
    /sources/view/hd/alarm/VAlarmActiveList.h
    • -0
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-14743 Bluetooth bug fixes - improve connection handling and message display

    • -10
    • +101
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +2
    /sources/bluetooth/BluetoothInterface.h
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
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-14736 : IMP: DEN-14779: In-Tx Qb, Qd, PBo, PBA Adj

Bamboo Commit: Updated MAlarmMapping.cpp

    • -16
    • +23
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    /scripts/wifi_generate_wpa_supplicant.sh
    • -2
    • +2
    /scripts/wifi_request_auto_assigned_ip.sh
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -2
    • +2
    /sources/model/settings/MWifiNetwork.h
    • -1
    • +1
    /sources/view/settings/VNetworkModel.cpp
    • -1
    • +1
    /sources/view/settings/VNetworkModel.h
Merge branch 'DEN-14609-UI-VD-S89' into staging

DEN-14609 Move log line into else section

DEN-14736 : IMP: Secured the SD-Card mount

- added security recommended USB mount flags

MS_SYNCHRONOUS

MS_NOEXEC

MS_NODEV

MS_NOSUID

DEN-14736 : IMP: Removed the SD-Card alarm dialog

- it is not clear what needs to be done when SD-Card fails after a successful POST.

- May need to send an alarmTrigger to HD and stop logging.

- Removed for now.

DEN-14736 : IMP: Shutdown dialog / Alarm Dialog

- The shutdown dialog closure was not maximizing the minimized alarm dialog

DEN-14736 : IMP: DEN-14779: In-Tx Qb, Qd, PBo, PBA Adj

Merge branch 'DEN-14609-UI-VD-S89' of ssh://dvm-linux02:7999/ui/application into DEN-14609-UI-VD-S89