Added reading default network settings

2022-11-25 05:39:37 +03:00
parent c231735900
commit eb89c386a3
9 changed files with 128 additions and 78 deletions
--- 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;
--- 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);
--- 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 {
--- 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)
+            }
        }
    }

--- 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)
            }
        }
    }
--- a/translations/cubo_en.ts
+++ b/translations/cubo_en.ts
@@ -14,52 +14,52 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="74"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="72"/>
        <source>Number of modules</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="95"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="91"/>
        <source>Battery voltage, V</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="116"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="110"/>
        <source>Number of cells</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="137"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="129"/>
        <source>Nominal capacity, A/h</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="158"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="148"/>
        <source>Actual capacity, A/h</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="179"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="167"/>
        <source>Battery temperature, °C</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="200"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="186"/>
        <source>BMS temperature, °C</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="234"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="218"/>
        <source>Maximum cell voltage, V</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="255"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="237"/>
        <source>Minimum cell voltage, V</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="276"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="256"/>
        <source>Current</source>
        <translation type="unfinished"></translation>
    </message>
@@ -492,50 +492,50 @@ Wait, please.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="270"/>
+        <location filename="../commands.cpp" line="271"/>
        <source>Network settings applied successfully</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="498"/>
-        <location filename="../commands.cpp" line="659"/>
+        <location filename="../commands.cpp" line="506"/>
+        <location filename="../commands.cpp" line="667"/>
        <source>Buffer erase</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="503"/>
+        <location filename="../commands.cpp" line="511"/>
        <source>Buffer erase timeout</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="511"/>
+        <location filename="../commands.cpp" line="519"/>
        <source>CRC/Size write</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="520"/>
+        <location filename="../commands.cpp" line="528"/>
        <source>CRC/Size write timeout</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="539"/>
+        <location filename="../commands.cpp" line="547"/>
        <source>Firmware data write</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="548"/>
+        <location filename="../commands.cpp" line="556"/>
        <source>Firmware data write timeout</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="576"/>
+        <location filename="../commands.cpp" line="584"/>
        <source>Firmware update completed!

 Reconnect to the board if you want to continue working with it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="696"/>
+        <location filename="../commands.cpp" line="704"/>
        <source>Cancelled</source>
        <translation type="unfinished"></translation>
    </message>
@@ -782,7 +782,12 @@ Reconnect to the board if you want to continue working with it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="171"/>
+        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="174"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="179"/>
        <source>Apply</source>
        <translation type="unfinished"></translation>
    </message>
@@ -935,6 +940,11 @@ Reconnect to the board if you want to continue working with it.</source>
        <source>Write to board</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../qml/Screens/TimeSettingsScreen.qml" line="215"/>
+        <source>Time settings applied successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Translator</name>
--- a/translations/cubo_it.ts
+++ b/translations/cubo_it.ts
@@ -14,52 +14,52 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="74"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="72"/>
        <source>Number of modules</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="95"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="91"/>
        <source>Battery voltage, V</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="116"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="110"/>
        <source>Number of cells</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="137"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="129"/>
        <source>Nominal capacity, A/h</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="158"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="148"/>
        <source>Actual capacity, A/h</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="179"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="167"/>
        <source>Battery temperature, °C</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="200"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="186"/>
        <source>BMS temperature, °C</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="234"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="218"/>
        <source>Maximum cell voltage, V</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="255"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="237"/>
        <source>Minimum cell voltage, V</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="276"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="256"/>
        <source>Current</source>
        <translation type="unfinished"></translation>
    </message>
@@ -492,50 +492,50 @@ Wait, please.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="270"/>
+        <location filename="../commands.cpp" line="271"/>
        <source>Network settings applied successfully</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="498"/>
-        <location filename="../commands.cpp" line="659"/>
+        <location filename="../commands.cpp" line="506"/>
+        <location filename="../commands.cpp" line="667"/>
        <source>Buffer erase</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="503"/>
+        <location filename="../commands.cpp" line="511"/>
        <source>Buffer erase timeout</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="511"/>
+        <location filename="../commands.cpp" line="519"/>
        <source>CRC/Size write</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="520"/>
+        <location filename="../commands.cpp" line="528"/>
        <source>CRC/Size write timeout</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="539"/>
+        <location filename="../commands.cpp" line="547"/>
        <source>Firmware data write</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="548"/>
+        <location filename="../commands.cpp" line="556"/>
        <source>Firmware data write timeout</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="576"/>
+        <location filename="../commands.cpp" line="584"/>
        <source>Firmware update completed!

 Reconnect to the board if you want to continue working with it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="696"/>
+        <location filename="../commands.cpp" line="704"/>
        <source>Cancelled</source>
        <translation type="unfinished"></translation>
    </message>
