Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2017-05-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 1/10 second hold-off between input polling calls to the
	Modbus driver in 'ripcd/modbus.cpp' and 'ripcd/modbus.h'.
This commit is contained in:
Fred Gleason 2017-05-18 17:40:36 -04:00
parent 1a94f58fff
commit c296491149
3 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15791,3 +15791,6 @@
* Added code to create and remove LOG_MODES table records when * Added code to create and remove LOG_MODES table records when
adding and removing Host definitions. adding and removing Host definitions.
* Incremented the database version to 263. * Incremented the database version to 263.
2017-05-18 Fred Gleason <fredg@paravelsystems.com>
* Added a 1/10 second hold-off between input polling calls to the
Modbus driver in 'ripcd/modbus.cpp' and 'ripcd/modbus.h'.

63
ripcd/modbus.cpp
View File

@ -46,6 +46,9 @@ Modbus::Modbus(RDMatrix *matrix,QObject *parent)
connect(modbus_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(modbus_socket,SIGNAL(error(int)),this,SLOT(errorData(int)));
modbus_socket->connectToHost(modbus_ip_address.toString(),modbus_ip_port); modbus_socket->connectToHost(modbus_ip_address.toString(),modbus_ip_port);
modbus_poll_timer=new QTimer(this);
connect(modbus_poll_timer,SIGNAL(timeout()),this,SLOT(pollInputs()));
modbus_watchdog_timer=new QTimer(this); modbus_watchdog_timer=new QTimer(this);
connect(modbus_watchdog_timer,SIGNAL(timeout()),this,SLOT(watchdogData())); connect(modbus_watchdog_timer,SIGNAL(timeout()),this,SLOT(watchdogData()));
} }
@ -99,7 +102,7 @@ void Modbus::connectedData()
"connection to Modbus device at %s:%u established", "connection to Modbus device at %s:%u established",
(const char *)modbus_ip_address.toString(),0xffff&modbus_ip_port); (const char *)modbus_ip_address.toString(),0xffff&modbus_ip_port);
modbus_watchdog_active=false; modbus_watchdog_active=false;
PollInputs(); pollInputs();
} }
@ -176,7 +179,7 @@ void Modbus::readyReadData()
base=modbus_input_bytes-count; base=modbus_input_bytes-count;
ProcessInputByte(byte,base); ProcessInputByte(byte,base);
if(--count==0) { if(--count==0) {
PollInputs(); modbus_poll_timer->start(MODBUS_POLL_INTERVAL,true);
modbus_istate=0; modbus_istate=0;
} }
break; break;
@ -192,6 +195,34 @@ void Modbus::errorData(int err)
} }
void Modbus::pollInputs()
{
char msg[12];
msg[0]=0x88; // Transaction Identifier
msg[1]=0x88;
msg[2]=0x00; // Protocol Identifier
msg[3]=0x00;
msg[4]=0x00; // Message Length
msg[5]=0x06;
msg[6]=0x01; // Modbus ID
msg[7]=0x02; // Function Code (Read Discrete Input)
msg[8]=0x00; // Starting Address
msg[9]=0x00;
msg[10]=0xff&(modbus_gpis>>8); // Quantity of Inputs
msg[11]=0xff&modbus_gpis;
modbus_socket->writeBlock(msg,12);
modbus_watchdog_timer->stop();
modbus_watchdog_timer->start(MODBUS_WATCHDOG_INTERVAL,true);
}
void Modbus::watchdogData() void Modbus::watchdogData()
{ {
if(!modbus_watchdog_active) { if(!modbus_watchdog_active) {
@ -218,31 +249,3 @@ void Modbus::ProcessInputByte(char byte,int base)
} }
modbus_input_states[base]=byte; modbus_input_states[base]=byte;
} }
void Modbus::PollInputs()
{
char msg[12];
msg[0]=0x88; // Transaction Identifier
msg[1]=0x88;
msg[2]=0x00; // Protocol Identifier
msg[3]=0x00;
msg[4]=0x00; // Message Length
msg[5]=0x06;
msg[6]=0x01; // Modbus ID
msg[7]=0x02; // Function Code (Read Discrete Input)
msg[8]=0x00; // Starting Address
msg[9]=0x00;
msg[10]=0xff&(modbus_gpis>>8); // Quantity of Inputs
msg[11]=0xff&modbus_gpis;
modbus_socket->writeBlock(msg,12);
modbus_watchdog_timer->stop();
modbus_watchdog_timer->start(MODBUS_WATCHDOG_INTERVAL,true);
}

4
ripcd/modbus.h
View File

@ -32,6 +32,7 @@
#include <switcher.h> #include <switcher.h>
#define MODBUS_POLL_INTERVAL 100
#define MODBUS_WATCHDOG_INTERVAL 1000 #define MODBUS_WATCHDOG_INTERVAL 1000
class Modbus : public Switcher class Modbus : public Switcher
@ -51,15 +52,16 @@ class Modbus : public Switcher
void connectedData(); void connectedData();
void readyReadData(); void readyReadData();
void errorData(int err); void errorData(int err);
void pollInputs();
void watchdogData(); void watchdogData();
private: private:
void ProcessInputByte(char byte,int base); void ProcessInputByte(char byte,int base);
void PollInputs();
int modbus_istate; int modbus_istate;
int modbus_input_bytes; int modbus_input_bytes;
std::vector<char> modbus_input_states; std::vector<char> modbus_input_states;
QSocket *modbus_socket; QSocket *modbus_socket;
QTimer *modbus_poll_timer;
QTimer *modbus_watchdog_timer; QTimer *modbus_watchdog_timer;
bool modbus_watchdog_active; bool modbus_watchdog_active;
QHostAddress modbus_ip_address; QHostAddress modbus_ip_address;