Fix & update

> Исправлено окно настроек (Период опроса плат и раздел сетевого адреса)
> Исправлено значение Odd Parity при передаче
> Добавлена возможность остановить опрос платы

Добавлен модуль LineRinger для опроса Modbus устройств.
This commit is contained in:
2025-03-12 11:05:14 +03:00
parent 568ec9b5d3
commit 7dc314d266
15 changed files with 12531 additions and 11070 deletions

21
Debug/.qmake.stash Normal file
View File

@@ -0,0 +1,21 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++ \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/i686-w64-mingw32 \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include/c++/backward \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0/include-fixed \
C:/Qt/Qt5.14.2/Tools/mingw730_32/i686-w64-mingw32/include
QMAKE_CXX.LIBDIRS = \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib/gcc/i686-w64-mingw32/7.3.0 \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib/gcc \
C:/Qt/Qt5.14.2/Tools/mingw730_32/i686-w64-mingw32/lib \
C:/Qt/Qt5.14.2/Tools/mingw730_32/lib

BIN
Debug/debug/M3KTE_TERM.exe Normal file

Binary file not shown.

View File

@@ -16,6 +16,9 @@ CONFIG += c++11
# deprecated API in order to know how to port your code away from it. # deprecated API in order to know how to port your code away from it.
DEFINES += QT_DEPRECATED_WARNINGS DEFINES += QT_DEPRECATED_WARNINGS
TEMPLATE = lib
DEFINES += M3KTE_LIBRARY
# You can also make your code fail to compile if it uses deprecated APIs. # You can also make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line. # In order to do so, uncomment the following line.
# You can also select to disable deprecated APIs only up to a certain version of Qt. # You can also select to disable deprecated APIs only up to a certain version of Qt.
@@ -23,6 +26,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
SOURCES += \ SOURCES += \
devicesettingsdialog.cpp \ devicesettingsdialog.cpp \
lineringer.cpp \
main.cpp \ main.cpp \
m3kte.cpp \ m3kte.cpp \
multiplesettings.cpp \ multiplesettings.cpp \
@@ -32,6 +36,7 @@ SOURCES += \
HEADERS += \ HEADERS += \
devicesettingsdialog.h \ devicesettingsdialog.h \
lineringer.h \
m3kte.h \ m3kte.h \
multiplesettings.h \ multiplesettings.h \
scanboard.h \ scanboard.h \
@@ -40,12 +45,18 @@ HEADERS += \
FORMS += \ FORMS += \
devicesettingsdialog.ui \ devicesettingsdialog.ui \
lineringer.ui \
m3kte.ui \ m3kte.ui \
multiplesettings.ui \ multiplesettings.ui \
scanboard.ui \ scanboard.ui \
settingsdialog.ui settingsdialog.ui
# Default rules for deployment. # Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin #qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin #else: unix:!android: target.path = /opt/$${TARGET}/bin
#!isEmpty(target.path): INSTALLS += target
unix {
target.path = /usr/lib
}
!isEmpty(target.path): INSTALLS += target !isEmpty(target.path): INSTALLS += target

View File

@@ -55,7 +55,7 @@ void DeviceSettingsDialog::on_buttonApplyChangeParity_clicked()
void DeviceSettingsDialog::on_buttonApplyChangeAdr_clicked() void DeviceSettingsDialog::on_buttonApplyChangeAdr_clicked()
{ {
BoardIdHasBeenChanged* _boardIdHasBeenChanged = new BoardIdHasBeenChanged(ui->idComboBox->currentIndex(), ui->adrSpinBox->value()); BoardIdHasBeenChanged* _boardIdHasBeenChanged = new BoardIdHasBeenChanged(ui->idComboBox->currentText().toUInt(), ui->adrSpinBox->value());
QCoreApplication::postEvent(parent(), _boardIdHasBeenChanged); QCoreApplication::postEvent(parent(), _boardIdHasBeenChanged);
close(); close();
} }
@@ -75,22 +75,25 @@ unsigned short DeviceSettingsDialog::currentParity()
return _currentParity; return _currentParity;
} }
void DeviceSettingsDialog::updateSettingsAfterConnection(unsigned tmp_speed, unsigned tmp_parity, unsigned *tmp_adr, int CurrentConnectedDevice) void DeviceSettingsDialog::updateSettingsAfterConnection(unsigned tmp_speed, unsigned tmp_parity, unsigned *tmp_adr, bool *ActiveDevices)
{ {
ui->speedBox->setCurrentText(QString::number(_currentSpeed=tmp_speed, 10)); ui->speedBox->setCurrentText(QString::number(_currentSpeed=tmp_speed, 10));
if(tmp_parity>0) if(tmp_parity>0)
tmp_parity--; tmp_parity--;
ui->parityBox->setCurrentIndex(_currentParity = tmp_parity); ui->parityBox->setCurrentIndex(_currentParity = tmp_parity);
for(int i = 0; i < CurrentConnectedDevice; i++) for(int i = 0; i < 4; i++)
{
if(ActiveDevices[i])
{ {
_m_timer[i]->setEnabled(true); _m_timer[i]->setEnabled(true);
ui->idComboBox->addItem(QString::number(i)); ui->idComboBox->addItem(QString::number(i));
_currentAdrs[i] = tmp_adr[i]; _currentAdrs[i] = tmp_adr[i];
} }
for(int i = CurrentConnectedDevice; i < 4; i++) else
{ {
_m_timer[i]->setEnabled(false); _m_timer[i]->setEnabled(false);
} }
}
on_idComboBox_currentIndexChanged(ui->idComboBox->currentIndex()); on_idComboBox_currentIndexChanged(ui->idComboBox->currentIndex());
} }
@@ -129,3 +132,25 @@ void DeviceSettingsDialog::on_buttonBox_clicked(QAbstractButton *button)
break; break;
} }
} }
void DeviceSettingsDialog::initPollForBoard(unsigned boardID, unsigned boardAdr)
{
ui->idPollComboBox->addItem(QString("Плата №%1 (ID %2)").arg(boardID).arg(boardAdr), QVariant(boardID));
}
void DeviceSettingsDialog::updatePollStatus(unsigned boardID, bool status)
{
_currentPollStatus[boardID] = status;
}
void DeviceSettingsDialog::on_buttonApplyChangePoll_clicked()
{
updatePollStatus(ui->idPollComboBox->currentData().toUInt(), (bool)ui->pollStatusBox->currentIndex());
pollStatusChange* _pollStatusChanged = new pollStatusChange(ui->idPollComboBox->currentData().toUInt(), _currentPollStatus[ui->idPollComboBox->currentData().toUInt()]);
QCoreApplication::postEvent(parent(), _pollStatusChanged);
}
void DeviceSettingsDialog::on_idPollComboBox_currentIndexChanged(int index)
{
ui->pollStatusBox->setCurrentIndex(_currentPollStatus[ui->idPollComboBox->currentData().toUInt()]);
}

View File

@@ -21,6 +21,20 @@ private:
short _BoardNewID; short _BoardNewID;
}; };
class pollStatusChange : public QEvent
{
public:
pollStatusChange(unsigned BoardID, bool Stat) : QEvent((QEvent::Type)1001) {_BoardID = BoardID; _Status = Stat;}
~pollStatusChange() {}
unsigned BoardID() const {return _BoardID;}
bool Status() const {return _Status;}
private:
unsigned _BoardID;
bool _Status;
};
namespace Ui { namespace Ui {
class DeviceSettingsDialog; class DeviceSettingsDialog;
} }
@@ -36,7 +50,9 @@ public:
unsigned currentBoardTimer(unsigned short _ID); unsigned currentBoardTimer(unsigned short _ID);
unsigned currentSpeed(); unsigned currentSpeed();
unsigned short currentParity(); unsigned short currentParity();
void updateSettingsAfterConnection(unsigned tmp_speed, unsigned tmp_parity, unsigned *tmp_adr, int CurrentConnectedDevice); void updateSettingsAfterConnection(unsigned tmp_speed, unsigned tmp_parity, unsigned *tmp_adr, bool *ActiveDevices);
void updatePollStatus(unsigned boardID, bool status);
void initPollForBoard(unsigned boardID, unsigned boardAdr);
signals: signals:
void parityChanged(); void parityChanged();
void speedChanged(); void speedChanged();
@@ -59,12 +75,17 @@ private slots:
void on_buttonBox_clicked(QAbstractButton *button); void on_buttonBox_clicked(QAbstractButton *button);
void on_buttonApplyChangePoll_clicked();
void on_idPollComboBox_currentIndexChanged(int index);
private: private:
QSpinBox *_m_timer[4]; QSpinBox *_m_timer[4];
unsigned _currentBoardTimers[4]; unsigned _currentBoardTimers[4];
unsigned _currentSpeed; unsigned _currentSpeed;
unsigned short _currentParity; unsigned short _currentParity;
unsigned _currentAdrs[4]; unsigned _currentAdrs[4];
bool _currentPollStatus[4];
Ui::DeviceSettingsDialog *ui; Ui::DeviceSettingsDialog *ui;
}; };

View File

