From a83ecbb04273773cacb1d39f15abd3fbe3c41207 Mon Sep 17 00:00:00 2001 From: Yury Shuvakin Date: Mon, 22 Jan 2024 12:26:22 +0900 Subject: [PATCH] Hidden BMS temperature controls. Fixed translations --- qml/Screens/BmsSettingsScreen.qml | 110 +++++++++++------------ qml/Screens/TemperatureMonitorScreen.qml | 104 ++++++++++----------- translations/cubo_en.qm | Bin 23 -> 33 bytes translations/cubo_en.ts | 10 +-- translations/cubo_it.qm | Bin 23 -> 33 bytes translations/cubo_it.ts | 10 +-- translations/cubo_ru.qm | Bin 28694 -> 28703 bytes translations/cubo_ru.ts | 8 +- 8 files changed, 123 insertions(+), 119 deletions(-) diff --git a/qml/Screens/BmsSettingsScreen.qml b/qml/Screens/BmsSettingsScreen.qml index fb5f5f5..bcb9c0d 100644 --- a/qml/Screens/BmsSettingsScreen.qml +++ b/qml/Screens/BmsSettingsScreen.qml @@ -102,52 +102,52 @@ RowLayout { Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 } - Repeater { - id: bmsSensorsMaskRepeater + // Repeater { + // id: bmsSensorsMaskRepeater - property var bmsSensorsMaskModel: [] + // property var bmsSensorsMaskModel: [] - ColumnLayout { - id: bmsSensorsMaskLayout - Layout.fillWidth: true + // ColumnLayout { + // id: bmsSensorsMaskLayout + // Layout.fillWidth: true - property var boardIndex: index + // property var boardIndex: index - Controls.SubtitleLabel { - text: index === 0 ? qsTr("BMS sensors mask for master board") : qsTr("BMS sensors mask for slave board #") + index - maximumLineCount: 2 - wrapMode: Text.WordWrap - Layout.fillWidth: true - } + // Controls.SubtitleLabel { + // text: index === 0 ? qsTr("BMS sensors mask for master board") : qsTr("BMS sensors mask for slave board #") + index + // maximumLineCount: 2 + // wrapMode: Text.WordWrap + // Layout.fillWidth: true + // } - Controls.Frame { - padding: 10 - Layout.fillWidth: true - Layout.fillHeight: true + // Controls.Frame { + // padding: 10 + // Layout.fillWidth: true + // Layout.fillHeight: true - ColumnLayout { - spacing: 10 - anchors.fill: parent + // ColumnLayout { + // spacing: 10 + // anchors.fill: parent - Repeater { - model: 4 - Controls.CheckBox { - text: qsTr("#") + (index + 1) - opacity: (bmsSensorsMaskLayout.boardIndex === 0 && (index === 2 || index === 3)) ? 0 : 1 - enabled: opacity - checked: bmsSensorsMaskRepeater.bmsSensorsMaskModel[bmsSensorsMaskLayout.boardIndex * 4 + index] - onCheckedChanged: bmsSensorsMaskRepeater.bmsSensorsMaskModel[bmsSensorsMaskLayout.boardIndex * 4 + index] = checked - } - } + // Repeater { + // model: 4 + // Controls.CheckBox { + // text: qsTr("#") + (index + 1) + // opacity: (bmsSensorsMaskLayout.boardIndex === 0 && (index === 2 || index === 3)) ? 0 : 1 + // enabled: opacity + // checked: bmsSensorsMaskRepeater.bmsSensorsMaskModel[bmsSensorsMaskLayout.boardIndex * 4 + index] + // onCheckedChanged: bmsSensorsMaskRepeater.bmsSensorsMaskModel[bmsSensorsMaskLayout.boardIndex * 4 + index] = checked + // } + // } - Item { - visible: index === 0 - Layout.fillHeight: true - } - } - } - } - } + // Item { + // visible: index === 0 + // Layout.fillHeight: true + // } + // } + // } + // } + // } Repeater { id: batterySensorsMaskRepeater @@ -197,17 +197,17 @@ RowLayout { } function recalculateSensorsMasks() { - const bmsSensorsModel = bmsSensorsMaskRepeater.bmsSensorsMaskModel + // const bmsSensorsModel = bmsSensorsMaskRepeater.bmsSensorsMaskModel const batterySensorsModel = batterySensorsMaskRepeater.batterySensorsMaskModel const newSize = parseInt(numberOfBoardsField.text) * 4 if (newSize) { - arrayResize(bmsSensorsModel, newSize, false) + // arrayResize(bmsSensorsModel, newSize, false) arrayResize(batterySensorsModel, newSize, true) - bmsSensorsMaskRepeater.model = 0 - bmsSensorsMaskRepeater.bmsSensorsMaskModel = bmsSensorsModel - bmsSensorsMaskRepeater.model = parseInt(numberOfBoardsField.text) + // bmsSensorsMaskRepeater.model = 0 + // bmsSensorsMaskRepeater.bmsSensorsMaskModel = bmsSensorsModel + // bmsSensorsMaskRepeater.model = parseInt(numberOfBoardsField.text) batterySensorsMaskRepeater.model = 0 batterySensorsMaskRepeater.batterySensorsMaskModel = batterySensorsModel @@ -394,7 +394,7 @@ RowLayout { } Controls.SubtitleLabel { - text: qsTr("Upper enable threshold (should be higher than disable), V") + text: qsTr("Upper enable threshold (should be lower than disable), V") maximumLineCount: 3 wrapMode: Text.WordWrap Layout.fillWidth: true @@ -940,26 +940,26 @@ RowLayout { BmsInterface.bmsConfig().setParamValue("noOfCellsSeries", parseInt(numberOfCellsField.text)) const numberOfBoards = parseInt(numberOfBoardsField.text) - const bmsSensorsModel = bmsSensorsMaskRepeater.bmsSensorsMaskModel + // const bmsSensorsModel = bmsSensorsMaskRepeater.bmsSensorsMaskModel const batterySensorsModel = batterySensorsMaskRepeater.batterySensorsMaskModel - let bmsSensorsMask = 0 + // let bmsSensorsMask = 0 let batterySensorsMask = 0 for (let i = 0; i < numberOfBoards * 4; ++i) { - bmsSensorsMask |= Number(bmsSensorsModel[i]) << i + // bmsSensorsMask |= Number(bmsSensorsModel[i]) << i batterySensorsMask |= Number(batterySensorsModel[i]) << i } // disable 3 and 4 sensor for master - bmsSensorsMask = bmsSensorsMask & ~(1 << 2) - bmsSensorsMask = bmsSensorsMask & ~(1 << 3) + // bmsSensorsMask = bmsSensorsMask & ~(1 << 2) + // bmsSensorsMask = bmsSensorsMask & ~(1 << 3) batterySensorsMask = batterySensorsMask & ~(1 << 2) batterySensorsMask = batterySensorsMask & ~(1 << 3) - print(bmsSensorsMask, batterySensorsMask) + // print(bmsSensorsMask, batterySensorsMask) - BmsInterface.bmsConfig().setParamValue("tempEnableMaskBMS", bmsSensorsMask) + // BmsInterface.bmsConfig().setParamValue("tempEnableMaskBMS", bmsSensorsMask) BmsInterface.bmsConfig().setParamValue("tempEnableMaskBattery", batterySensorsMask) BmsInterface.bmsConfig().setParamValue("noOfCellsParallel", parseInt(numberOfParallelCellsField.text)) @@ -1008,17 +1008,17 @@ RowLayout { const numberOfBoards = BmsInterface.bmsConfig().getParamInt("cellMonitorICCount") const numberOfSensorsPerBoard = BmsInterface.bmsConfig().getParamInt("noOfTempSensorPerModule") - const bmsSensorsMask = BmsInterface.bmsConfig().getParamInt("tempEnableMaskBMS") + // const bmsSensorsMask = BmsInterface.bmsConfig().getParamInt("tempEnableMaskBMS") const batterySensorsMask = BmsInterface.bmsConfig().getParamInt("tempEnableMaskBattery") - const bmsSensorsModel = [] + // const bmsSensorsModel = [] const batterySensorsModel = [] for (let i = 0; i < numberOfBoards * numberOfSensorsPerBoard; ++i) { - bmsSensorsModel.push((bmsSensorsMask & (1 << i)) != 0) + // bmsSensorsModel.push((bmsSensorsMask & (1 << i)) != 0) batterySensorsModel.push((batterySensorsMask & (1 << i)) != 0) } - bmsSensorsMaskRepeater.bmsSensorsMaskModel = bmsSensorsModel + // bmsSensorsMaskRepeater.bmsSensorsMaskModel = bmsSensorsModel batterySensorsMaskRepeater.batterySensorsMaskModel = batterySensorsModel numberOfParallelCellsField.text = BmsInterface.bmsConfig().getParamInt("noOfCellsParallel") diff --git a/qml/Screens/TemperatureMonitorScreen.qml b/qml/Screens/TemperatureMonitorScreen.qml index 06c795c..15d98dc 100644 --- a/qml/Screens/TemperatureMonitorScreen.qml +++ b/qml/Screens/TemperatureMonitorScreen.qml @@ -24,7 +24,7 @@ Item { Layout.rightMargin: 10 GridLayout { - columns: 2 + columns: 1 // 2 columnSpacing: 70 rowSpacing: 15 anchors.fill: parent @@ -45,27 +45,27 @@ Item { } Layout.fillWidth: true - Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 + // Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 } - RowLayout { - spacing: 10 - Controls.ContentLabel { - text: qsTr("Minimum BMS temperature, °C") - } + // RowLayout { + // spacing: 10 + // Controls.ContentLabel { + // text: qsTr("Minimum BMS temperature, °C") + // } - Controls.DotSeparator { - Layout.fillWidth: true - } + // Controls.DotSeparator { + // Layout.fillWidth: true + // } - Controls.SubtitleLabel { - id: minBmsTemperatureLabel - text: "-" - } + // Controls.SubtitleLabel { + // id: minBmsTemperatureLabel + // text: "-" + // } - Layout.fillWidth: true - Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 - } + // Layout.fillWidth: true + // Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 + // } RowLayout { spacing: 10 @@ -83,27 +83,27 @@ Item { } Layout.fillWidth: true - Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 + // Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 } - RowLayout { - spacing: 10 - Controls.ContentLabel { - text: qsTr("Average BMS temperature, °C") - } + // RowLayout { + // spacing: 10 + // Controls.ContentLabel { + // text: qsTr("Average BMS temperature, °C") + // } - Controls.DotSeparator { - Layout.fillWidth: true - } + // Controls.DotSeparator { + // Layout.fillWidth: true + // } - Controls.SubtitleLabel { - id: avgBmsTemperatureLabel - text: "-" - } + // Controls.SubtitleLabel { + // id: avgBmsTemperatureLabel + // text: "-" + // } - Layout.fillWidth: true - Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 - } + // Layout.fillWidth: true + // Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 + // } RowLayout { spacing: 10 @@ -121,29 +121,29 @@ Item { } Layout.fillWidth: true - Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 + // Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 } - RowLayout { - spacing: 10 - Controls.ContentLabel { - text: qsTr("Maximum BMS temperature, °C") - } + // RowLayout { + // spacing: 10 + // Controls.ContentLabel { + // text: qsTr("Maximum BMS temperature, °C") + // } - Controls.DotSeparator { - Layout.fillWidth: true - } + // Controls.DotSeparator { + // Layout.fillWidth: true + // } - Controls.SubtitleLabel { - id: maxBmsTemperatureLabel - text: "-" - } + // Controls.SubtitleLabel { + // id: maxBmsTemperatureLabel + // text: "-" + // } - Layout.fillWidth: true - Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 - } + // Layout.fillWidth: true + // Layout.maximumWidth: (parent.width - parent.columnSpacing) / 2 + // } } } @@ -230,9 +230,9 @@ Item { avgBatteryTemperatureLabel.text = MathHelper.roundDouble(values.tempBattAverage) minBatteryTemperatureLabel.text = MathHelper.roundDouble(values.tempBattLow) - maxBmsTemperatureLabel.text = MathHelper.roundDouble(values.tempBMSHigh) - avgBmsTemperatureLabel.text = MathHelper.roundDouble(values.tempBMSAverage) - minBmsTemperatureLabel.text = MathHelper.roundDouble(values.tempBMSLow) + // maxBmsTemperatureLabel.text = MathHelper.roundDouble(values.tempBMSHigh) + // avgBmsTemperatureLabel.text = MathHelper.roundDouble(values.tempBMSAverage) + // minBmsTemperatureLabel.text = MathHelper.roundDouble(values.tempBMSLow) } onAuxReceived: { diff --git a/translations/cubo_en.qm b/translations/cubo_en.qm index 9dad8dffceb9623e88f8b96d9cd0caf25574c6fa..937ea3e78662d66ef3264d8fa715599d03e338ed 100644 GIT binary patch literal 33 ocmcE7ks@*G{hX<16=n7(EZlo{IRgU&YieG6XmAIR#l*-60Q^r2(EtDd literal 23 fcmcE7ks@*G{hX<16=n7(EZlpygMop8iIEWihQJ9+ diff --git a/translations/cubo_en.ts b/translations/cubo_en.ts index 3eaaa01..f107d6e 100644 --- a/translations/cubo_en.ts +++ b/translations/cubo_en.ts @@ -317,11 +317,6 @@ Lower enable threshold (should be higher than disable), V - - - Upper enable threshold (should be higher than disable), V - - @@ -478,6 +473,11 @@ Wait, please. Battery sensors mask for slave board # + + + Upper enable threshold (should be lower than disable), V + + Calibrate "0" diff --git a/translations/cubo_it.qm b/translations/cubo_it.qm index 9dad8dffceb9623e88f8b96d9cd0caf25574c6fa..a732b908337a0f296415feb5936e83dbb1aa9937 100644 GIT binary patch literal 33 ocmcE7ks@*G{hX<16=n7(EZlo{IRgU&Yi3EjXGjN-#l*-60Q_AG&;S4c literal 23 fcmcE7ks@*G{hX<16=n7(EZlpygMop8iIEWihQJ9+ diff --git a/translations/cubo_it.ts b/translations/cubo_it.ts index 55e4344..90fb097 100644 --- a/translations/cubo_it.ts +++ b/translations/cubo_it.ts @@ -317,11 +317,6 @@ Lower enable threshold (should be higher than disable), V - - - Upper enable threshold (should be higher than disable), V - - @@ -478,6 +473,11 @@ Wait, please. Battery sensors mask for slave board # + + + Upper enable threshold (should be lower than disable), V + + Calibrate "0" diff --git a/translations/cubo_ru.qm b/translations/cubo_ru.qm index 8bd9399ffcc4cdb761e24d037f11d82ed7f4dec7..c4b58d0844a3412064b33e3c946d2628e3ae94bd 100644 GIT binary patch delta 1696 zcmX9;eNa?&6g_YE?eg~R+kFArqLDiYNPd8ed-=gV#zbxwGRbb zbRX^~@)X{S2VdU-0xAVt(>5T{Qy3i)2t>RijNSc!D&7+UyLte>w}f#=zW`z~wciEX zD1V`+A`3`ADD+0T>Bn7R(81EvzR;f5**&9l4y6Nl?u0I`=M!L7vNlU+7h1KII(zin zx}SGs0#j0Tecj`Lv4?fPloSB@@p^eoCy?x=kF-<#v~qp?<059R(dSrcPVVbki!P}A zd;QJz^mk5}{$>xQPs!8YN=N~snnm6A^HeTNeCo-Ufr1}IUuiEO|0a%o?8Ug_;^f1W z{<(Q#?0*5kv~^q7j=4q{zt zIN%jIUpy^aNpG5XdJ+@3-`C3Yw(&uRv>QX^i-yukV*u}e4ZHRw0t?#=`;JhakPO4; z^S9ElcI}kjmcQ3HxibQY?l;DG8`#e$jj^8dX>Yi3M;p&muN&LCJ%PaKM3N8OWBe{| z=yt8~l6~mA&e%0)BoLHg>uv z_lKIIK$g_b0&=rRV>b8!#^uschdP3?TWQTn!#Ql&;poq=SVS}NUrk8HIo;wW1FyJ#!-FxA}dqX`d8 z?;jzPrT0wj)%$=@(R8_rFHS8sT^Xu7vc}Z)Q6){dY5I9nJsDM*2F|nq&Q#OmzvF=! z9X?bF?yeypw z3s%cT4t7hx6LRruJg3LWYY!B1&|UK9UvWE3>zBXWMf@;A$qihqpfYH6m!4MZPcb#&uu!0+`PH9-RokjR6NAd!J_+aJi75eKDs)!)f+cZ9MMwwhns$S zdw7;>mIm8i#uQsF+)Lz=m}qHZfk;?k)%h^@tY58J=k&k?r*%PE6MM{UtzOwduF=Do z_N%q=b~6PNthXc@5%Z%eALG!cm#R;OwE~VB)z%RUJnN^9Ie(t{cB}SpSo6%)syi=} zdQG{g7Bz6}lvcH585;9iu@n<%iAXa delta 1714 zcmX9;c}x^{7=5!lvz?tirsA>QTP@%TECM2mf(nQ%qDBxAL{?ZlQX6Ak0k5?Zg2bzJ z@TOH;vD&6B3Lf>0h@v*ecvVrWh+-S1)z+h0P3a^1$L7uK@0;)UzW2WG+ukT_Y!tlF zhx0mLcv`XHVz2Heb9Ns8brkSkBY+QqZXO?oeMuY%OwS`u2EwgA%-=-(1ejR`h>Xcv zPkczM2BcxY=qJQXASIZ{Tv^wEfKcXTY``GmMd0(Yj$WorDg)BT0F#JQUh@|Q1Z4vk zM>G9xhb4cBz7@JLuCw>m8B97;CAnoNUNaq

>9E-brK?;}@Z*YcbHT1xuGmK<+S<96nDv{wTksqaw*Z3_j(-6bX`jxp@yQJ&my{vz*oW@QF*FR{Y8)K*GAB`Rh45<@!8|o-#n%J$=$3WfjiZh+8Hg~tUsOk*ReX6*sh2KrSEpGN> z{6vpf5zHoa31Y?KaKJk_Lp-5aNpGZhVjvT^H;XNy8qnjd2f&I2gwb(e0+d1bw(+%LV=sc~@)I+xl%XT(q~n=?!-#bma9ZhUQ=@K4Y4p z#q}TO>x>VRPH8csT`*|VMVrecs||UiVwHQY=mi*N$)l8ZtnsFt=}O~O5pr&SQqNN4 z;>1J_ALLbc+;nD{ykT)XUu)%WA3S7BTI5r;mw8u>e6E^WB}K{&0n|EaiFQM@d+Uv} zuj>KRP~)5k7T#lyu_*8~XHPb+ecVh(-WWI4P_P+)8?Th|*2qHR)wa3@uQT4+Q9>sk z81I!;lGRG%^OI+Q9H+7M

}_RxExMzyPDtdD<0@_&X(N`3tgnsstTqVJE~ZuD5MY z#rrAl_8kCAU&ZYt-MB(!W-=4zEl@lTwv7M#O2I^>Xh@VnNN7*CkaLp-RQ$H{wDo0wo3jKlk957Fa)hJ zIkIWt@Osnu=ubJi1*SE1zX7A3nl_f!0MUYJ%dre@n1iN@=o!Q!Q}cYbMCes5#1PqK zn>oF-nS;I6Jk>>=QV*GPw{n%a6Ev^EE*#Oe8*E*?<{$Hmsp%Kyee*Yvau0J&Rsb*} zSi5Afc|GR)ulOZ$Eh9sovzK33a+b0n|7J_>HzgeXNFV0cT0U91f&xgEl4ovi#Cw*q z2{xdsVA*_ZHnWvm_StqZzR*(t7oCh4Xt~f<$LP6MUFW-;?#I^DQ*^q2jy1zs%f8CD zu9|zD4s?z3Jvbj*s~^+)e4X`?Oy!5(RF#7q_2eaLr?9htW36ht9?hQbt@f;|W5VsK z{pbnqt_7+)YZ6z*1=X{Uvt~Z47L`-boE_@=k9gj>RNa=HM`_-vmE-83-KНижний порог включения (должен быть выше отключения), В - Upper enable threshold (should be higher than disable), V - Верхний порог включения (должен быть выше отключения), В + Верхний порог включения (должен быть выше отключения), В @@ -523,6 +522,11 @@ Wait, please. Battery sensors mask for slave board # Маска сенсоров батареи для дополнительной платы № + + + Upper enable threshold (should be lower than disable), V + Верхний порог включения (должен быть ниже отключения), В + Calibrate "0"