h-4nd-h
/
Servo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add SetSingleCoil

test
nasicurious 3 years ago
parent
b25a8b3240
commit
0a12dd085d
7 changed files with 203 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Servo/include/ModbusMaster.h
  2. 5
      Servo/include/ModbusWrapper.h
  3. 64
      Servo/src/ModbusMaster.cpp
  4. 33
      Servo/src/ModbusWrapper.cpp
  5. 8
      Test/MainWindow.cpp
  6. 1
      Test/MainWindow.h
  7. 145
      Test/MainWindow.ui

7
Servo/include/ModbusMaster.h
View File

@ -21,6 +21,8 @@ private:
QModbusClient* _modbusDevice = nullptr; QModbusClient* _modbusDevice = nullptr;
int _clientAddress; int _clientAddress;
QModbusDataUnit _modbusReplyUnit; QModbusDataUnit _modbusReplyUnit;
QBitArray _coilsToWrite;
QVector<quint16> _RegistersToWrite;
public: public:
explicit ModbusMaster(QObject* parent = nullptr); explicit ModbusMaster(QObject* parent = nullptr);
@ -29,7 +31,9 @@ public:
int startAddress, int startAddress,
quint16 readSize); quint16 readSize);
void checkForError(QModbusReply* _reply); void checkForError(QModbusReply* _reply);
void modbusReplyRecieved(); void writeRequest(QModbusDataUnit::RegisterType registerType,
int startAddress,
quint16 writeSize);
//uncrustify off //uncrustify off
public slots: public slots:
@ -42,6 +46,7 @@ public slots:
QBitArray getInputCoil(int startAddress, quint16 readSize); QBitArray getInputCoil(int startAddress, quint16 readSize);
QVector<quint16> getHoldingRegister(int startAddress, quint16 readSize); QVector<quint16> getHoldingRegister(int startAddress, quint16 readSize);
QVector<quint16> getInputRegister(int startAddress, quint16 readSize); QVector<quint16> getInputRegister(int startAddress, quint16 readSize);
void setSingleCoil(int startAddress, bool coilFlag);
}; };
#endif //MODBUSMASTER_H #endif //MODBUSMASTER_H

5
Servo/include/ModbusWrapper.h
View File

@ -21,11 +21,14 @@ public:
~ModbusWrapper(); ~ModbusWrapper();
void connectToDevice(ModbusConfig modbusConfig); void connectToDevice(ModbusConfig modbusConfig);
void init(); void init();
QBitArray getCoil(int startAddress, quint16 readSize); QBitArray getCoil(int startAddress, quint16 readSize);
QBitArray getInputCoil(int startAddress, quint16 readSize); QBitArray getInputCoil(int startAddress, quint16 readSize);
QVector<quint16> getHoldingRegister(int startAddress, quint16 readSize); QVector<quint16> getHoldingRegister(int startAddress, quint16 readSize);
QVector<quint16> getInputRegister(int startAddress, quint16 readSize); QVector<quint16> getInputRegister(int startAddress, quint16 readSize);
void setSingleCoil(int startAddress, bool coilFlag);
signals: signals:
void connectOrder(ModbusConfig modbusConfig); void connectOrder(ModbusConfig modbusConfig);
void initOrder(); void initOrder();
@ -35,6 +38,8 @@ signals:
quint16 readSize); quint16 readSize);
QVector<quint16> getInputRegisterOrder(int startAddress, quint16 readSize); QVector<quint16> getInputRegisterOrder(int startAddress, quint16 readSize);
void setSingleCoilOrder(int startAddress, bool coilFlag);
//uncrustify off //uncrustify off
public slots: public slots:
//uncrustify on //uncrustify on

64
Servo/src/ModbusMaster.cpp
View File

