diff --git a/commands.cpp b/commands.cpp
index 592c1b8..243a27d 100644
--- a/commands.cpp
+++ b/commands.cpp
@@ -265,6 +265,11 @@ void Commands::processPacket(QByteArray data)
emit netSettingsReceived(settings);
break;
}
+ case COMM_SET_BMS_NET_SETTINGS:
+ {
+ emit ackReceived(tr("Network settings applied successfully"));
+ break;
+ }
default:
break;
}
diff --git a/qml/Controls/ChartView.qml b/qml/Controls/ChartView.qml
index b358979..0fb5961 100644
--- a/qml/Controls/ChartView.qml
+++ b/qml/Controls/ChartView.qml
@@ -24,6 +24,9 @@ ChartView {
property bool autoScaling: true
property int selectedSeriesIndex: 0
+ property string infoXMark: ""
+ property string infoYMark: ""
+
ValueAxis {
id: valueAxisX
min: 0
@@ -183,7 +186,7 @@ ChartView {
if (currentX < chart.series(selectedSeriesIndex).count && currentX > 0) {
selectedPoint = chart.series(selectedSeriesIndex).at(currentX)
- currentPointInfoLabel.text = selectedPoint.x + ", " +selectedPoint.y
+ currentPointInfoLabel.text = selectedPoint.x + " " + infoXMark + ", " + selectedPoint.y + " " + infoYMark
} else {
currentPointInfo.visible = false
}
diff --git a/qml/Screens/VisualizationScreen.qml b/qml/Screens/VisualizationScreen.qml
index 4e01bb2..98cfb6a 100644
--- a/qml/Screens/VisualizationScreen.qml
+++ b/qml/Screens/VisualizationScreen.qml
@@ -148,6 +148,8 @@ ColumnLayout {
RowLayout {
property string xLabel: ""
property string yLabel: ""
+ property string infoXLabel: ""
+ property string infoYLabel: ""
property Controls.ChartView chart: chartView
property int seriesCount: 0
property bool horizontalLegend: true
@@ -165,6 +167,8 @@ ColumnLayout {
Controls.ChartView {
id: chartView
+ infoXMark: infoXLabel
+ infoYMark: infoYLabel
Layout.fillWidth: true
Layout.fillHeight: true
}
@@ -222,6 +226,8 @@ ColumnLayout {
Component.onCompleted: {
item.xLabel = Qt.binding(function() { return qsTr("Time, s") })
item.yLabel = Qt.binding(function() { return qsTr("Voltage, V") })
+ item.infoXLabel = Qt.binding(function() { return qsTr("s") })
+ item.infoYLabel = Qt.binding(function() { return qsTr("V") })
}
}
@@ -235,6 +241,8 @@ ColumnLayout {
Component.onCompleted: {
item.xLabel = Qt.binding(function() { return qsTr("Time, s") })
item.yLabel = Qt.binding(function() { return qsTr("Current, A") })
+ item.infoXLabel = Qt.binding(function() { return qsTr("s") })
+ item.infoYLabel = Qt.binding(function() { return qsTr("A") })
}
}
@@ -248,6 +256,8 @@ ColumnLayout {
Component.onCompleted: {
item.xLabel = Qt.binding(function() { return qsTr("Time, s") })
item.yLabel = Qt.binding(function() { return qsTr("Temperature, °C") })
+ item.infoXLabel = Qt.binding(function() { return qsTr("s") })
+ item.infoYLabel = Qt.binding(function() { return qsTr("°C") })
}
}
@@ -261,6 +271,8 @@ ColumnLayout {
Component.onCompleted: {
item.xLabel = Qt.binding(function() { return qsTr("Time, s") })
item.yLabel = Qt.binding(function() { return qsTr("Temperature, °C") })
+ item.infoXLabel = Qt.binding(function() { return qsTr("s") })
+ item.infoYLabel = Qt.binding(function() { return qsTr("°C") })
}
}
@@ -274,6 +286,8 @@ ColumnLayout {
Component.onCompleted: {
item.xLabel = Qt.binding(function() { return qsTr("Time, s") })
item.yLabel = Qt.binding(function() { return qsTr("Voltage, V") })
+ item.infoXLabel = Qt.binding(function() { return qsTr("s") })
+ item.infoYLabel = Qt.binding(function() { return qsTr("V") })
}
}
@@ -287,6 +301,8 @@ ColumnLayout {
Component.onCompleted: {
item.xLabel = Qt.binding(function() { return qsTr("Time, s") })
item.yLabel = Qt.binding(function() { return qsTr("Voltage, V") })
+ item.infoXLabel = Qt.binding(function() { return qsTr("s") })
+ item.infoYLabel = Qt.binding(function() { return qsTr("V") })
item.horizontalLegend = false
}
}
diff --git a/translations/cubo_en.ts b/translations/cubo_en.ts
index 26803db..c9fcea8 100644
--- a/translations/cubo_en.ts
+++ b/translations/cubo_en.ts
@@ -487,45 +487,50 @@ Wait, please.
-
-
- Buffer erase
+
+ 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
@@ -867,115 +872,143 @@ Reconnect to the board if you want to continue working with it.
-
-
-
-
-
-
+
+
+
+
+
+
Time, s
-
-
-
+
+
+
Voltage, V
-
+
+
+
+
+
+
+ s
+
+
+
+
+
+
+ V
+
+
+
+
Current, A
-
-
+
+ A
+
+
+
+
+
Temperature, °C
-
+
+
+ °C
+
+
+
+
Pause data collection
-
+
Resume data collection
-
+
Clear data
-
+
Reset zoom
-
+
Interval, s
-
-
+
+
Cell #
-
-
+
+
Voltage indicator
-
-
+
+
Current indicator
-
-
-
-
+
+
+
+
Maximum temperature
-
-
-
-
+
+
+
+
Average temperature
-
-
-
-
+
+
+
+
Minimum temperature
-
-
+
+
Maximum voltage
-
-
+
+
Average voltage
-
-
+
+
Minimum voltage
diff --git a/translations/cubo_it.ts b/translations/cubo_it.ts
index eea02ed..16ba504 100644
--- a/translations/cubo_it.ts
+++ b/translations/cubo_it.ts
@@ -487,45 +487,50 @@ Wait, please.
-
-
- Buffer erase
+
+ 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
@@ -867,115 +872,143 @@ Reconnect to the board if you want to continue working with it.
-
-
-
-
-
-
+
+
+
+
+
+
Time, s
-
-
-
+
+
+
Voltage, V
-
+
+
+
+
+
+
+ s
+
+
+
+
+
+
+ V
+
+
+
+
Current, A
-
-
+
+ A
+
+
+
+
+
Temperature, °C
-
+
+
+ °C
+
+
+
+
Pause data collection
-
+
Resume data collection
-
+
Clear data
-
+
Reset zoom
-
+
Interval, s
-
-
+
+
Cell #
-
-
+
+
Voltage indicator
-
-
+
+
Current indicator
-
-
-
-
+
+
+
+
Maximum temperature
-
-
-
-
+
+
+
+
Average temperature
-
-
-
-
+
+
+
+
Minimum temperature
-
-
+
+
Maximum voltage
-
-
+
+
Average voltage
-
-
+
+
Minimum voltage
diff --git a/translations/cubo_ru.qm b/translations/cubo_ru.qm
index fbb637e..6d191b2 100644
Binary files a/translations/cubo_ru.qm and b/translations/cubo_ru.qm differ
diff --git a/translations/cubo_ru.ts b/translations/cubo_ru.ts
index cfa3486..f980922 100644
--- a/translations/cubo_ru.ts
+++ b/translations/cubo_ru.ts
@@ -504,38 +504,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.
@@ -548,7 +553,7 @@ Reconnect to the board if you want to continue working with it.
Обновление прошивки завершено
-
+
Cancelled
Отменено
@@ -902,115 +907,143 @@ Reconnect to the board if you want to continue working with it.
Список ячеек
-
-
-
-
-
-
+
+
+
+
+
+
Time, s
Время, c
-
-
-
+
+
+
Voltage, V
Напряжение, В
-
+
+
+
+
+
+
+ s
+ с
+
+
+
+
+
+ V
+ В
+
+
+
Current, A
Ток, А
-
-
+
+ A
+ А
+
+
+
+
Temperature, °C
Температура, °C
-
+
+
+ °C
+ °C
+
+
+
Pause data collection
Приостановить сбор данных
-
+
Resume data collection
Продолжить сбор данных
-
+
Clear data
Очистить данные
-
+
Reset zoom
Сбросить масштаб
-
+
Interval, s
Интервал, с
-
-
+
+
Cell #
Ячейка №
-
-
+
+
Voltage indicator
Показатель вольтажа
-
-
+
+
Current indicator
Показатель тока
-
-
-
-
+
+
+
+
Maximum temperature
Максимальная температура
-
-
-
-
+
+
+
+
Average temperature
Средняя температура
-
-
-
-
+
+
+
+
Minimum temperature
Минимальная температура
-
-
+
+
Maximum voltage
Максимальное напряжение
-
-
+
+
Average voltage
Среднее напряжение
-
-
+
+
Minimum voltage
Минимальное напряжение