Снапшот перед обновлением алгоритма смены скоростей на платах
This commit is contained in:
parent
7dc314d266
commit
a4cdcb7091
Binary file not shown.
@ -16,8 +16,8 @@ CONFIG += c++11
|
||||
# deprecated API in order to know how to port your code away from it.
|
||||
DEFINES += QT_DEPRECATED_WARNINGS
|
||||
|
||||
TEMPLATE = lib
|
||||
DEFINES += M3KTE_LIBRARY
|
||||
#TEMPLATE = lib
|
||||
#DEFINES += M3KTE_LIBRARY
|
||||
|
||||
# You can also make your code fail to compile if it uses deprecated APIs.
|
||||
# In order to do so, uncomment the following line.
|
||||
@ -52,11 +52,11 @@ FORMS += \
|
||||
settingsdialog.ui
|
||||
|
||||
# Default rules for deployment.
|
||||
#qnx: target.path = /tmp/$${TARGET}/bin
|
||||
#else: unix:!android: target.path = /opt/$${TARGET}/bin
|
||||
#!isEmpty(target.path): INSTALLS += target
|
||||
|
||||
unix {
|
||||
target.path = /usr/lib
|
||||
}
|
||||
qnx: target.path = /tmp/$${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
|
||||
|
@ -130,6 +130,8 @@ void DeviceSettingsDialog::on_buttonBox_clicked(QAbstractButton *button)
|
||||
case QDialogButtonBox::AcceptRole:
|
||||
close();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -152,5 +154,12 @@ void DeviceSettingsDialog::on_buttonApplyChangePoll_clicked()
|
||||
|
||||
void DeviceSettingsDialog::on_idPollComboBox_currentIndexChanged(int index)
|
||||
{
|
||||
Q_UNUSED(index);
|
||||
ui->pollStatusBox->setCurrentIndex(_currentPollStatus[ui->idPollComboBox->currentData().toUInt()]);
|
||||
}
|
||||
|
||||
void DeviceSettingsDialog::onDisconnect()
|
||||
{
|
||||
ui->idComboBox->clear();
|
||||
ui->idPollComboBox->clear();
|
||||
}
|
||||
|
@ -53,6 +53,7 @@ public:
|
||||
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);
|
||||
void onDisconnect();
|
||||
signals:
|
||||
void parityChanged();
|
||||
void speedChanged();
|
||||
|
@ -279,12 +279,12 @@
|
||||
<widget class="QComboBox" name="pollStatusBox">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Вкл</string>
|
||||
<string>Выкл</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Выкл</string>
|
||||
<string>Вкл</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
|
@ -282,6 +282,7 @@ void LineRinger::on_ringButton_clicked()
|
||||
break;
|
||||
}
|
||||
currentBaudRate = ui->baudRateBox->itemText(i).toUInt(nullptr, 10);
|
||||
bar->setLabelText(tr("Поиск устройств... Текущая скорость: %1").arg(currentBaudRate));
|
||||
if(lineCall() == callStatus::INTERRUPT)
|
||||
{
|
||||
QMessageBox::warning(this, "Уведомление", QString("Досрочное завершение опроса. Найдено %1 устройств.").arg(devicesList.count()));
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -140,6 +140,7 @@ private:
|
||||
WriteRegisterModel *ModbusModelCoil;
|
||||
WriteRegisterModel *ModbusModelHoldingReg;
|
||||
QTimer *boardScanners;
|
||||
bool isScan = false;
|
||||
|
||||
QElapsedTimer timerToStatusResponse;
|
||||
QElapsedTimer timerToDataResponse;
|
||||
|
@ -161,6 +161,9 @@
|
||||
</item>
|
||||
<item row="1" column="4">
|
||||
<widget class="QGroupBox" name="BoxStatusTerm">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
@ -170,6 +173,9 @@
|
||||
<property name="title">
|
||||
<string>Статус Терминала</string>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_8">
|
||||
<property name="leftMargin">
|
||||
<number>3</number>
|
||||
|
21
Release/.qmake.stash
Normal file
21
Release/.qmake.stash
Normal 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
Release/release/M3KTE_TERM.exe
Normal file
BIN
Release/release/M3KTE_TERM.exe
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user