@ -29,8 +29,6 @@ void ModbusMaster::init()
{ {
throw ServoException("Modbus Device Created Before Handle it"); throw ServoException("Modbus Device Created Before Handle it");
} }
qDebug() << "internal init";
} }
/*************************************************************************************************/ /*************************************************************************************************/
@ -66,8 +64,6 @@ void ModbusMaster::connectionStateChanged(QModbusDevice::State state)
{ {
throw ServoException("Connection wasnt prepared"); throw ServoException("Connection wasnt prepared");
} }
qDebug() << "internal connect";
} }
/*************************************************************************************************/ /*************************************************************************************************/
@ -174,6 +170,26 @@ QVector<quint16> ModbusMaster::getInputRegister(int startAddress, quint16 readSi
} }
} }
/*************************************************************************************************/
void ModbusMaster::setSingleCoil(int startAddress, bool coilFlag)
{
try
{
_coilsToWrite.resize(1);
if(coilFlag)
_coilsToWrite.setBit(0);
else
_coilsToWrite.clearBit(0);
writeRequest(QModbusDataUnit::RegisterType::Coils, startAddress, 1);
}
catch(const ServoException& ex)
{
qDebug() << ex.what();
}
}
/*************************************************************************************************/ /*************************************************************************************************/
void ModbusMaster::readRequest(QModbusDataUnit::RegisterType registerType, void ModbusMaster::readRequest(QModbusDataUnit::RegisterType registerType,
int startAddress, int startAddress,
@ -229,15 +245,41 @@ void ModbusMaster::checkForError(QModbusReply* _reply)
} }
} }
void ModbusMaster::modbusReplyRecieved() /*************************************************************************************************/
void ModbusMaster::writeRequest(QModbusDataUnit::RegisterType registerType,
int startAddress,
quint16 writeSize)
{ {
auto reply = qobject_cast<QModbusReply*>(sender()); auto table = registerType;
QModbusDataUnit writeUnit = QModbusDataUnit(table, startAddress, writeSize);
for(int i = 0; i < writeUnit.valueCount(); i++)
{
if(table == QModbusDataUnit::Coils)
writeUnit.setValue(i, _coilsToWrite[i]);
else
writeUnit.setValue(i, _RegistersToWrite[i]);
}
if(!reply) if(auto* reply = _modbusDevice->sendWriteRequest(writeUnit, _clientAddress))
return; {
if(!reply->isFinished())
{
QEventLoop loop;
connect(reply, &QModbusReply::finished, &loop,
&QEventLoop::quit
);
loop.exec();
checkForError(reply); checkForError(reply);
_modbusReplyUnit = reply->result(); _modbusReplyUnit = reply->result();
reply->deleteLater(); reply->deleteLater();
}
else
delete reply; //broadcast replies return immediately
}
else
{
throw ServoException(_modbusDevice->errorString());
}
} }

33
Servo/src/ModbusWrapper.cpp
View File

@ -54,6 +54,12 @@ void ModbusWrapper::init()
&ModbusMaster::getInputRegister, &ModbusMaster::getInputRegister,
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
connect(this,
&ModbusWrapper::setSingleCoilOrder,
&_modbusMaster,
&ModbusMaster::setSingleCoil,
Qt::BlockingQueuedConnection);
emit initOrder(); emit initOrder();
qDebug() << "init done"; qDebug() << "init done";
@ -62,44 +68,35 @@ void ModbusWrapper::init()
/*************************************************************************************************/ /*************************************************************************************************/
QBitArray ModbusWrapper::getCoil(int startAddress, quint16 readSize) QBitArray ModbusWrapper::getCoil(int startAddress, quint16 readSize)
{ {
auto result = emit getCoilOrder(startAddress, readSize); return emit getCoilOrder(startAddress, readSize);
qDebug() << "getCoil done";
return result;
} }
/*************************************************************************************************/ /*************************************************************************************************/
QBitArray ModbusWrapper::getInputCoil(int startAddress, quint16 readSize) QBitArray ModbusWrapper::getInputCoil(int startAddress, quint16 readSize)
{ {
auto result = emit getInputCoilOrder(startAddress, readSize); return emit getInputCoilOrder(startAddress, readSize);
qDebug() << "getInputCoilOrder done";
return result;
} }
/*************************************************************************************************/ /*************************************************************************************************/
QVector<quint16> ModbusWrapper::getHoldingRegister(int startAddress, quint16 readSize) QVector<quint16> ModbusWrapper::getHoldingRegister(int startAddress, quint16 readSize)
{ {
auto result = emit getHoldingRegisterOrder(startAddress, readSize); return emit getHoldingRegisterOrder(startAddress, readSize);
qDebug() << "getHoldingRegister done";
return result;
} }
/*************************************************************************************************/ /*************************************************************************************************/
QVector<quint16> ModbusWrapper::getInputRegister(int startAddress, quint16 readSize) QVector<quint16> ModbusWrapper::getInputRegister(int startAddress, quint16 readSize)
{ {
auto result = emit getInputRegisterOrder(startAddress, readSize); return emit getInputRegisterOrder(startAddress, readSize);
qDebug() << "getInputRegister done"; }
return result; /*************************************************************************************************/
void ModbusWrapper::setSingleCoil(int startAddress, bool coilFlag)
{
emit setSingleCoilOrder(startAddress, coilFlag);
} }
/*************************************************************************************************/ /*************************************************************************************************/
void ModbusWrapper::connectToDevice(ModbusConfig modbusConfig) void ModbusWrapper::connectToDevice(ModbusConfig modbusConfig)
{ {
emit connectOrder(modbusConfig); emit connectOrder(modbusConfig);
qDebug() << "connect done";
} }
/*************************************************************************************************/