@@ -6,77 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>243</width> <width>278</width>
<height>431</height> <height>500</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Скорость обмена</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QPushButton" name="buttonApplyChangeSpeed">
<property name="text">
<string>Применить</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QComboBox" name="speedBox">
<property name="currentIndex">
<number>3</number>
</property>
<item>
<property name="text">
<string>9600</string>
</property>
</item>
<item>
<property name="text">
<string>14400</string>
</property>
</item>
<item>
<property name="text">
<string>19200</string>
</property>
</item>
<item>
<property name="text">
<string>31250</string>
</property>
</item>
<item>
<property name="text">
<string>38400</string>
</property>
</item>
<item>
<property name="text">
<string>56000</string>
</property>
</item>
<item>
<property name="text">
<string>57600</string>
</property>
</item>
<item>
<property name="text">
<string>115200</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
@@ -188,6 +125,41 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Контроль четности</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="1">
<widget class="QPushButton" name="buttonApplyChangeParity">
<property name="text">
<string>Применить</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QComboBox" name="parityBox">
<item>
<property name="text">
<string>No</string>
</property>
</item>
<item>
<property name="text">
<string>Even</string>
</property>
</item>
<item>
<property name="text">
<string>Odd</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
@@ -221,7 +193,70 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Скорость обмена</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QPushButton" name="buttonApplyChangeSpeed">
<property name="text">
<string>Применить</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QComboBox" name="speedBox">
<property name="currentIndex">
<number>3</number>
</property>
<item>
<property name="text">
<string>9600</string>
</property>
</item>
<item>
<property name="text">
<string>14400</string>
</property>
</item>
<item>
<property name="text">
<string>19200</string>
</property>
</item>
<item>
<property name="text">
<string>31250</string>
</property>
</item>
<item>
<property name="text">
<string>38400</string>
</property>
</item>
<item>
<property name="text">
<string>56000</string>
</property>
</item>
<item>
<property name="text">
<string>57600</string>
</property>
</item>
<item>
<property name="text">
<string>115200</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item row="5" column="0">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@@ -231,38 +266,36 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="4" column="0">
<widget class="QGroupBox" name="groupBox_4"> <widget class="QGroupBox" name="groupBox_5">
<property name="title"> <property name="title">
<string>Контроль четности</string> <string>Опрос ТЭ</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QComboBox" name="idPollComboBox"/>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="buttonApplyChangeParity"> <widget class="QComboBox" name="pollStatusBox">
<item>
<property name="text">
<string>Вкл</string>
</property>
</item>
<item>
<property name="text">
<string>Выкл</string>
</property>
</item>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="buttonApplyChangePoll">
<property name="text"> <property name="text">
<string>Применить</string> <string>Применить</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QComboBox" name="parityBox">
<item>
<property name="text">
<string>No</string>
</property>
</item>
<item>
<property name="text">
<string>Even</string>
</property>
</item>
<item>
<property name="text">
<string>Odd</string>
</property>
</item>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

315
M3KTE_TERM/lineringer.cpp Normal file
View File

@@ -0,0 +1,315 @@
#include "lineringer.h"
#include "ui_lineringer.h"
LineRinger::LineRinger(QWidget *parent) :
QWidget(parent),
ui(new Ui::LineRinger)
{
ui->setupUi(this);
const auto listPorts = QSerialPortInfo::availablePorts();
for (const auto& port: listPorts)
{
ui->comBox->addItem(QString(port.portName() + ": " + port.manufacturer()), QVariant(port.portName()));
}
ui->parityControlBox->addItem("No", QVariant(QSerialPort::NoParity));
ui->parityControlBox->addItem("Even", QVariant(QSerialPort::EvenParity));
ui->parityControlBox->addItem("Odd", QVariant(QSerialPort::OddParity));
ui->parityControlBox->addItem("Space", QVariant(QSerialPort::SpaceParity));
ui->parityControlBox->addItem("Mark", QVariant(QSerialPort::MarkParity));
ui->dataBox->addItem("Data5", QVariant(QSerialPort::Data5));
ui->dataBox->addItem("Data6", QVariant(QSerialPort::Data6));
ui->dataBox->addItem("Data7", QVariant(QSerialPort::Data7));
ui->dataBox->addItem("Data8", QVariant(QSerialPort::Data8));
ui->dataBox->setCurrentIndex(3);
ui->stopBox->addItem("One", QVariant(QSerialPort::OneStop));
ui->stopBox->addItem("OneAndHalf", QVariant(QSerialPort::OneAndHalfStop));
ui->stopBox->addItem("Two", QVariant(QSerialPort::TwoStop));
ui->deviceOnlineView->horizontalHeader()->setVisible(true);
syncColumnHeaders();
ui->deviceOnlineView->setColumnHidden(1, true);
ui->ringButton->setEnabled(false);
modbusDevice = new QModbusRtuSerialMaster(this);
}
LineRinger::~LineRinger()
{
if (modbusDevice->state() == QModbusDevice::ConnectedState)
on_connectButton_clicked();
delete ui;
}
void LineRinger::syncColumnHeaders()
{
QStringList headers;
headers << "ID" << "BaudRate" << "Vendor Name" << "Product Code" << "Major Minor Revision" << "Vendor Url" << "Product Name" << "Model Name" << "User Application Name" << "Примечание";
ui->deviceOnlineView->setHorizontalHeaderLabels(headers);
ui->deviceOnlineView->resizeColumnsToContents();
}
void LineRinger::on_connectButton_clicked()
{
if (!modbusDevice)
return;
if (modbusDevice->state() != QModbusDevice::ConnectedState) {
modbusDevice->setConnectionParameter(QModbusDevice::SerialPortNameParameter,
ui->comBox->currentData().toString());
#if QT_CONFIG(modbus_serialport)
modbusDevice->setConnectionParameter(QModbusDevice::SerialParityParameter,
ui->parityControlBox->currentData().toInt());
modbusDevice->setConnectionParameter(QModbusDevice::SerialBaudRateParameter,
ui->baudRateBox->currentText().toInt(nullptr, 10));
modbusDevice->setConnectionParameter(QModbusDevice::SerialDataBitsParameter,
ui->dataBox->currentData().toInt());
modbusDevice->setConnectionParameter(QModbusDevice::SerialStopBitsParameter,
ui->stopBox->currentData().toInt());
#endif
modbusDevice->setTimeout(50);
modbusDevice->setNumberOfRetries(0);
if (!modbusDevice->connectDevice()) {
QMessageBox::warning(this, "Ошибка", "Произошла ошибка при попытке подключения.");
} else {
ui->connectButton->setText(tr("Отключить"));
ui->ringButton->setEnabled(true);
currentBaudRate = ui->baudRateBox->currentText().toUInt(nullptr, 10);
}
} else {
modbusDevice->disconnectDevice();
ui->connectButton->setText(tr("Подключить"));
ui->ringButton->setEnabled(false);
}
}
LineRinger::callStatus LineRinger::lineCall()
{
QModbusRequest readDeviceBasicIdentification(QModbusRequest::EncapsulatedInterfaceTransport, QByteArray::fromHex("0E0100"));
QModbusRequest readDeviceRegularIdentification(QModbusRequest::EncapsulatedInterfaceTransport, QByteArray::fromHex("0E0200"));
bool isRun = false;
bool *tmp_isRun = &isRun;
uint tmp_adr = 1;
auto bar = new QProgressDialog(this);
connect(bar, &QProgressDialog::canceled, this, [this, tmp_isRun]()
{
*tmp_isRun = true;
});
connect(this, &LineRinger::stopLineCall, this, [this, tmp_isRun]()
{
*tmp_isRun = true;
});
bar->setLabelText(tr("Поиск устройств... Текущий адрес: %1").arg(tmp_adr));
bar->setCancelButton(nullptr);
bar->setRange(1, 247);
bar->setMinimumDuration(100);
for(tmp_adr = 1; tmp_adr<248; tmp_adr++)
{
bar->setValue(tmp_adr);
bar->setLabelText(tr("Поиск устройств... Текущий адрес: %1/247").arg(tmp_adr));
auto *reply = modbusDevice->sendRawRequest(readDeviceBasicIdentification, tmp_adr);
//auto *reply = modbusDevice->sendReadRequest(*_unit, tmp_adr);
//Запрос типа устройства.
if(reply == nullptr)
{
QMessageBox::warning(this, "Ошибка при сканировании.", QString("%1").arg(modbusDevice->errorString()));
bar->close();
bar->deleteLater();
return callStatus::ERROR;
}
while(!reply->isFinished())
{
if(isRun)
{
bar->close();
bar->deleteLater();
return callStatus::INTERRUPT;
}
QCoreApplication::processEvents();
}
if(isRun)
{
bar->close();
bar->deleteLater();
return callStatus::INTERRUPT;
}
else if (!isRun)
{
//Нужна проверка типа устройства
if(reply->error()!=QModbusDevice::TimeoutError)
{
deviceOnLine currentDevice;
currentDevice.adr = tmp_adr;
currentDevice.baudRate = currentBaudRate;
bool regularReplyError = false;
QString regularReplyErrorString;
if(reply->error()==QModbusDevice::NoError)
{
QModbusResponse resp = reply->rawResult();
uint8_t numOfObject = resp.data().at(5);
QByteArray result = resp.data().remove(0, 6);
for(int tmp_obj = 0; tmp_obj < numOfObject; tmp_obj++)
{
uint8_t objectID = result.at(0);
uint8_t lengthOfObject = result.at(1);
if(lengthOfObject>0)
{
currentDevice.fields[objectID].clear();
}
for(int i = 0; i < lengthOfObject; i++)
{
currentDevice.fields[objectID] += QString(result.at(2+i));
}
result.remove(0, lengthOfObject+2);
}
auto *regularReply = modbusDevice->sendRawRequest(readDeviceRegularIdentification, tmp_adr);
if(regularReply == nullptr)
{
QMessageBox::warning(this, "Ошибка при сканировании.", QString("%1: %2").arg(modbusDevice->error()).arg(modbusDevice->errorString()));
bar->close();
bar->deleteLater();
return callStatus::ERROR;
}
while(!regularReply->isFinished())
{
if(isRun)
{
bar->close();
bar->deleteLater();
return callStatus::INTERRUPT;
}
QCoreApplication::processEvents();
}
if(isRun)
{
bar->close();
bar->deleteLater();
return callStatus::INTERRUPT;
}
else if(!isRun)
{
if(regularReply->error()!=QModbusDevice::NoError)
{
// QMessageBox::warning(this, "Ошибка при сканировании.", QString("%1: %2").arg(regularReply->error()).arg(regularReply->errorString()));
// bar->close();
// bar->deleteLater();
// return callStatus::ERROR;
regularReplyError = true;
regularReplyErrorString = QString("%1: %2").arg(regularReply->error()).arg(regularReply->errorString());
}
QModbusResponse regularResp = regularReply->rawResult();
uint8_t numOfRegularObject = regularResp.data().at(5);
QByteArray regularResult = regularResp.data().remove(0, 6);
for(int tmp_obj = 0; tmp_obj < numOfRegularObject; tmp_obj++)
{
uint8_t objectID = regularResult.at(0);
if(objectID > 0x06)
continue;
uint8_t lengthOfObject = regularResult.at(1);
if(lengthOfObject>0)
{
currentDevice.fields[objectID].clear();
}
for (int i = 0; i < lengthOfObject; i++) {
currentDevice.fields[objectID] += QString(regularResult.at(2+i));
}
regularResult.remove(0, lengthOfObject+2);
}
}
}
if(!isRun)
{
devicesList.append(currentDevice);
unsigned newRow = ui->deviceOnlineView->rowCount();
ui->deviceOnlineView->insertRow(newRow);
ui->deviceOnlineView->setItem(newRow, 0, new QTableWidgetItem(QString::number(currentDevice.adr)));
ui->deviceOnlineView->setItem(newRow, 1, new QTableWidgetItem(QString::number(currentDevice.baudRate)));
for (int i = 0; i < 7; i++) {
ui->deviceOnlineView->setItem(newRow, i+2, new QTableWidgetItem(currentDevice.fields[i]));
}
if(reply->error()!=QModbusDevice::NoError)
{
ui->deviceOnlineView->setItem(newRow, 9, new QTableWidgetItem(QString("%1: %2").arg(reply->error()).arg(reply->errorString())));
}
else if(regularReplyError)
{
ui->deviceOnlineView->setItem(newRow, 9, new QTableWidgetItem(regularReplyErrorString));
}
ui->deviceOnlineView->resizeColumnsToContents();
syncColumnHeaders();
}
}
}
}
return callStatus::NOERROR;
}
void LineRinger::on_ringButton_clicked()
{
ui->deviceOnlineView->clear();
devicesList.clear();
syncColumnHeaders();
while(ui->deviceOnlineView->rowCount()!=0)
ui->deviceOnlineView->removeRow(ui->deviceOnlineView->rowCount()-1);
if(isAutoBaud)
{
auto bar = new QProgressDialog(this);
bar->setLabelText(tr("Поиск устройств... Текущая скорость: %1").arg(currentBaudRate));
bar->setRange(0, ui->baudRateBox->count());
bar->setAutoClose(true);
bar->setMinimumDuration(0);
bar->setCancelButton(nullptr);
connect(bar, &QProgressDialog::canceled, this, [this]()
{
emit stopLineCall();
});
bar->setValue(0);
ui->deviceOnlineView->setColumnHidden(1, false);
modbusDevice->disconnectDevice();
for (int i = 0; i < ui->baudRateBox->count(); i++) {
bar->setValue(i+1);
modbusDevice->setConnectionParameter(QModbusDevice::SerialBaudRateParameter,
ui->baudRateBox->itemText(i).toInt(nullptr, 10));
if (!modbusDevice->connectDevice()) {
QMessageBox::warning(this, "Ошибка", "Произошла ошибка при попытке подключения.");
on_connectButton_clicked();
break;
}
currentBaudRate = ui->baudRateBox->itemText(i).toUInt(nullptr, 10);
if(lineCall() == callStatus::INTERRUPT)
{
QMessageBox::warning(this, "Уведомление", QString("Досрочное завершение опроса. Найдено %1 устройств.").arg(devicesList.count()));
modbusDevice->disconnectDevice();
on_connectButton_clicked();
bar->close();
bar->deleteLater();
ui->timer->setTime(QTime::currentTime());
ui->timer->setDate(QDate::currentDate());
return;
}
modbusDevice->disconnectDevice();
}
on_connectButton_clicked();
}
else
{
ui->deviceOnlineView->setColumnHidden(1, true);
if(lineCall() == callStatus::INTERRUPT)
{
QMessageBox::warning(this, "Уведомление", QString("Досрочное завершение опроса. Найдено %1 устройств.").arg(devicesList.count()));
}
}
ui->timer->setTime(QTime::currentTime());
ui->timer->setDate(QDate::currentDate());
}
void LineRinger::on_checkAutoBaud_stateChanged(int arg1)
{
isAutoBaud = (bool)arg1;
}

