3djc/x7 outputs (#4273)

[128x64] Rework Outputs screen
[X7] Fix for min/max limits bug
[X7/X9] UI fixes
This commit is contained in:
Andre Bernet
2017-01-24 07:36:40 +01:00
committed by Bertrand Songis
parent 824317c477
commit bf15410bf1
16 changed files with 451 additions and 145 deletions
@@ -1456,14 +1456,8 @@ class LimitField: public StructField {
StructField("Limit")
{
if (IS_ARM(board) && version >= 218) {
if (HAS_LARGE_LCD(board)) {
Append(new ConversionField< SignedField<11> >(limit.min, exportLimitValue<1000, 1024>, importLimitValue<1000, 1024>));
Append(new ConversionField< SignedField<11> >(limit.max, exportLimitValue<-1000, 1024>, importLimitValue<-1000, 1024>));
}
else {
Append(new ConversionField< SignedField<11> >(limit.min, +100, 10));
Append(new ConversionField< SignedField<11> >(limit.max, -100, 10));
}
Append(new ConversionField< SignedField<11> >(limit.min, exportLimitValue<1000, 1024>, importLimitValue<1000, 1024>));
Append(new ConversionField< SignedField<11> >(limit.max, exportLimitValue<-1000, 1024>, importLimitValue<-1000, 1024>));
Append(new SignedField<10>(limit.ppmCenter));
Append(new ConversionField< SignedField<11> >(limit.offset, exportLimitValue<0, 1024>, importLimitValue<0, 1024>));
Append(new BoolField<1>(limit.symetrical));
+1 -1
View File
@@ -45,7 +45,7 @@ LimitsGroup::LimitsGroup(Firmware * firmware, TableLayout * tableLayout, int row
spinbox->setSuffix("%");
}
if (HAS_LARGE_LCD(board) || deflt == 0 /*it's the offset*/) {
if (IS_ARM(board) || deflt == 0 /*it's the offset*/) {
spinbox->setDecimals(1);
}
else {