@@ -782,7 +782,12 @@ Reconnect to the board if you want to continue working with it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="171"/>
+        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="174"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="179"/>
        <source>Apply</source>
        <translation type="unfinished"></translation>
    </message>
@@ -935,6 +940,11 @@ Reconnect to the board if you want to continue working with it.</source>
        <source>Write to board</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="../qml/Screens/TimeSettingsScreen.qml" line="215"/>
+        <source>Time settings applied successfully</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>Translator</name>
--- a/translations/cubo_ru.qm
+++ b/translations/cubo_ru.qm
--- a/translations/cubo_ru.ts
+++ b/translations/cubo_ru.ts
@@ -14,52 +14,52 @@
        <translation>Степень заряда батареи, %</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="74"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="72"/>
        <source>Number of modules</source>
        <translation>Количество модулей</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="95"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="91"/>
        <source>Battery voltage, V</source>
        <translation>Напряжение батареи, В</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="116"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="110"/>
        <source>Number of cells</source>
        <translation>Количество ячеек</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="137"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="129"/>
        <source>Nominal capacity, A/h</source>
        <translation>Номинальная ёмкость, А/ч</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="158"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="148"/>
        <source>Actual capacity, A/h</source>
        <translation>Реальная ёмкость, А/ч</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="179"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="167"/>
        <source>Battery temperature, °C</source>
        <translation>Температура батареи, °C</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="200"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="186"/>
        <source>BMS temperature, °C</source>
        <translation>Температура BMS, °C</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="234"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="218"/>
        <source>Maximum cell voltage, V</source>
        <translation>Максимальное напряжение на ячейке, В</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="255"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="237"/>
        <source>Minimum cell voltage, V</source>
        <translation>Минимальное напряжение на ячейке, В</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="276"/>
+        <location filename="../qml/Screens/AkbMonitorScreen.qml" line="256"/>
        <source>Current</source>
        <translation>Ток</translation>
    </message>
@@ -509,43 +509,43 @@ Wait, please.</source>
        <translation>Конфигурация BMS установлена</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="270"/>
+        <location filename="../commands.cpp" line="271"/>
        <source>Network settings applied successfully</source>
        <translation>Настройки сети успешно применены</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="498"/>
-        <location filename="../commands.cpp" line="659"/>
+        <location filename="../commands.cpp" line="506"/>
+        <location filename="../commands.cpp" line="667"/>
        <source>Buffer erase</source>
        <translation>Стирание буфера</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="503"/>
+        <location filename="../commands.cpp" line="511"/>
        <source>Buffer erase timeout</source>
        <translation>Таймаут стирания буфера</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="511"/>
+        <location filename="../commands.cpp" line="519"/>
        <source>CRC/Size write</source>
        <translation>Запись контрольной суммы</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="520"/>
+        <location filename="../commands.cpp" line="528"/>
        <source>CRC/Size write timeout</source>
        <translation>Таймаут записи контрольной суммы</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="539"/>
+        <location filename="../commands.cpp" line="547"/>
        <source>Firmware data write</source>
        <translation>Запись данных прошивки</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="548"/>
+        <location filename="../commands.cpp" line="556"/>
        <source>Firmware data write timeout</source>
        <translation>Таймаут записи данных прошивки</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="576"/>
+        <location filename="../commands.cpp" line="584"/>
        <source>Firmware update completed!

 Reconnect to the board if you want to continue working with it.</source>
@@ -558,7 +558,7 @@ Reconnect to the board if you want to continue working with it.</source>
        <translation type="vanished">Обновление прошивки завершено</translation>
    </message>
    <message>
-        <location filename="../commands.cpp" line="696"/>
+        <location filename="../commands.cpp" line="704"/>
        <source>Cancelled</source>
        <translation>Отменено</translation>
    </message>
@@ -817,7 +817,12 @@ Reconnect to the board if you want to continue working with it.</source>
        <translation>Пароль</translation>
    </message>
    <message>
-        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="171"/>
+        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="174"/>
+        <source>Default</source>
+        <translation>По умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../qml/Screens/NetworkSettingsScreen.qml" line="179"/>
        <source>Apply</source>
        <translation>Применить</translation>
    </message>
@@ -970,6 +975,11 @@ Reconnect to the board if you want to continue working with it.</source>
        <source>Write to board</source>
        <translation>Записать на плату</translation>
    </message>
+    <message>
+        <location filename="../qml/Screens/TimeSettingsScreen.qml" line="215"/>
+        <source>Time settings applied successfully</source>
+        <translation>Настройки времени успешно применены</translation>
+    </message>
 </context>
 <context>
    <name>Translator</name>