application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-13969 Set property to expand margin for the RangeSlider item

    • -0
    • +2
    /sources/gui/qml/components/RangeSlider.qml
DEN-14876 Separated signal handling for the highlight rectangle and root element of the RangeSlider to eliminate jumping behavior

    • -3
    • +21
    /sources/gui/qml/components/RangeSlider.qml
DEN-13969 Restore commented out property in Slider.qml

    • -1
    • +1
    /sources/gui/qml/components/Slider.qml
DEN-14235 : No Option for Blood Pressure Measurement Off

DEN-13977 : Increase the active area of the sliders OFF switch

- Another possibly easier way to increase the touch area.

DEN-13969 Update slider code to handle decimal sliders

    • -43
    • +30
    /sources/gui/qml/components/Slider.qml
DEN-14736 : IMP: Modified the Unhandled parser to be able to parse the auto generated conf

- AG Unhandled.conf has [] in the parameter description which conflicts with grooup/key/MsgID

- AG Unhandled.conf has BOOL as a type which Previously we were using U32 for that.

    • -0
    • +5
    /sources/canbus/MessageInterpreter.cpp
DEN-13969 Added logic to adjust handler position and handling of steps less than handle width

    • -3
    • +9
    /sources/gui/qml/components/RangeRect.qml
    • -0
    • +1
    /sources/gui/qml/components/RangeSlider.qml
    • -21
    • +65
    /sources/gui/qml/components/Slider.qml
DEN-14858 : UI should navigate to Standby screen on Fault state

DEN-14012 : Blood Pressure Measurement Interval UI update

    • -6
    • +5
    /sources/gui/qml/components/EntryDialog.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-14361 : Treatment Review Screen Displays Some Parameters as "Unknown"

DEN-13977 Remove debugging red background color of switch

DEN-13969 Expand touch area to include left/right sides of handler and a slight bit beyond

    • -2
    • +3
    /sources/gui/qml/components/RangeRect.qml
DEN-13977 Increase the active area of the sliders OFF switch

DEN-14743 Add bluetooth pairing agent code to retain pairing status in bluez

    • -0
    • +92
    /sources/bluetooth/Agent1Adapter.cpp
    • -0
    • +86
    /sources/bluetooth/Agent1Adapter.h
    • -0
    • +38
    /sources/bluetooth/BluetoothInterface.cpp
    • -0
    • +8
    /sources/bluetooth/BluetoothInterface.h
    • -0
    • +170
    /sources/bluetooth/BluetoothPairingAgent.cpp
    • -0
    • +41
    /sources/bluetooth/BluetoothPairingAgent.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

    • -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