From eb89c386a33a7f3c8992bbb3940385313300f72a Mon Sep 17 00:00:00 2001 From: Yury Shuvakin Date: Fri, 25 Nov 2022 05:39:37 +0300 Subject: [PATCH] Added reading default network settings --- commands.cpp | 8 ++++ commands.h | 1 + datatypes.h | 5 ++- qml/Screens/NetworkSettingsScreen.qml | 35 ++++++++++------- qml/Screens/TimeSettingsScreen.qml | 1 + translations/cubo_en.ts | 52 +++++++++++++++----------- translations/cubo_it.ts | 52 +++++++++++++++----------- translations/cubo_ru.qm | Bin 22913 -> 23145 bytes translations/cubo_ru.ts | 52 +++++++++++++++----------- 9 files changed, 128 insertions(+), 78 deletions(-) diff --git a/commands.cpp b/commands.cpp index 243a27d..7988b75 100644 --- a/commands.cpp +++ b/commands.cpp @@ -255,6 +255,7 @@ void Commands::processPacket(QByteArray data) } break; case COMM_GET_BMS_NET_SETTINGS: + case COMM_GET_BMS_NET_DEFAULT_SETTINGS: { QStringList settings; settings << vb.mid(0, 250); @@ -347,6 +348,13 @@ void Commands::getNetSettings() emitData(vb); } +void Commands::getNetDefaultSettings() +{ + VByteArray vb; + vb.vbAppendInt8(COMM_GET_BMS_NET_DEFAULT_SETTINGS); + emitData(vb); +} + void Commands::setNetSettings(QStringList settings) { VByteArray vb; diff --git a/commands.h b/commands.h index b98b51c..bc8a7b9 100644 --- a/commands.h +++ b/commands.h @@ -82,6 +82,7 @@ public slots: void getAux(); void getExpansionTemp(); void getNetSettings(); + void getNetDefaultSettings(); void setNetSettings(QStringList settings); void sendTerminalCmd(QString cmd); void setDetect(disp_pos_mode mode); diff --git a/datatypes.h b/datatypes.h index f8a17dd..24f9de8 100644 --- a/datatypes.h +++ b/datatypes.h @@ -416,8 +416,9 @@ typedef enum { COMM_GET_BMS_CELLS, COMM_GET_BMS_AUX, COMM_GET_BMS_EXP_TEMP, - COMM_GET_BMS_NET_SETTINGS = 154, - COMM_SET_BMS_NET_SETTINGS = 156 + COMM_GET_BMS_NET_SETTINGS, + COMM_GET_BMS_NET_DEFAULT_SETTINGS, + COMM_SET_BMS_NET_SETTINGS, } COMM_PACKET_ID; typedef struct { diff --git a/qml/Screens/NetworkSettingsScreen.qml b/qml/Screens/NetworkSettingsScreen.qml index 270b4c5..5e8cfa1 100644 --- a/qml/Screens/NetworkSettingsScreen.qml +++ b/qml/Screens/NetworkSettingsScreen.qml @@ -167,21 +167,30 @@ ColumnLayout { Layout.fillWidth: true } - Controls.Button { - text: qsTr("Apply") - onClicked: { - if (!BmsInterface.isPortConnected()) - return + RowLayout { + spacing: 20 - var settings = [ - firstUrlField.text, - secondUrlField.text, - apnField.text, - userField.text, - passwordField.text, - ] + Controls.OutlineButton { + text: qsTr("Default") + onClicked: BmsInterface.commands().getNetDefaultSettings() + } - BmsInterface.commands().setNetSettings(settings) + Controls.Button { + text: qsTr("Apply") + onClicked: { + if (!BmsInterface.isPortConnected()) + return + + var settings = [ + firstUrlField.text, + secondUrlField.text, + apnField.text, + userField.text, + passwordField.text, + ] + + BmsInterface.commands().setNetSettings(settings) + } } } diff --git a/qml/Screens/TimeSettingsScreen.qml b/qml/Screens/TimeSettingsScreen.qml index 239ff6d..f6df266 100644 --- a/qml/Screens/TimeSettingsScreen.qml +++ b/qml/Screens/TimeSettingsScreen.qml @@ -212,6 +212,7 @@ ColumnLayout { const localTimestamp = (Math.round(date / 1000) - date.getTimezoneOffset() * 60).toString(16) BmsInterface.commands().sendTerminalCmd("setUnixTime " + localTimestamp) + Qt.callLater(BmsInterface.emitStatusMessage, qsTr("Time settings applied successfully"), true) } } } diff --git a/translations/cubo_en.ts b/translations/cubo_en.ts index 44ec989..40de71b 100644 --- a/translations/cubo_en.ts +++ b/translations/cubo_en.ts @@ -14,52 +14,52 @@ - + Number of modules - + Battery voltage, V - + Number of cells - + Nominal capacity, A/h - + Actual capacity, A/h - + Battery temperature, °C - + BMS temperature, °C - + Maximum cell voltage, V - + Minimum cell voltage, V - + Current @@ -492,50 +492,50 @@ Wait, please. - + Network settings applied successfully - - + + Buffer erase - + Buffer erase timeout - + CRC/Size write - + CRC/Size write timeout - + Firmware data write - + Firmware data write timeout - + Firmware update completed! Reconnect to the board if you want to continue working with it. - + Cancelled @@ -782,7 +782,12 @@ Reconnect to the board if you want to continue working with it. - + + Default + + + + Apply @@ -935,6 +940,11 @@ Reconnect to the board if you want to continue working with it. Write to board + + + Time settings applied successfully + + Translator diff --git a/translations/cubo_it.ts b/translations/cubo_it.ts index 28258c1..384f204 100644 --- a/translations/cubo_it.ts +++ b/translations/cubo_it.ts @@ -14,52 +14,52 @@ - + Number of modules - + Battery voltage, V - + Number of cells - + Nominal capacity, A/h - + Actual capacity, A/h - + Battery temperature, °C - + BMS temperature, °C - + Maximum cell voltage, V - + Minimum cell voltage, V - + Current @@ -492,50 +492,50 @@ Wait, please. - + Network settings applied successfully - - + + Buffer erase - + Buffer erase timeout - + CRC/Size write - + CRC/Size write timeout - + Firmware data write - + Firmware data write timeout - + Firmware update completed! Reconnect to the board if you want to continue working with it. - + Cancelled @@ -782,7 +782,12 @@ Reconnect to the board if you want to continue working with it. - + + Default + + + + Apply @@ -935,6 +940,11 @@ Reconnect to the board if you want to continue working with it. Write to board + + + Time settings applied successfully + + Translator diff --git a/translations/cubo_ru.qm b/translations/cubo_ru.qm index d7b9f6eb7ab24910ae4ad57e30c83bcb41e6364b..6ad37d3959a4d21a8553eab2891eca997e4cf27c 100644 GIT binary patch delta 845 zcmXYvYew^=Qf!b^%-R9K1; z>Vs6YA|lJOB3Mu#!YC_}=tEJYkliCn`%pGO4|H8g(% zfJnd^OiTk@iNqp0H;l8uN2~-24+88okmDtOARYpE5)e-@UJN)|h}9Io(B`%JG7MDF z3}ik6)+_?%_5+VID0UUBs}o571U76Vs$f6w0vQj$BkZJ)BW4k|fcrBkzYP51Gr;~H z{Muq5I}E&!^r>3#(F4>izU}XfwKZ4~O^1Z~ai%?m`@|+d7mSsTUO@hi!lvVN=`pPG zb^%%OC^;Gjq;wG%5?`RsK=z_0pf`CGELn;33=UilUx%to8=2HKv}m43jSXD)U<-0rxZJua5_84_S|@2a-luPYl)N z@8Gu70APvbsU@A{ZIrv-(4xdtIV9vXKY!f|%&XzuYud?gr&uh{3Gr!P=1rrDUD}V< zvp}v*l*_TwfH)Rxuth1KMp$x*7s_x|PlI>DKH)F({jKKIP8cCscV@ zaON=N-q*c6(+EWD)xB<}5j@4ZAGhz*$VRcAnIyMpV8(TM*=n_IIbdF)?yezG@;9}% ztCT)MqS|oL2}EC3ubeaj`Wp4tkt%u%v)Xqg6p;Rm(=)0LId#+|Zk&lPCdhkfF9p%! zD>LbuC-{@;r8C@O8c)#VhY1faQVTkQE1T#)6!eQL+-Y#y^)2Pk0mFYLpV9}u^wJ8S zi(qYn#$740w6mqbfKMBh5;T*Um;;`l<6(qSY1{X*qJ3Ol2f#rEu!1LfLm5= TFZYT!c8eIvnHi|`=qLUI&g|S{ delta 836 zcmXAnYeQqN@kuLf|{bfdUg621ZFtzf>-(klUuDH?j(yW1S#IjR9-#3#MqY zVonw;vt-zILMoRh)@%?a-jnck^O*efJ<_6N5eqAT!lx`!c^MF=Sj_Bvy5G;-?FA%! zn(eX2(X5N?@GV+rf|oUarMxT;^BZCT`#n)+nH|cgIz6D+tIQHZ0mn1t&J{Ewk4qnfXq8?$e1~2) z|C*#>7G3@~)%b-5Ao95CZ4>En)T@5p9wGf!$-|;+1abRca*;A3dcwj1%`(wrC$}l_ z;vNTO7akC+j2i*HO*~XhvH81rxMw$glQPlQYX#!3h*vwwl(t$NJxTSle?jKQic?k< zO-%}N%`3HVoVMmFRu`IUfhA|vE%!bGlA4FAGSq%E{f2BoisL4^GgI2ew}`GmO=Tnf znIcGo+^Wl+);5>F0CcHAn$KwiU+&VnXQagnlic1ZZB{Ii@xW0Степень заряда батареи, % - + Number of modules Количество модулей - + Battery voltage, V Напряжение батареи, В - + Number of cells Количество ячеек - + Nominal capacity, A/h Номинальная ёмкость, А/ч - + Actual capacity, A/h Реальная ёмкость, А/ч - + Battery temperature, °C Температура батареи, °C - + BMS temperature, °C Температура BMS, °C - + Maximum cell voltage, V Максимальное напряжение на ячейке, В - + Minimum cell voltage, V Минимальное напряжение на ячейке, В - + Current Ток @@ -509,43 +509,43 @@ Wait, please. Конфигурация BMS установлена - + Network settings applied successfully Настройки сети успешно применены - - + + Buffer erase Стирание буфера - + Buffer erase timeout Таймаут стирания буфера - + CRC/Size write Запись контрольной суммы - + CRC/Size write timeout Таймаут записи контрольной суммы - + Firmware data write Запись данных прошивки - + Firmware data write timeout Таймаут записи данных прошивки - + Firmware update completed! Reconnect to the board if you want to continue working with it. @@ -558,7 +558,7 @@ Reconnect to the board if you want to continue working with it. Обновление прошивки завершено - + Cancelled Отменено @@ -817,7 +817,12 @@ Reconnect to the board if you want to continue working with it. Пароль - + + Default + По умолчанию + + + Apply Применить @@ -970,6 +975,11 @@ Reconnect to the board if you want to continue working with it. Write to board Записать на плату + + + Time settings applied successfully + Настройки времени успешно применены + Translator