Снапшот перед обновлением алгоритма смены скоростей на платах

This commit is contained in:
Вячеслав Штейбезандт 2025-09-09 16:48:21 +03:00
parent 7dc314d266
commit a4cdcb7091
11 changed files with 357 additions and 417 deletions

Binary file not shown.

View File

@ -16,8 +16,8 @@ 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 #TEMPLATE = lib
DEFINES += M3KTE_LIBRARY #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.
@ -52,11 +52,11 @@ FORMS += \
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
#unix {
# target.path = /usr/lib
#}
#!isEmpty(target.path): INSTALLS += target

View File

@ -130,6 +130,8 @@ void DeviceSettingsDialog::on_buttonBox_clicked(QAbstractButton *button)
case QDialogButtonBox::AcceptRole: case QDialogButtonBox::AcceptRole:
close(); close();
break; break;
default:
break;
} }
} }
@ -152,5 +154,12 @@ void DeviceSettingsDialog::on_buttonApplyChangePoll_clicked()
void DeviceSettingsDialog::on_idPollComboBox_currentIndexChanged(int index) void DeviceSettingsDialog::on_idPollComboBox_currentIndexChanged(int index)
{ {
Q_UNUSED(index);
ui->pollStatusBox->setCurrentIndex(_currentPollStatus[ui->idPollComboBox->currentData().toUInt()]); ui->pollStatusBox->setCurrentIndex(_currentPollStatus[ui->idPollComboBox->currentData().toUInt()]);
} }
void DeviceSettingsDialog::onDisconnect()
{
ui->idComboBox->clear();
ui->idPollComboBox->clear();
}

View File

@ -53,6 +53,7 @@ public:
void updateSettingsAfterConnection(unsigned tmp_speed, unsigned tmp_parity, unsigned *tmp_adr, bool *ActiveDevices); void updateSettingsAfterConnection(unsigned tmp_speed, unsigned tmp_parity, unsigned *tmp_adr, bool *ActiveDevices);
void updatePollStatus(unsigned boardID, bool status); void updatePollStatus(unsigned boardID, bool status);
void initPollForBoard(unsigned boardID, unsigned boardAdr); void initPollForBoard(unsigned boardID, unsigned boardAdr);
void onDisconnect();
signals: signals:
void parityChanged(); void parityChanged();
void speedChanged(); void speedChanged();

View File

@ -279,12 +279,12 @@
<widget class="QComboBox" name="pollStatusBox"> <widget class="QComboBox" name="pollStatusBox">
<item> <item>
<property name="text"> <property name="text">
<string>Вкл</string> <string>Выкл</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Выкл</string> <string>Вкл</string>
</property> </property>
</item> </item>
</widget> </widget>

View File

@ -282,6 +282,7 @@ void LineRinger::on_ringButton_clicked()
break; break;
} }
currentBaudRate = ui->baudRateBox->itemText(i).toUInt(nullptr, 10); currentBaudRate = ui->baudRateBox->itemText(i).toUInt(nullptr, 10);
bar->setLabelText(tr("Поиск устройств... Текущая скорость: %1").arg(currentBaudRate));
if(lineCall() == callStatus::INTERRUPT) if(lineCall() == callStatus::INTERRUPT)
{ {
QMessageBox::warning(this, "Уведомление", QString("Досрочное завершение опроса. Найдено %1 устройств.").arg(devicesList.count())); QMessageBox::warning(this, "Уведомление", QString("Досрочное завершение опроса. Найдено %1 устройств.").arg(devicesList.count()));

File diff suppressed because it is too large Load Diff

View File

@ -140,6 +140,7 @@ private:
WriteRegisterModel *ModbusModelCoil; WriteRegisterModel *ModbusModelCoil;
WriteRegisterModel *ModbusModelHoldingReg; WriteRegisterModel *ModbusModelHoldingReg;
QTimer *boardScanners; QTimer *boardScanners;
bool isScan = false;
QElapsedTimer timerToStatusResponse; QElapsedTimer timerToStatusResponse;
QElapsedTimer timerToDataResponse; QElapsedTimer timerToDataResponse;

View File

@ -161,6 +161,9 @@
</item> </item>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QGroupBox" name="BoxStatusTerm"> <widget class="QGroupBox" name="BoxStatusTerm">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -170,6 +173,9 @@
<property name="title"> <property name="title">
<string>Статус Терминала</string> <string>Статус Терминала</string>
</property> </property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QGridLayout" name="gridLayout_8">
<property name="leftMargin"> <property name="leftMargin">
<number>3</number> <number>3</number>

21
Release/.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

Binary file not shown.