diff --git a/res/files/history.txt b/res/files/history.txt
index cfe99228..5689f1af 100644
--- a/res/files/history.txt
+++ b/res/files/history.txt
@@ -20,6 +20,7 @@ V7.4.0 2025年xx月xx日
bug修复:
01. udp服务器发送数据失败时,服务器被关闭(修复方案:离线客户端将被移除)
02. 从文件菜单新建窗口时,页面显示异常
+ 03. modbus都输入寄存器指令错误
优化:
01. 图表数据显示
diff --git a/res/translations/xTools_zh_CN.ts b/res/translations/xTools_zh_CN.ts
index eb459019..6ac9c98a 100644
--- a/res/translations/xTools_zh_CN.ts
+++ b/res/translations/xTools_zh_CN.ts
@@ -1951,7 +1951,7 @@ li.checked::marker { content: "\2612"; }
0x04-ReadInputRegisters
- 0x40-读输入寄存器
+ 0x04-读输入寄存器
diff --git a/src/page/page.cpp b/src/page/page.cpp
index fcc3e136..724e9a25 100644
--- a/src/page/page.cpp
+++ b/src/page/page.cpp
@@ -480,7 +480,10 @@ void Page::onInputFormatChanged()
// If the input panels are visible, hide the line edit or plain text edit
// to make ui simple.
bool rightPanelVisible = ui->widgetInputPanels->isVisible();
- if (!rightPanelVisible) {
+ if (rightPanelVisible) {
+ ui->lineEditInput->setVisible(true);
+ ui->plainTextEditInput->setVisible(true);
+ } else {
ui->lineEditInput->setVisible(usingLineEdit);
ui->plainTextEditInput->setVisible(!usingLineEdit);
}
diff --git a/src/page/panels/inputpanels/inputpanelsmanager.cpp b/src/page/panels/inputpanels/inputpanelsmanager.cpp
index 7faa90a7..b5c4eae6 100644
--- a/src/page/panels/inputpanels/inputpanelsmanager.cpp
+++ b/src/page/panels/inputpanels/inputpanelsmanager.cpp
@@ -16,8 +16,8 @@ InputPanelsManager::InputPanelsManager(QWidget *parent)
: PanelManager(parent)
{
addPanel(tr("Lua Script"), ":/res/icons/lua.svg");
- addPanel(tr("Frame Serial Number"), ":/res/icons/counter_1.svg");
#if 0
+ addPanel(tr("Frame Serial Number"), ":/res/icons/counter_1.svg");
addPanel(tr("XYModem Sender"), ":/res/icons/xy.svg");
#endif
}
diff --git a/src/tools/modbus/modbusassistant.cpp b/src/tools/modbus/modbusassistant.cpp
index 6ecb8011..1dc0f585 100644
--- a/src/tools/modbus/modbusassistant.cpp
+++ b/src/tools/modbus/modbusassistant.cpp
@@ -232,14 +232,14 @@ void ModbusAssistant::initComponentParity()
void ModbusAssistant::initComponentFunctionCode()
{
- const QString str0x01 = tr("0x01-ReadCoils");
- const QString str0x02 = tr("0x02-ReadDiscreteInputs");
- const QString str0x03 = tr("0x03-ReadHoldingRegisters");
- const QString str0x04 = tr("0x04-ReadInputRegisters");
- const QString str0x05 = tr("0x05-WriteSingleCoil");
- const QString str0x06 = tr("0x06-WriteSingleRegister");
- const QString str0x0f = tr("0x0f-WriteMultipleCoils");
- const QString str0x10 = tr("0x10-WriteMultipleRegisters");
+ const QString str0x01 = "0x01-" + tr("ReadCoils");
+ const QString str0x02 = "0x02-" + tr("ReadDiscreteInputs");
+ const QString str0x03 = "0x03-" + tr("ReadHoldingRegisters");
+ const QString str0x04 = "0x04-" + tr("ReadInputRegisters");
+ const QString str0x05 = "0x05-" + tr("WriteSingleCoil");
+ const QString str0x06 = "0x06-" + tr("WriteSingleRegister");
+ const QString str0x0f = "0x0f-" + tr("WriteMultipleCoils");
+ const QString str0x10 = "0x10-" + tr("WriteMultipleRegisters");
int func0x01 = QModbusDataUnit::Coils;
int func0x02 = QModbusDataUnit::DiscreteInputs;