Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixing merge conflict

  1. … 2 more files in changeset.
Since Vy is busy and it is not a code change and is only type I do resolve on her behalf. RESOLVED

Since Vy is busy and it is not a code change and is only type
I do resolve on her behalf.
RESOLVED

RESOLVED

RESOLVED

fixed.

fixed.

DEN-16334: UI: Service password minimum length shall be 10 and minimum iteration shall be 10k

- changed the micro to reflect the non-backward compatibility.

- Also changed the source of reading the version's section from the Bamboo script to the compatible.h.

  1. … 1 more file in changeset.
RESOLVED

RESOLVED

good comment, will do in the next release

good comment,
will do in the next release

RESOLVED

RESOLVED

Resolved and tested.

Resolved and tested.

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

As far as I see there is MTreatmentOutletFlowData.cpp do ctrl+k,p MTreatmentOutletFlowData or ctrl+shift, MTreatmentOutletFlowData or F4 in your MTreatmentOutletFlowData.h to get in the cpp file to...

As far as I see there is MTreatmentOutletFlowData.cpp
do ctrl+k,p MTreatmentOutletFlowData
or ctrl+shift, MTreatmentOutletFlowData
or F4 in your MTreatmentOutletFlowData.h to get in the cpp file
to find it.

RESOLVED

RESOLVED

DEN-16262: Added - UI.P1B : HD/DG usage counter

Add string property to format the total hours in hh:mm format

  1. … 1 more file in changeset.
DEN-16262: Added - UI.P1B : HD/DG usage counter

Added the MV for the HD usage information

Modify the TouchGrid to accomodate indentation of subCategories

    • -0
    • +46
    ./settings/VHDUsageInfo.cpp
    • -0
    • +71
    ./settings/VHDUsageInfo.h
  1. … 14 more files in changeset.
UI-DEN-16335_UI VD S105 - P1B - HD/DG Usage Counter [ ready ]
UI-DEN-16335_UI VD S105 - P1B - HD/DG Usage Counter [ ready ]
Added

Added

Removed conversion

Removed conversion

Added.

Added.

Done.

Done.

There is no CPP for this file. Unless you meant a different location

There is no CPP for this file. Unless you meant a different location

DEN-16256: Updated - UI.P1B : Display UF Rate

Added QML text to display the rate

Include the 11th parameter

  1. … 3 more files in changeset.
update the length check of the message in MessageGlobals.h const QHash<Gui::GuiActionType ,quint8> payloadLen { . . {Gui::GuiActionType::ID_DialysateOutletFlow , 10 * 4 }...

update the length check of the message in MessageGlobals.h

const QHash<Gui::GuiActionType ,quint8> payloadLen {
.
.
{Gui::GuiActionType::ID_DialysateOutletFlow                     ,  10 * 4       }, //10 parameters each 4bytes
.
.
}
param 11 is missing 01 F32-refUFVolMl 02 F32-measUFVolMl 03 F32-measRotSpdRPM 04 F32-measSpdRPM 05 F32-measMCSpdRPM ...

param 11 is missing

01    F32-refUFVolMl	              
02    F32-measUFVolMl	              
03    F32-measRotSpdRPM	            
04    F32-measSpdRPM	              
05    F32-measMCSpdRPM	            
06    F32-measMCCurrmA	            
07    F32-setPWMpct	                
08    F32-dopCorrOffset	            
09    F32-dopCalcRate	              
10    F32-ufCalcRate	              
11    U32-rotorHall	                
12    F32-currentSetUFRate          
param 11 is missing 01 F32-refUFVolMl 02 F32-measUFVolMl 03 F32-measRotSpdRPM 04 F32-measSpdRPM 05 F32-measMCSpdRPM ...

param 11 is missing

01    F32-refUFVolMl	              
02    F32-measUFVolMl	              
03    F32-measRotSpdRPM	            
04    F32-measSpdRPM	              
05    F32-measMCSpdRPM	            
06    F32-measMCCurrmA	            
07    F32-setPWMpct	                
08    F32-dopCorrOffset	            
09    F32-dopCalcRate	              
10    F32-ufCalcRate	              
11    U32-rotorHall	                
12    F32-currentSetUFRate          

I think we should use mL/min as is. and do not convert to Liter.

I think we should use mL/min as is. and do not convert to Liter.