8
Test/MainWindow.cpp
View File

@ -94,3 +94,11 @@ void MainWindow::printRegisterDataFromClient(QVector<quint16> uiHoldingRegisters
} }
ui->textEditRead->setText(readedData); ui->textEditRead->setText(readedData);
} }
void MainWindow::on_writeSingleCoil_clicked()
{
int startAddress = ui->writeSingleCoilAddress->text().toInt();
QBitArray uiCoils;
uiCoils.resize(1);
modbusWrapper.setSingleCoil(startAddress, ui->coilData->isChecked());
}

1
Test/MainWindow.h
View File

@ -31,6 +31,7 @@ private slots:
void on_connect_clicked(); void on_connect_clicked();
//uncrustify on //uncrustify on
void on_readButton_clicked(); void on_readButton_clicked();
void on_writeSingleCoil_clicked();
}; };
#endif //MAINWINDOW_H #endif //MAINWINDOW_H

145
Test/MainWindow.ui
View File

@ -17,8 +17,8 @@
<widget class="QPushButton" name="connect"> <widget class="QPushButton" name="connect">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>360</x> <x>40</x>
<y>30</y> <y>10</y>
<width>89</width> <width>89</width>
<height>25</height> <height>25</height>
</rect> </rect>
@ -76,8 +76,8 @@
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>43</x> <x>160</x>
<y>430</y> <y>10</y>
<width>41</width> <width>41</width>
<height>25</height> <height>25</height>
</rect> </rect>
@ -86,30 +86,11 @@
<string>Table:</string> <string>Table:</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="readButton">
<property name="geometry">
<rect>
<x>345</x>
<y>430</y>
<width>80</width>
<height>25</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Read</string>
</property>
</widget>
<widget class="QComboBox" name="writeTable"> <widget class="QComboBox" name="writeTable">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>90</x> <x>207</x>
<y>430</y> <y>10</y>
<width>86</width> <width>86</width>
<height>25</height> <height>25</height>
</rect> </rect>
@ -128,16 +109,120 @@
<string>Result:</string> <string>Result:</string>
</property> </property>
</widget> </widget>
<widget class="QTextEdit" name="textEditRead"> <widget class="QGroupBox" name="groupBox">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>40</x> <x>10</x>
<y>200</y> <y>70</y>
<width>257</width> <width>311</width>
<height>221</height> <height>381</height>
</rect>
</property>
<property name="title">
<string>Read Data From Device</string>
</property>
<widget class="QTextEdit" name="textEditRead">
<property name="geometry">
<rect>
<x>20</x>
<y>120</y>
<width>257</width>
<height>221</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="readButton">
<property name="geometry">
<rect>
<x>100</x>
<y>350</y>
<width>80</width>
<height>25</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Read</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_2">
<property name="geometry">
<rect>
<x>340</x>
<y>70</y>
<width>191</width>
<height>111</height>
</rect> </rect>
</property> </property>
<property name="title">
<string>Write Single Coil</string>
</property>
<widget class="QCheckBox" name="coilData">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>61</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Coil</string>
</property>
</widget>
<widget class="QLineEdit" name="writeSingleCoilAddress">
<property name="geometry">
<rect>
<x>70</x>
<y>40</y>
<width>113</width>
<height>25</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<width>71</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>address:</string>
</property>
</widget>
<widget class="QPushButton" name="writeSingleCoil">
<property name="geometry">
<rect>
<x>20</x>
<y>70</y>
<width>141</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string>Write Single Coil</string>
</property>
</widget>
</widget> </widget>
<zorder>groupBox</zorder>
<zorder>connect</zorder>
<zorder>label_5</zorder>
<zorder>label_4</zorder>
<zorder>startAddress</zorder>
<zorder>readSize</zorder>
<zorder>label_6</zorder>
<zorder>writeTable</zorder>
<zorder>label_9</zorder>
<zorder>groupBox_2</zorder>
</widget> </widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">

Write Preview
Loading…
Cancel
Save