59
M3KTE_TERM/lineringer.h Normal file
View File

@@ -0,0 +1,59 @@
#ifndef LINERINGER_H
#define LINERINGER_H
#include <QWidget>
#include <QModbusTcpClient>
#include <QModbusRtuSerialMaster>
#include <QSerialPortInfo>
#include <QSerialPort>
#include <QMessageBox>
#include <QProgressDialog>
namespace Ui {
class LineRinger;
}
class LineRinger : public QWidget
{
Q_OBJECT
public:
enum callStatus{
NOERROR = 0,
ERROR = 1,
INTERRUPT = 2
};
explicit LineRinger(QWidget *parent = nullptr);
~LineRinger();
callStatus lineCall();
signals:
void stopLineCall();
private slots:
void on_connectButton_clicked();
void on_ringButton_clicked();
void on_checkAutoBaud_stateChanged(int arg1);
private:
Ui::LineRinger *ui;
void syncColumnHeaders();
struct deviceOnLine
{
uint8_t adr;
unsigned baudRate;
QString fields[7] = {"Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined", "Undefined"};
};
QVector<deviceOnLine>devicesList;
bool isAutoBaud = false;
unsigned currentBaudRate;
QModbusClient *modbusDevice = nullptr;
};
#endif // LINERINGER_H

303
M3KTE_TERM/lineringer.ui Normal file
View File

@@ -0,0 +1,303 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LineRinger</class>
<widget class="QWidget" name="LineRinger">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>939</width>
<height>522</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="2">
<widget class="QGroupBox" name="gridGroupBox_2">
<layout class="QGridLayout" name="cmdLayout">
<item row="4" column="1">
<widget class="QLabel" name="labelTimer">
<property name="text">
<string>Последний опрос:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="ringButton">
<property name="text">
<string>Опросить</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="checkAutoBaud">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Любая скорость</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QDateTimeEdit" name="timer">
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::NoButtons</enum>
</property>
<property name="keyboardTracking">
<bool>true</bool>
</property>
<property name="currentSection">
<enum>QDateTimeEdit::DaySection</enum>
</property>
<property name="displayFormat">
<string>dd.MM.yyyy HH:mm:ss</string>
</property>
<property name="calendarPopup">
<bool>false</bool>
</property>
<property name="currentSectionIndex">
<number>0</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="controlGroup">
<layout class="QGridLayout" name="controlLaylout">
<item row="0" column="5">
<widget class="QLabel" name="labelStopBit">
<property name="text">
<string>Стоп-биты</string>
</property>
</widget>
</item>
<item row="1" column="8">
<widget class="QPushButton" name="connectButton">
<property name="text">
<string>Подключить</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLabel" name="labelEvenControl">
<property name="text">
<string>Чётность</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QComboBox" name="stopBox"/>
</item>
<item row="1" column="0">
<widget class="QComboBox" name="comBox">
<property name="editable">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>21</width>
<height>21</height>
</size>
</property>
<property name="text">
<string>Поиск</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QComboBox" name="parityControlBox"/>
</item>
<item row="1" column="3">
<widget class="QComboBox" name="baudRateBox">
<property name="editable">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>9600</string>
</property>
</item>
<item>
<property name="text">
<string>14400</string>
</property>
</item>
<item>
<property name="text">
<string>19200</string>
</property>
</item>
<item>
<property name="text">
<string>31250</string>
</property>
</item>
<item>
<property name="text">
<string>38400</string>
</property>
</item>
<item>
<property name="text">
<string>56000</string>
</property>
</item>
<item>
<property name="text">
<string>57600</string>
</property>
</item>
<item>
<property name="text">
<string>115200</string>
</property>
</item>
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="dataBox"/>
</item>
<item row="0" column="3">
<widget class="QLabel" name="labelBaud">
<property name="text">
<string>Скорость</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="labelCom">
<property name="text">
<string>Порт</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QLabel" name="labelDataBit">
<property name="text">
<string>Биты данных</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="3">
<widget class="QTableWidget" name="deviceOnlineView">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="textElideMode">
<enum>Qt::ElideMiddle</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="columnCount">
<number>10</number>
</property>
<attribute name="horizontalHeaderVisible">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderShowSortIndicator" stdset="0">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>ID</string>
</property>
</column>
<column>
<property name="text">
<string>BaudRate</string>
</property>
</column>
<column>
<property name="text">
<string>Vendor Name</string>
</property>
</column>
<column>
<property name="text">
<string>Product Code</string>
</property>
</column>
<column>
<property name="text">
<string>Major Minor Revision</string>
</property>
</column>
<column>
<property name="text">
<string>Vendor Url</string>
</property>
</column>
<column>
<property name="text">
<string>Product Name</string>
</property>
</column>
<column>
<property name="text">
<string>Model Name</string>
</property>
</column>
<column>
<property name="text">
<string>User Application Name</string>
</property>
</column>
<column>
<property name="text">
<string>Примечание</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

View File

@@ -9,6 +9,14 @@
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QStatusBar> #include <QStatusBar>
#include <QUrl> #include <QUrl>
#include <QScrollBar>
#include <QTableWidget>
QWidget* init(QWidget *parent)
{
return new M3KTE(parent);
}
//1024 768 //1024 768
//Ширина колбы - уже //Ширина колбы - уже
@@ -357,6 +365,7 @@ M3KTE::M3KTE(QWidget *parent)
m_deviceSettingsDialog = new DeviceSettingsDialog(this); m_deviceSettingsDialog = new DeviceSettingsDialog(this);
m_regMultipleSettings = new MultipleSettings(this); m_regMultipleSettings = new MultipleSettings(this);
modbusDevice = new QModbusRtuSerialMaster(this); modbusDevice = new QModbusRtuSerialMaster(this);
m_lineRinger = new LineRinger();
Boards[0].boardScanners = new QTimer(); Boards[0].boardScanners = new QTimer();
Boards[1].boardScanners = new QTimer(); Boards[1].boardScanners = new QTimer();
Boards[2].boardScanners = new QTimer(); Boards[2].boardScanners = new QTimer();
@@ -385,7 +394,7 @@ M3KTE::M3KTE(QWidget *parent)
Boards[1].adr = 2; Boards[1].adr = 2;
Boards[2].adr = 3; Boards[2].adr = 3;
Boards[3].adr = 4; Boards[3].adr = 4;
ui->M3kteMenuSettings->setEnabled(false); //ui->M3kteMenuSettings->setEnabled(false);
ui->M3kteRegSettings->setEnabled(false); ui->M3kteRegSettings->setEnabled(false);
ui->BSM_Warning->setEnabled(false); ui->BSM_Warning->setEnabled(false);
ui->BSM_Accident->setEnabled(false); ui->BSM_Accident->setEnabled(false);
@@ -399,10 +408,23 @@ M3KTE::M3KTE(QWidget *parent)
Boards_Fields[1] = ui->FCBoardBox_2; Boards_Fields[1] = ui->FCBoardBox_2;
Boards_Fields[2] = ui->FCBoardBox_3; Boards_Fields[2] = ui->FCBoardBox_3;
Boards_Fields[3] = ui->FCBoardBox_4; Boards_Fields[3] = ui->FCBoardBox_4;
Boards[0].timerStatus = ui->timeStatus_1;
Boards[1].timerStatus = ui->timeStatus_2;
Boards[2].timerStatus = ui->timeStatus_3;
Boards[3].timerStatus = ui->timeStatus_4;
Boards[0].timerData = ui->timeData_1;
Boards[1].timerData = ui->timeData_2;
Boards[2].timerData = ui->timeData_3;
Boards[3].timerData = ui->timeData_4;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
statusM3KTE.Warnings[i] = false; statusM3KTE.Warnings[i] = false;
statusM3KTE.Accidents[i] = false; statusM3KTE.Accidents[i] = false;
Boards_Fields[i]->setEnabled(false); Boards_Fields[i]->setEnabled(false);
Boards[i].timerData->setText(" ");
Boards[i].timerStatus->setText(" ");;
} }
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
@@ -429,6 +451,15 @@ M3KTE::M3KTE(QWidget *parent)
} }
connect(m_deviceSettingsDialog, &DeviceSettingsDialog::parityChanged, this, &M3KTE::onParityUpdate); connect(m_deviceSettingsDialog, &DeviceSettingsDialog::parityChanged, this, &M3KTE::onParityUpdate);
connect(m_deviceSettingsDialog, &DeviceSettingsDialog::speedChanged, this, &M3KTE::onSpeedUpdate); connect(m_deviceSettingsDialog, &DeviceSettingsDialog::speedChanged, this, &M3KTE::onSpeedUpdate);
loggerTable = new QTableWidget(ui->loggerWidget);
ui->loggerWidget->layout()->addWidget(loggerTable);
loggerTable->setColumnCount(5);
QStringList headers;
headers << "Время" << "Плата" << "Тип ошибки" << "Счётчик" << "Примечание";
loggerTable->setHorizontalHeaderLabels(headers);
loggerTable->setSortingEnabled(true);
loggerTable->setAutoScroll(true);
} }
M3KTE::~M3KTE() M3KTE::~M3KTE()
@@ -457,6 +488,7 @@ void M3KTE::initActions()
this, &M3KTE::onSelectedBoardChanged); this, &M3KTE::onSelectedBoardChanged);
connect(ui->writeTable, QOverload<int>::of(&QComboBox::currentIndexChanged), connect(ui->writeTable, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &M3KTE::onWriteTableChanged); this, &M3KTE::onWriteTableChanged);
connect(ui->LineCall, &QAction::triggered, m_lineRinger, &QWidget::show);
connect(ui->M3kteRegSettings, &QAction::triggered, m_regMultipleSettings, &QDialog::show); connect(ui->M3kteRegSettings, &QAction::triggered, m_regMultipleSettings, &QDialog::show);
connect(m_regMultipleSettings, &MultipleSettings::write, this, &M3KTE::slotmultipleRegWrite); connect(m_regMultipleSettings, &MultipleSettings::write, this, &M3KTE::slotmultipleRegWrite);
connect(m_regMultipleSettings, &MultipleSettings::writeAndSend, this, &M3KTE::slotmultipleRegWriteAndSend); connect(m_regMultipleSettings, &MultipleSettings::writeAndSend, this, &M3KTE::slotmultipleRegWriteAndSend);
@@ -492,11 +524,13 @@ void M3KTE::onConnectClicked()
if(pingNetworkDevices()) //Опрос устройств if(pingNetworkDevices()) //Опрос устройств
{ {
unsigned tmp_adr[4]; unsigned tmp_adr[4];
bool ActiveDevices[4];
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
tmp_adr[i] = Boards[i].adr; tmp_adr[i] = Boards[i].adr;
ActiveDevices[i] = Boards[i].isActive;
} }
ui->M3kteRegSettings->setEnabled(true); ui->M3kteRegSettings->setEnabled(true);
m_deviceSettingsDialog->updateSettingsAfterConnection(m_settingsDialog->settings().baud, m_settingsDialog->settings().parity, tmp_adr, CurrentConnectedDevice); m_deviceSettingsDialog->updateSettingsAfterConnection(m_settingsDialog->settings().baud, m_settingsDialog->settings().parity, tmp_adr, ActiveDevices);
ui->boardSelectBox->setCurrentIndex(0); ui->boardSelectBox->setCurrentIndex(0);
ui->writeTable->setCurrentIndex(0); ui->writeTable->setCurrentIndex(0);
changeTable(0, 0); changeTable(0, 0);
@@ -525,6 +559,9 @@ void M3KTE::onConnectClicked()
Boards[i].ModbusModelHoldingReg->m_holdingRegisters[j] = 0; Boards[i].ModbusModelHoldingReg->m_holdingRegisters[j] = 0;
Boards[i].ModbusModelHoldingReg->m_holdingRegisters[j + (85 - (i/3*20))] = 0; Boards[i].ModbusModelHoldingReg->m_holdingRegisters[j + (85 - (i/3*20))] = 0;
} }
Boards_Fields[i]->setTitle(QString("Плата №%1").arg(i));
Boards[i].timerData->setText(" ");;
Boards[i].timerStatus->setText(" ");;
} }
for(int i = 0; i < 320; i++) for(int i = 0; i < 320; i++)
{ {
@@ -570,17 +607,17 @@ void M3KTE::onReadReady()
auto reply = qobject_cast<QModbusReply *>(sender()); auto reply = qobject_cast<QModbusReply *>(sender());
if (!reply) if (!reply)
return; return;
if (reply->error() == QModbusDevice::NoError) {
const QModbusDataUnit unit = reply->result();
int Adr = 255; int Adr = 255;
for(int i = 0; i < CurrentConnectedDevice; i++) for(int i = 0; i < 4; i++)
{ {
if(Boards[i].adr==reply->serverAddress()) if(Boards[i].isActive && Boards[i].adr==reply->serverAddress())
{ {
Adr = i; Adr = i;
break; break;
} }
} }
if (reply->error() == QModbusDevice::NoError) {
const QModbusDataUnit unit = reply->result();
for (int i = 0, total = int(unit.valueCount()); i < total; ++i) { for (int i = 0, total = int(unit.valueCount()); i < total; ++i) {
if(unit.registerType() == QModbusDataUnit::Coils) if(unit.registerType() == QModbusDataUnit::Coils)
{ {
@@ -600,10 +637,30 @@ void M3KTE::onReadReady()
statusBar()->showMessage(tr("Read response error: %1 (Mobus exception: 0x%2)"). statusBar()->showMessage(tr("Read response error: %1 (Mobus exception: 0x%2)").
arg(reply->errorString()). arg(reply->errorString()).
arg(reply->rawResult().exceptionCode(), -1, 16), 5000); arg(reply->rawResult().exceptionCode(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(Adr+1).arg(Boards[Adr].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[Adr].error_RX, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString::number(reply->rawResult().exceptionCode(), 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} else { } else {
statusBar()->showMessage(tr("Read response error: %1 (code: 0x%2)"). statusBar()->showMessage(tr("Read response error: %1 (code: 0x%2)").
arg(reply->errorString()). arg(reply->errorString()).
arg(reply->error(), -1, 16), 5000); arg(reply->error(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(Adr+1).arg(Boards[Adr].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[Adr].error_RX, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString::number(reply->error(), 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
reply->deleteLater(); reply->deleteLater();
} }
@@ -629,14 +686,35 @@ void M3KTE::onWriteButtonClicked()
} }
if (auto *reply = modbusDevice->sendWriteRequest(writeUnit, Boards[ui->boardSelectBox->currentIndex()].adr)) { if (auto *reply = modbusDevice->sendWriteRequest(writeUnit, Boards[ui->boardSelectBox->currentIndex()].adr)) {
if (!reply->isFinished()) { if (!reply->isFinished()) {
connect(reply, &QModbusReply::finished, this, [this, reply]() { unsigned tmp_id = ui->boardSelectBox->currentIndex();
connect(reply, &QModbusReply::finished, this, [this, reply, tmp_id]() {
if (reply->error() == QModbusDevice::ProtocolError) { if (reply->error() == QModbusDevice::ProtocolError) {
statusBar()->showMessage(tr("Write response error: %1 (Mobus exception: 0x%2)") statusBar()->showMessage(tr("Write response error: %1 (Mobus exception: 0x%2)")
.arg(reply->errorString()).arg(reply->rawResult().exceptionCode(), -1, 16), .arg(reply->errorString()).arg(reply->rawResult().exceptionCode(), -1, 16),
5000); 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(tmp_id+1).arg(Boards[tmp_id].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[tmp_id].error_TX, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString::number(reply->rawResult().exceptionCode(), 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} else if (reply->error() != QModbusDevice::NoError) { } else if (reply->error() != QModbusDevice::NoError) {
statusBar()->showMessage(tr("Write response error: %1 (code: 0x%2)"). statusBar()->showMessage(tr("Write response error: %1 (code: 0x%2)").
arg(reply->errorString()).arg(reply->error(), -1, 16), 5000); arg(reply->errorString()).arg(reply->error(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(tmp_id+1).arg(Boards[tmp_id].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[tmp_id].error_TX, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString::number(reply->error(), 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
reply->deleteLater(); reply->deleteLater();
}); });
@@ -646,6 +724,14 @@ void M3KTE::onWriteButtonClicked()
} }
} else { } else {
statusBar()->showMessage(tr("Write error: ") + modbusDevice->errorString(), 5000); statusBar()->showMessage(tr("Write error: ") + modbusDevice->errorString(), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Терминал")));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
} }
@@ -752,31 +838,121 @@ bool M3KTE::event(QEvent *event)
}); });
else else
{ {
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(_event->BoardNum()+1).arg(Boards[_event->BoardNum()].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(subreply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[_event->BoardNum()].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
delete subreply; // broadcast replies return immediately delete subreply; // broadcast replies return immediately
} }
} else { } else {
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(_event->BoardNum()+1).arg(Boards[_event->BoardNum()].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[_event->BoardNum()].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
} }
} }
else else
{ {
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(_event->BoardNum()+1).arg(Boards[_event->BoardNum()].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[_event->BoardNum()].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
} }
}); });
else else
{ {
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(_event->BoardNum()+1).arg(Boards[_event->BoardNum()].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[_event->BoardNum()].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
delete reply; delete reply;
} }
} }
else else
{ {
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(_event->BoardNum()+1).arg(Boards[_event->BoardNum()].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[_event->BoardNum()].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
} }
m_deviceSettingsDialog->show(); m_deviceSettingsDialog->show();
return true; return true;
} }
else if (event->type() == (QEvent::Type)1001)
{
pollStatusChange* _event = static_cast<pollStatusChange*>(event);
QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::HoldingRegisters, 170, 1);
_unit->setValue(0, _event->Status());
if (auto *reply = modbusDevice->sendWriteRequest(*_unit, Boards[_event->BoardID()].adr))
{
if(!reply->isFinished())
connect(reply, &QModbusReply::finished, this, [reply, this, _event]()
{
if(reply->error()!=QModbusDevice::NoError)
{
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(_event->BoardID()+1).arg(Boards[_event->BoardID()].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[_event->BoardID()].error_cmd_change, 10)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
}
});
}
else
{
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(_event->BoardID()+1).arg(Boards[_event->BoardID()].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[_event->BoardID()].error_cmd_change, 10)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
}
return true;
}
return QWidget::event(event); return QWidget::event(event);
} }
@@ -784,7 +960,17 @@ void M3KTE::checkAdrChange(QModbusReply *reply, unsigned boardNum)
{ {
if (!reply) if (!reply)
{ {
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardNum+1).arg(Boards[boardNum].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardNum].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater();
return; return;
} }
if (reply->error() == QModbusDevice::NoError) { if (reply->error() == QModbusDevice::NoError) {
@@ -798,81 +984,120 @@ void M3KTE::checkAdrChange(QModbusReply *reply, unsigned boardNum)
//ERROR //ERROR
else{ else{
Boards[boardNum]._tmp_adr = Boards[boardNum].adr; Boards[boardNum]._tmp_adr = Boards[boardNum].adr;
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardNum+1).arg(Boards[boardNum].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardNum].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater(); reply->deleteLater();
return; return;
} }
} }
errorAdrChange(); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardNum+1).arg(Boards[boardNum].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardNum].error_adr_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Не удалось изменить адрес устройства."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater(); reply->deleteLater();
} }
void M3KTE::errorAdrChange()
{
QMessageBox msgBox;
msgBox.setText("Не удалось изменить адрес устройства.");
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
int ret = msgBox.exec();
}
void M3KTE::onSpeedUpdate() void M3KTE::onSpeedUpdate()
{ {
//Отсутствие контроля записи регистра на плате. stopScanBoard();
QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::HoldingRegisters, 173, 1); QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::HoldingRegisters, 173, 1);
QModbusDataUnit* _unitcheck = new QModbusDataUnit(QModbusDataUnit::InputRegisters, 85, 1);
_unit->setValue(0, m_deviceSettingsDialog->currentSpeed()); _unit->setValue(0, m_deviceSettingsDialog->currentSpeed());
for (int i = 0; i < CurrentConnectedDevice; i++) { unsigned tmp_speed = m_deviceSettingsDialog->currentSpeed();
auto *reply = modbusDevice->sendWriteRequest(*_unit, Boards[i].adr); for (int i = 0; i < 4; i++) {
if (!Boards[i].isActive)
{ {
if (!reply->isFinished()) continue;
connect(reply, &QModbusReply::finished, this, [this, reply, i](){ }
if (auto *reply = modbusDevice->sendWriteRequest(*_unit, Boards[i].adr))
{
while(!reply->isFinished())
{
QCoreApplication::processEvents();
}
if(reply->error()==QModbusDevice::TimeoutError) if(reply->error()==QModbusDevice::TimeoutError)
{ {
modbusDevice->disconnectDevice(); modbusDevice->disconnectDevice();
modbusDevice->setConnectionParameter(QModbusDevice::SerialBaudRateParameter, modbusDevice->setConnectionParameter(QModbusDevice::SerialBaudRateParameter,
m_settingsDialog->UpdateBaud(m_deviceSettingsDialog->currentSpeed())); tmp_speed);
modbusDevice->connectDevice(); modbusDevice->connectDevice();
QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::InputRegisters, 85, 1); if(auto *subreply = modbusDevice->sendReadRequest(*_unitcheck, Boards[i].adr))
if (auto *subreply = modbusDevice->sendReadRequest(*_unit, Boards[i].adr))
{ {
if (!subreply->isFinished()) while (!subreply->isFinished())
connect(subreply, &QModbusReply::finished, this, [subreply, this, i](){ {
QCoreApplication::processEvents();
}
if(subreply->error() != QModbusDevice::NoError) if(subreply->error() != QModbusDevice::NoError)
{ {
QMessageBox msgBox; unsigned newRow = loggerTable->rowCount();
msgBox.setText(tr("Не удалось изменить скорость платы %1.").arg(i)); loggerTable->insertRow(newRow);
msgBox.setStandardButtons(QMessageBox::Ok); loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
msgBox.setDefaultButton(QMessageBox::Ok); loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(i+1).arg(Boards[i].adr)));
int ret = msgBox.exec(); loggerTable->setItem(newRow, 2, new QTableWidgetItem(subreply->errorString()));
} loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[i].error_baud_change, 10)));
}); loggerTable->setItem(newRow, 4, new QTableWidgetItem("Ошибка при изменении скорости обмена."));
else loggerTable->resizeColumnsToContents();
{ if(!loggerTable->verticalScrollBar()->isSliderDown())
QMessageBox msgBox; loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
msgBox.setText(tr("Не удалось изменить скорость платы %1.").arg(i)); subreply->deleteLater();
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
int ret = msgBox.exec();
delete subreply; // broadcast replies return immediately
} }
} else { } else {
QMessageBox msgBox; unsigned newRow = loggerTable->rowCount();
msgBox.setText(tr("Не удалось изменить скорость платы %1.").arg(i)); loggerTable->insertRow(newRow);
msgBox.setStandardButtons(QMessageBox::Ok); loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
msgBox.setDefaultButton(QMessageBox::Ok); loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(i+1).arg(Boards[i].adr)));
int ret = msgBox.exec(); loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[i].error_baud_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Ошибка при изменении скорости обмена."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
modbusDevice->disconnectDevice();
modbusDevice->setConnectionParameter(QModbusDevice::SerialBaudRateParameter,
m_settingsDialog->curBaud());
modbusDevice->connectDevice();
} }
});
else else
{
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(i+1).arg(Boards[i].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[i].error_baud_change, 10)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Ошибка при изменении скорости обмена."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
delete reply; // broadcast replies return immediately delete reply; // broadcast replies return immediately
} }
} }
} }
modbusDevice->disconnectDevice();
modbusDevice->setConnectionParameter(QModbusDevice::SerialBaudRateParameter,
m_settingsDialog->UpdateBaud(tmp_speed));
modbusDevice->connectDevice();
beginScanBoards();
}
void M3KTE::onParityUpdate() void M3KTE::onParityUpdate()
{ {
//Отсутствие контроля записи регистра на плате. stopScanBoard();
QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::HoldingRegisters, 174, 1); QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::HoldingRegisters, 174, 1);
switch (m_deviceSettingsDialog->currentParity()) switch (m_deviceSettingsDialog->currentParity())
{ {
@@ -888,57 +1113,98 @@ void M3KTE::onParityUpdate()
} }
case 2: //Нечетный case 2: //Нечетный
{ {
_unit->setValue(0, 0x0800); _unit->setValue(0, 0x0600);
break; break;
} }
} }
for (int i = 0; i < CurrentConnectedDevice; i++) { for (int i = 0; i < 4; i++) {
auto *reply = modbusDevice->sendWriteRequest(*_unit, Boards[i].adr); if (!Boards[i].isActive)
{ {
if (!reply->isFinished()) continue;
connect(reply, &QModbusReply::finished, this, [this, reply, i](){ }
if(auto *reply = modbusDevice->sendWriteRequest(*_unit, Boards[i].adr))
{
while (!reply->isFinished())
{
QCoreApplication::processEvents();
}
if(reply->error()==QModbusDevice::TimeoutError) if(reply->error()==QModbusDevice::TimeoutError)
{ {
modbusDevice->disconnectDevice(); modbusDevice->disconnectDevice();
modbusDevice->setConnectionParameter(QModbusDevice::SerialParityParameter, modbusDevice->setConnectionParameter(QModbusDevice::SerialParityParameter,
m_settingsDialog->UpdateParity(m_deviceSettingsDialog->currentParity())); m_deviceSettingsDialog->currentParity());
modbusDevice->connectDevice(); modbusDevice->connectDevice();
QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::InputRegisters, 85, 1); QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::InputRegisters, 85, 1);
if (auto *subreply = modbusDevice->sendReadRequest(*_unit, Boards[i].adr)) if (auto *subreply = modbusDevice->sendReadRequest(*_unit, Boards[i].adr))
{ {
if (!subreply->isFinished()) while (!subreply->isFinished())
connect(subreply, &QModbusReply::finished, this, [subreply, this, i](){ {
QCoreApplication::processEvents();
}
if(subreply->error() != QModbusDevice::NoError) if(subreply->error() != QModbusDevice::NoError)
{ {
QMessageBox msgBox; unsigned newRow = loggerTable->rowCount();
msgBox.setText(tr("Не удалось изменить чётность платы %1.").arg(i)); loggerTable->insertRow(newRow);
msgBox.setStandardButtons(QMessageBox::Ok); loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
msgBox.setDefaultButton(QMessageBox::Ok); loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(i+1).arg(Boards[i].adr)));
int ret = msgBox.exec(); loggerTable->setItem(newRow, 2, new QTableWidgetItem(subreply->errorString()));
} loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[i].error_parity_change)));
}); loggerTable->setItem(newRow, 4, new QTableWidgetItem("Ошибка при изменении чётности платы."));
else loggerTable->resizeColumnsToContents();
{ if(!loggerTable->verticalScrollBar()->isSliderDown())
QMessageBox msgBox; loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
msgBox.setText(tr("Не удалось изменить чётность платы %1.").arg(i));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
int ret = msgBox.exec();
delete subreply; // broadcast replies return immediately
} }
} else { } else {
QMessageBox msgBox; unsigned newRow = loggerTable->rowCount();
msgBox.setText(tr("Не удалось изменить чётность платы %1.").arg(i)); loggerTable->insertRow(newRow);
msgBox.setStandardButtons(QMessageBox::Ok); loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
msgBox.setDefaultButton(QMessageBox::Ok); loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(i+1).arg(Boards[i].adr)));
int ret = msgBox.exec(); loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[i].error_parity_change)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Ошибка при изменении чётности платы."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
modbusDevice->disconnectDevice();
modbusDevice->setConnectionParameter(QModbusDevice::SerialParityParameter,
m_settingsDialog->curParity());
modbusDevice->connectDevice();
} }
});
else else
{
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(i+1).arg(Boards[i].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[i].error_parity_change)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Ошибка при изменении чётности платы."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
}
}
else
{
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(i+1).arg(Boards[i].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[i].error_parity_change)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem("Ошибка при изменении чётности платы."));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
delete reply; // broadcast replies return immediately delete reply; // broadcast replies return immediately
} }
} }
modbusDevice->disconnectDevice();
modbusDevice->setConnectionParameter(QModbusDevice::SerialParityParameter,
m_settingsDialog->UpdateParity(m_deviceSettingsDialog->currentParity()));
modbusDevice->connectDevice();
beginScanBoards();
} }
bool M3KTE::pingNetworkDevices() bool M3KTE::pingNetworkDevices()
@@ -1144,6 +1410,7 @@ bool M3KTE::pingNetworkDevices()
return false; return false;
} }
} }
Boards_Fields[i]->setTitle(QString("Плата №%1 (ID %2)").arg(i).arg(Boards[i].adr));
} }
} }
modbusDevice->setNumberOfRetries(m_settingsDialog->settings().numberOfRetries); modbusDevice->setNumberOfRetries(m_settingsDialog->settings().numberOfRetries);
@@ -1156,8 +1423,11 @@ void M3KTE::beginScanBoards()
{ {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if(Boards[i].isActive) if(Boards[i].isActive)
{
m_deviceSettingsDialog->initPollForBoard(i, Boards[i].adr);
boardScan(i); boardScan(i);
} }
}
return; return;
} }
@@ -1165,22 +1435,127 @@ void M3KTE::boardScan(unsigned boardID)
{ {
if (!modbusDevice) if (!modbusDevice)
return; return;
QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::InputRegisters, 0, 85); QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::InputRegisters, 85, 1);
statusBar()->clearMessage(); statusBar()->clearMessage();
if (auto *reply = modbusDevice->sendReadRequest(*_unit, Boards[boardID].adr)) { if (auto *reply = modbusDevice->sendReadRequest(*_unit, Boards[boardID].adr)) {
Boards[boardID].timerToStatusResponse.start();
if (!reply->isFinished()) if (!reply->isFinished())
connect(reply, &QModbusReply::finished, this, [this, boardID]() connect(reply, &QModbusReply::finished, this, [this, boardID, reply]()
{ {
Boards[boardID].timerStatus->setText(QString("Status: %1 ms").arg(Boards[boardID].timerToStatusResponse.elapsed()));
if(reply->error()==QModbusDevice::NoError) {
statusreg StatusReg;
StatusReg.AllReg = reply->result().value(0);
if(StatusReg.ParsingReg.poll_allowed)
{
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
return;
}
if(StatusReg.ParsingReg.mzkte_status)
{
switch (StatusReg.ParsingReg.mzkte_error) {
case 1:
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
return;
case 2:
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
return;
case 3:
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
return;
case 4:
break;
case 5:
break;
case 6:
break;
case 7:
break;
default:
break;
}
}
QModbusDataUnit* _unit = new QModbusDataUnit(QModbusDataUnit::InputRegisters, 0, 85);
if (auto *subreply = modbusDevice->sendReadRequest(*_unit, Boards[boardID].adr)) {
Boards[boardID].timerToDataResponse.start();
if (!subreply->isFinished())
{
connect(subreply, &QModbusReply::finished, this, [this, boardID]()
{
Boards[boardID].timerData->setText(QString("Data: %1 ms").arg(Boards[boardID].timerToStatusResponse.elapsed()));
auto subreply = qobject_cast<QModbusReply *>(sender()); auto subreply = qobject_cast<QModbusReply *>(sender());
displayResultOfScan(subreply, boardID); displayResultOfScan(subreply, boardID);
subreply->deleteLater(); subreply->deleteLater();
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID)); Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
}); });
else
delete reply; // broadcast replies return immediately
} else { } else {
QMessageBox::warning(this, QString("Ошибка при опросе платы #%1").arg(boardID+1), QString(tr("Read error: ") + modbusDevice->errorString())); Boards[boardID].timerToDataResponse.elapsed();
statusBar()->showMessage(tr("Read error: ") + modbusDevice->errorString(), 5000); unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_TX)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
delete subreply;
}
} else {
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_TX)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
delete subreply;
}
} else {
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_TX)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
}
});
else
{
Boards[boardID].timerToStatusResponse.elapsed();
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_TX)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
Boards[boardID].boardScanners->start(m_deviceSettingsDialog->currentBoardTimer(boardID));
delete reply; // broadcast replies return immediately
}
} else {
// QMessageBox::warning(this, QString("Ошибка при опросе платы #%1").arg(boardID+1), QString(tr("Read error: ") + modbusDevice->errorString()));
// statusBar()->showMessage(tr("Read error: ") + modbusDevice->errorString(), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(modbusDevice->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_TX)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
} }
@@ -1195,10 +1570,22 @@ void M3KTE::displayResultOfScan(QModbusReply *reply, int boardID)
if(unit.startAddress() != 0 || unit.valueCount() != 85) if(unit.startAddress() != 0 || unit.valueCount() != 85)
{ {
//ERROR //ERROR
//QMessageBox::warning(this, QString("Ошибка при опросе платы #%1").arg(boardID), QString("Принятый ответ: Стартовый адрес %1, Количество элементов %2").arg(unit.startAddress()).arg(unit.valueCount()));
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem("Ошибка при приёме."));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_RX)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString("Принятый ответ: Стартовый адрес %1, Количество элементов %2").arg(unit.startAddress()).arg(unit.valueCount())));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
reply->deleteLater(); reply->deleteLater();
QMessageBox::warning(this, QString("Ошибка при опросе платы #%1").arg(boardID), QString("Принятый ответ: Стартовый адрес %1, Количество элементов %2").arg(unit.startAddress()).arg(unit.valueCount()));
return; return;
} }
QString W_Adr;
QString A_Adr;
for(int i = unit.startAddress(), total = int(unit.valueCount()); i < total; ++i) for(int i = unit.startAddress(), total = int(unit.valueCount()); i < total; ++i)
{ {
if(Boards[boardID].coil[i]==true) if(Boards[boardID].coil[i]==true)
@@ -1207,13 +1594,24 @@ void M3KTE::displayResultOfScan(QModbusReply *reply, int boardID)
if(Boards[boardID].HR[i + 85] > unit.value(i)) if(Boards[boardID].HR[i + 85] > unit.value(i))
{ {
j = 1; j = 1;
if(j != m_ProgressBar[i+boardID*85]->value())
{
A_Adr += tr("ТЭ%1 ").arg(i);
Boards[boardID].error_A++;
}
m_ProgressBar[i+boardID*85]->setStatusTip(QString("П%1 ТЭ%2: Аварийный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85))); m_ProgressBar[i+boardID*85]->setStatusTip(QString("П%1 ТЭ%2: Аварийный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85)));
m_ProgressBar[i+boardID*85]->setWhatsThis(QString("П%1 ТЭ%2: Аварийный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85))); m_ProgressBar[i+boardID*85]->setWhatsThis(QString("П%1 ТЭ%2: Аварийный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85)));
A_Flag = true; A_Flag = true;
} }
else if(Boards[boardID].HR[i] > unit.value(i)) else if(Boards[boardID].HR[i] > unit.value(i))
{ {
j = 2; j = 2;
if(j != m_ProgressBar[i+boardID*85]->value())
{
W_Adr += tr("ТЭ%1 ").arg(i);
Boards[boardID].error_W++;
}
m_ProgressBar[i+boardID*85]->setStatusTip(QString("П%1 ТЭ%2: Предупредительный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85))); m_ProgressBar[i+boardID*85]->setStatusTip(QString("П%1 ТЭ%2: Предупредительный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85)));
m_ProgressBar[i+boardID*85]->setWhatsThis(QString("П%1 ТЭ%2: Предупредительный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85))); m_ProgressBar[i+boardID*85]->setWhatsThis(QString("П%1 ТЭ%2: Предупредительный уровень напряжения.").arg(QString::number(boardID+1), QString::number(i%85)));
W_Flag = true; W_Flag = true;
@@ -1240,11 +1638,35 @@ void M3KTE::displayResultOfScan(QModbusReply *reply, int boardID)
Boards[boardID].ModbusModelHoldingReg->set_currentU(unit.value(i), i); Boards[boardID].ModbusModelHoldingReg->set_currentU(unit.value(i), i);
} }
if(A_Flag) if(A_Flag)
{
statusM3KTE.Accidents[boardID] = true; statusM3KTE.Accidents[boardID] = true;
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem("Авария"));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(Boards[boardID].error_A)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(A_Adr));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
}
else else
statusM3KTE.Accidents[boardID] = false; statusM3KTE.Accidents[boardID] = false;
if(W_Flag) if(W_Flag)
{
statusM3KTE.Warnings[boardID] = true; statusM3KTE.Warnings[boardID] = true;
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem("Предупреждение"));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(Boards[boardID].error_W)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(W_Adr));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
}
else else
statusM3KTE.Warnings[boardID] = false; statusM3KTE.Warnings[boardID] = false;
ui->BSM_Warning->setChecked(false); ui->BSM_Warning->setChecked(false);
@@ -1270,18 +1692,39 @@ void M3KTE::displayResultOfScan(QModbusReply *reply, int boardID)
statusBar()->showMessage(tr("Read response error: %1 (Mobus exception: 0x%2)"). statusBar()->showMessage(tr("Read response error: %1 (Mobus exception: 0x%2)").
arg(reply->errorString()). arg(reply->errorString()).
arg(reply->rawResult().exceptionCode(), -1, 16), 5000); arg(reply->rawResult().exceptionCode(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_RX)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString("Mobus exception: 0x%1").arg(reply->rawResult().exceptionCode(), -1, 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} else { } else {
statusBar()->showMessage(tr("Read response error: %1 (code: 0x%2)"). statusBar()->showMessage(tr("Read response error: %1 (code: 0x%2)").
arg(reply->errorString()). arg(reply->errorString()).
arg(reply->error(), -1, 16), 5000); arg(reply->error(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(boardID+1).arg(Boards[boardID].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[boardID].error_RX)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString::number(reply->error(), 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
reply->deleteLater(); reply->deleteLater();
} }
void M3KTE::applySettingsFromScan(QModbusReply *reply) void M3KTE::applySettingsFromScan(QModbusReply *reply)
{ {
if (reply->error() == QModbusDevice::NoError) {
const QModbusDataUnit unit = reply->result();
int Adr = 255; int Adr = 255;
for(int i = 0; i < 4; i++) for(int i = 0; i < 4; i++)
{ {
@@ -1291,6 +1734,8 @@ void M3KTE::applySettingsFromScan(QModbusReply *reply)
break; break;
} }
} }
if (reply->error() == QModbusDevice::NoError) {
const QModbusDataUnit unit = reply->result();
for (int i = 0, total = int(unit.valueCount()); i < (total); ++i) { for (int i = 0, total = int(unit.valueCount()); i < (total); ++i) {
if(unit.registerType() == QModbusDataUnit::Coils) if(unit.registerType() == QModbusDataUnit::Coils)
{ {
@@ -1311,13 +1756,34 @@ void M3KTE::applySettingsFromScan(QModbusReply *reply)
} }
} }
} else if (reply->error() == QModbusDevice::ProtocolError) { } else if (reply->error() == QModbusDevice::ProtocolError) {
statusBar()->showMessage(tr("Read response error: %1 (Mobus exception: 0x%2)"). statusBar()->showMessage(tr("Read response error: %1 (Mobus exception: 0x%2)").
arg(reply->errorString()). arg(reply->errorString()).
arg(reply->rawResult().exceptionCode(), -1, 16), 5000); arg(reply->rawResult().exceptionCode(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(Adr+1).arg(Boards[Adr].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[Adr].error_RX)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString("Mobus exception: 0x%1").arg(reply->rawResult().exceptionCode(), -1, 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} else { } else {
statusBar()->showMessage(tr("Read response error: %1 (code: 0x%2)"). statusBar()->showMessage(tr("Read response error: %1 (code: 0x%2)").
arg(reply->errorString()). arg(reply->errorString()).
arg(reply->error(), -1, 16), 5000); arg(reply->error(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(Adr+1).arg(Boards[Adr].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[Adr].error_RX)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString::number(reply->error(), 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
reply->deleteLater(); reply->deleteLater();
} }
@@ -1360,15 +1826,36 @@ void M3KTE::multipleRegSend()
} }
} }
if (auto *reply = modbusDevice->sendWriteRequest(*unit_tx, Boards[m_regMultipleSettings->getBoardId()].adr)) { if (auto *reply = modbusDevice->sendWriteRequest(*unit_tx, Boards[m_regMultipleSettings->getBoardId()].adr)) {
unsigned Adr = m_regMultipleSettings->getBoardId();
if (!reply->isFinished()) { if (!reply->isFinished()) {
connect(reply, &QModbusReply::finished, this, [this, reply]() { connect(reply, &QModbusReply::finished, this, [this, reply, Adr]() {
if (reply->error() == QModbusDevice::ProtocolError) { if (reply->error() == QModbusDevice::ProtocolError) {
statusBar()->showMessage(tr("Write response error: %1 (Mobus exception: 0x%2)") statusBar()->showMessage(tr("Write response error: %1 (Mobus exception: 0x%2)")
.arg(reply->errorString()).arg(reply->rawResult().exceptionCode(), -1, 16), .arg(reply->errorString()).arg(reply->rawResult().exceptionCode(), -1, 16),
5000); 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(Adr+1).arg(Boards[Adr].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[Adr].error_TX)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString("Mobus exception: 0x%1").arg(reply->rawResult().exceptionCode(), -1, 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} else if (reply->error() != QModbusDevice::NoError) { } else if (reply->error() != QModbusDevice::NoError) {
statusBar()->showMessage(tr("Write response error: %1 (code: 0x%2)"). statusBar()->showMessage(tr("Write response error: %1 (code: 0x%2)").
arg(reply->errorString()).arg(reply->error(), -1, 16), 5000); arg(reply->errorString()).arg(reply->error(), -1, 16), 5000);
unsigned newRow = loggerTable->rowCount();
loggerTable->insertRow(newRow);
loggerTable->setItem(newRow, 0, new QTableWidgetItem((QTime::currentTime().toString("HH:mm:ss"))));
loggerTable->setItem(newRow, 1, new QTableWidgetItem(tr("Плата %1 (ID %2)").arg(Adr+1).arg(Boards[Adr].adr)));
loggerTable->setItem(newRow, 2, new QTableWidgetItem(reply->errorString()));
loggerTable->setItem(newRow, 3, new QTableWidgetItem(QString::number(++Boards[Adr].error_TX)));
loggerTable->setItem(newRow, 4, new QTableWidgetItem(QString::number(reply->error(), 16)));
loggerTable->resizeColumnsToContents();
if(!loggerTable->verticalScrollBar()->isSliderDown())
loggerTable->verticalScrollBar()->setSliderPosition(loggerTable->verticalScrollBar()->maximum());
} }
reply->deleteLater(); reply->deleteLater();
}); });
@@ -1543,7 +2030,7 @@ bool M3KTE::autoBaudRateScan()
{ {
if(isRun) if(isRun)
{ {
dfQMessageBox::warning(this, "Ошибка при получении текущих настроек.", QString("Прерывание по запросу пользователя.")); //dfQMessageBox::warning(this, "Ошибка при синхронизации скоростей.", QString("Прерывание по запросу пользователя."));
onConnectClicked(); onConnectClicked();
bar->close(); bar->close();
bar->deleteLater(); bar->deleteLater();
@@ -1564,7 +2051,7 @@ bool M3KTE::autoBaudRateScan()
{ {
if(isRun) if(isRun)
{ {
dfQMessageBox::warning(this, "Ошибка при получении текущих настроек.", QString("Прерывание по запросу пользователя.")); //dfQMessageBox::warning(this, "Ошибка при получении текущих настроек.", QString("Прерывание по запросу пользователя."));
onConnectClicked(); onConnectClicked();
bar->close(); bar->close();
bar->deleteLater(); bar->deleteLater();
@@ -1574,7 +2061,7 @@ bool M3KTE::autoBaudRateScan()
} }
if(subreply->error()!=QModbusDevice::NoError) if(subreply->error()!=QModbusDevice::NoError)
{ {
QMessageBox::warning() //QMessageBox::warning();
onConnectClicked(); onConnectClicked();
bar->close(); bar->close();
bar->deleteLater(); bar->deleteLater();
@@ -1589,8 +2076,18 @@ bool M3KTE::autoBaudRateScan()
modbusDevice->disconnectDevice(); modbusDevice->disconnectDevice();
} }
} }
}
return true; return true;
} }
else else
return false; return false;
} }
void M3KTE::stopScanBoard()
{
for (int i = 0; i < 4; i++) {
Boards[i].boardScanners->stop();
}
return;
}

View File

@@ -10,6 +10,7 @@
#include "devicesettingsdialog.h" #include "devicesettingsdialog.h"
#include "multiplesettings.h" #include "multiplesettings.h"
#include "scanboard.h" #include "scanboard.h"
#include "lineringer.h"
#include <QModbusTcpClient> #include <QModbusTcpClient>
#include <QModbusRtuSerialMaster> #include <QModbusRtuSerialMaster>
@@ -20,6 +21,9 @@
#include <QErrorMessage> #include <QErrorMessage>
#include <QPushButton> #include <QPushButton>
#include <QGroupBox> #include <QGroupBox>
#include <QTableWidget>
#include <QTime>
#include <QElapsedTimer>
#include <QtSerialBus/qtserialbusglobal.h> #include <QtSerialBus/qtserialbusglobal.h>
@@ -29,6 +33,8 @@
#define MODBUS_REQUEST_PROTOCOL_INFO_LENGTH 8 #define MODBUS_REQUEST_PROTOCOL_INFO_LENGTH 8
extern "C" __declspec(dllexport) QWidget* init(QWidget *parent);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { class M3KTE; class SettingsDialog;} namespace Ui { class M3KTE; class SettingsDialog;}
QT_END_NAMESPACE QT_END_NAMESPACE
@@ -44,10 +50,10 @@ private:
QModbusDataUnit readRequest() const; QModbusDataUnit readRequest() const;
QModbusDataUnit writeRequest() const; QModbusDataUnit writeRequest() const;
void changeTable(int board, int tabletype); void changeTable(int board, int tabletype);
void errorAdrChange();
bool event(QEvent* event); bool event(QEvent* event);
bool pingNetworkDevices(); bool pingNetworkDevices();
void beginScanBoards(); void beginScanBoards();
void stopScanBoard();
void displayResultOfScan(QModbusReply *reply, int boardID); void displayResultOfScan(QModbusReply *reply, int boardID);
void applySettingsFromScan(QModbusReply *reply); void applySettingsFromScan(QModbusReply *reply);
@@ -84,6 +90,7 @@ public:
private: private:
Ui::M3KTE *ui; Ui::M3KTE *ui;
QTableWidget *loggerTable = nullptr;
int CurrentConnectedDevice = 0; int CurrentConnectedDevice = 0;
//int DeviceOnNetwork[4]; //int DeviceOnNetwork[4];
QProgressBar *m_ProgressBar[320]; QProgressBar *m_ProgressBar[320];
@@ -94,6 +101,8 @@ private:
SettingsDialog *m_settingsDialog = nullptr; SettingsDialog *m_settingsDialog = nullptr;
MultipleSettings *m_regMultipleSettings = nullptr; MultipleSettings *m_regMultipleSettings = nullptr;
ScanBoard *m_scanBoard = nullptr; ScanBoard *m_scanBoard = nullptr;
LineRinger *m_lineRinger = nullptr;
QGroupBox *Boards_Fields[4]; QGroupBox *Boards_Fields[4];
//WriteRegisterModel *writeModel = nullptr; //WriteRegisterModel *writeModel = nullptr;
@@ -102,9 +111,12 @@ private:
bool Accidents[4]; bool Accidents[4];
}statusM3KTE; }statusM3KTE;
unsigned error_terminal;
struct BoardModbusRegisters struct BoardModbusRegisters
{ {
bool isActive = false; bool isActive = false;
bool pollIsActive = true;
int adr; int adr;
int _tmp_adr; int _tmp_adr;
@@ -112,9 +124,39 @@ private:
bool coil[85]; bool coil[85];
unsigned HR[170]; unsigned HR[170];
unsigned error_W = 0;
unsigned error_A = 0;
unsigned error_modbus = 0;
unsigned error_baud_change = 0;
unsigned error_parity_change = 0;
unsigned error_RX = 0;
unsigned error_TX = 0;
unsigned error_adr_change = 0;
unsigned error_cmd_change = 0;
QLabel *timerData = nullptr;
QLabel *timerStatus = nullptr;
WriteRegisterModel *ModbusModelCoil; WriteRegisterModel *ModbusModelCoil;
WriteRegisterModel *ModbusModelHoldingReg; WriteRegisterModel *ModbusModelHoldingReg;
QTimer *boardScanners; QTimer *boardScanners;
QElapsedTimer timerToStatusResponse;
QElapsedTimer timerToDataResponse;
}Boards[4]; }Boards[4];
union statusreg
{
struct parsingFields
{
unsigned accident:1;
unsigned warning:1;
unsigned poll_allowed:1;
unsigned mzkte_status:2;
unsigned reserv:3;
unsigned mzkte_error:8;
}ParsingReg;
unsigned AllReg:16;
};
}; };
#endif // M3KTE_H #endif // M3KTE_H

File diff suppressed because it is too large Load Diff

View File

@@ -12,13 +12,15 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
ui->baudCombo->setCurrentText(QString::number(m_settings.baud)); ui->baudCombo->setCurrentText(QString::number(m_settings.baud));
ui->dataBitsCombo->setCurrentText(QString::number(m_settings.dataBits)); ui->dataBitsCombo->setCurrentText(QString::number(m_settings.dataBits));
ui->stopBitsCombo->setCurrentText(QString::number(m_settings.stopBits)); ui->stopBitsCombo->setCurrentText(QString::number(m_settings.stopBits));
on_updateComBox_clicked();
#endif #endif
ui->timeoutSpinner->setValue(m_settings.responseTime); ui->timeoutSpinner->setValue(m_settings.responseTime);
ui->retriesSpinner->setValue(m_settings.numberOfRetries); ui->retriesSpinner->setValue(m_settings.numberOfRetries);
connect(ui->AcceptOrRejectButtonBox, &QDialogButtonBox::accepted, [this]() { connect(ui->AcceptOrRejectButtonBox, &QDialogButtonBox::accepted, [this]() {
#if QT_CONFIG(modbus_serialport) #if QT_CONFIG(modbus_serialport)
m_settings.portName = ui->portEdit->text(); m_settings.portName = ui->comBox->currentData().toString();
m_settings.parity = ui->parityCombo->currentIndex(); m_settings.parity = ui->parityCombo->currentIndex();
if (m_settings.parity > 0) if (m_settings.parity > 0)
m_settings.parity++; m_settings.parity++;
@@ -70,3 +72,13 @@ int SettingsDialog::curParity()
{ {
return ui->parityCombo->currentIndex(); return ui->parityCombo->currentIndex();
} }
void SettingsDialog::on_updateComBox_clicked()
{
ui->comBox->clear();
const auto listPorts = QSerialPortInfo::availablePorts();
for (const auto& port: listPorts)
{
ui->comBox->addItem(QString(port.portName() + ": " + port.manufacturer()), QVariant(port.portName()));
}
}

View File

@@ -6,6 +6,7 @@
#include <QtSerialBus/qtserialbusglobal.h> #include <QtSerialBus/qtserialbusglobal.h>
#if QT_CONFIG(modbus_serialport) #if QT_CONFIG(modbus_serialport)
#include <QSerialPort> #include <QSerialPort>
#include <QSerialPortInfo>
#endif #endif
namespace Ui { namespace Ui {
@@ -37,6 +38,9 @@ public:
int curBaud(); int curBaud();
int curParity(); int curParity();
private slots:
void on_updateComBox_clicked();
private: private:
Settings m_settings; Settings m_settings;
Ui::SettingsDialog *ui; Ui::SettingsDialog *ui;

View File

@@ -69,16 +69,6 @@
<string>Serial Parameters</string> <string>Serial Parameters</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="portLabel">
<property name="text">
<string>Порт</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="portEdit"/>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="parityLabel"> <widget class="QLabel" name="parityLabel">
<property name="text"> <property name="text">
@@ -86,32 +76,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QComboBox" name="parityCombo">
<item>
<property name="text">
<string>No</string>
</property>
</item>
<item>
<property name="text">
<string>Even</string>
</property>
</item>
<item>
<property name="text">
<string>Odd</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="baudLabel">
<property name="text">
<string>Скорость</string>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="baudCombo"> <widget class="QComboBox" name="baudCombo">
<property name="currentIndex"> <property name="currentIndex">
@@ -166,6 +130,51 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1">
<widget class="QComboBox" name="stopBitsCombo">
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>3</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="baudLabel">
<property name="text">
<string>Скорость</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="parityCombo">
<item>
<property name="text">
<string>No</string>
</property>
</item>
<item>
<property name="text">
<string>Even</string>
</property>
</item>
<item>
<property name="text">
<string>Odd</string>
</property>
</item>
</widget>
</item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QComboBox" name="dataBitsCombo"> <widget class="QComboBox" name="dataBitsCombo">
<property name="currentIndex"> <property name="currentIndex">
@@ -193,6 +202,13 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="portLabel">
<property name="text">
<string>Порт</string>
</property>
</widget>
</item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="stopBitsLabel"> <widget class="QLabel" name="stopBitsLabel">
<property name="text"> <property name="text">
@@ -200,25 +216,39 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="stopBitsCombo"> <layout class="QGridLayout" name="gridLayout_3">
<item> <item row="0" column="1">
<property name="text"> <widget class="QComboBox" name="comBox">
<string>1</string> <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property> </property>
</item>
<item>
<property name="text">
<string>3</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<widget class="QPushButton" name="updateComBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>45</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Поиск</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>