ETM-Schurig
/
powersync-plugins-modbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed neuron status change recognition

master
Boernsman 2021-02-04 19:02:25 +01:00
parent 250ce52fd1
commit 6d60a973b5
4 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
unipi/neuron.cpp
View File

@ -437,28 +437,21 @@ bool Neuron::modbusReadRequest(const QModbusDataUnit &request)
//qCDebug(dcUniPi()) << "Start Address:" << unit.startAddress() << "Register Type:" << unit.registerType() << "Value:" << unit.value(i);
modbusAddress = unit.startAddress() + i;
if (m_previousModbusRegisterValue.contains(modbusAddress)) {
if (m_previousModbusRegisterValue.value(modbusAddress) == unit.value(i)) {
continue;
} else {
m_previousModbusRegisterValue.insert(modbusAddress, unit.value(i)); //update existing value
}
} else {
m_previousModbusRegisterValue.insert(modbusAddress, unit.value(i));
}
QString circuit;
switch (unit.registerType()) {
case QModbusDataUnit::RegisterType::Coils:
if(m_modbusDigitalInputRegisters.values().contains(modbusAddress)){
circuit = m_modbusDigitalInputRegisters.key(modbusAddress);
emit digitalInputStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit digitalInputStatusChanged(circuit, unit.value(i));
} else if(m_modbusDigitalOutputRegisters.values().contains(modbusAddress)){
circuit = m_modbusDigitalOutputRegisters.key(modbusAddress);
emit digitalOutputStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit digitalOutputStatusChanged(circuit, unit.value(i));
} else if(m_modbusUserLEDRegisters.values().contains(modbusAddress)){
circuit = m_modbusUserLEDRegisters.key(modbusAddress);
emit userLEDStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit userLEDStatusChanged(circuit, unit.value(i));
} else {
qCWarning(dcUniPi()) << "Neuron: Received unrecorgnised coil register" << modbusAddress;
}
@ -467,7 +460,8 @@ bool Neuron::modbusReadRequest(const QModbusDataUnit &request)
case QModbusDataUnit::RegisterType::HoldingRegisters:
if(m_modbusAnalogOutputRegisters.values().contains(modbusAddress)){
circuit = m_modbusAnalogOutputRegisters.key(modbusAddress);
emit analogOutputStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit analogOutputStatusChanged(circuit, unit.value(i));
} else {
qCWarning(dcUniPi()) << "Neuron: Received unrecognised holding register" << modbusAddress;
}
@ -475,8 +469,9 @@ bool Neuron::modbusReadRequest(const QModbusDataUnit &request)
case QModbusDataUnit::RegisterType::InputRegisters:
if(m_modbusAnalogInputRegisters.values().contains(modbusAddress)){
circuit = m_modbusAnalogInputRegisters.key(modbusAddress);
// Analog inputs consist out of 2 registers
emit analogInputStatusChanged(circuit, (unit.value(i) << 16 | unit.value(i+1)));
quint32 value = (unit.value(i) << 16 | unit.value(i+1));
if (circuitValueChanged(circuit, value))
emit analogInputStatusChanged(circuit, value);
i++;
} else {
qCWarning(dcUniPi()) << "Neuron: Received unrecognised input register" << modbusAddress;
@ -622,6 +617,22 @@ bool Neuron::getCoils(QList<int> registerList)
return true;
}
bool Neuron::circuitValueChanged(const QString &circuit, quint32 value)
{
if (m_previousCircuitValue.contains(circuit)) {
if (m_previousCircuitValue.value(circuit) == value) {
// Only emit status change of the circuit value has changed
return false;
} else {
m_previousCircuitValue.insert(circuit, value); //update existing value
return true;
}
} else {
m_previousCircuitValue.insert(circuit, value);
return true;
}
}
bool Neuron::getAllDigitalInputs()
{
@ -675,12 +686,12 @@ bool Neuron::getDigitalInput(const QString &circuit)
QModbusDataUnit request = QModbusDataUnit(QModbusDataUnit::RegisterType::Coils, modbusAddress, 1);
if (m_readRequestQueue.isEmpty()) {
//return modbusReadRequest(request);
return modbusReadRequest(request);
} else if (m_readRequestQueue.length() > 100) {
qCWarning(dcUniPi()) << "Neuron: Too many pending read requests";
return false;
} else {
//m_readRequestQueue.append(request); //FIXME
m_readRequestQueue.append(request);
}
return true;
}
@ -688,19 +699,19 @@ bool Neuron::getDigitalInput(const QString &circuit)
bool Neuron::getAnalogOutput(const QString &circuit)
{
int modbusAddress = m_modbusAnalogInputRegisters.value(circuit);
//qDebug(dcUniPi()) << "Neuron: Reading analog input" << circuit << modbusAddress;
//qDebug(dcUniPi()) << "Neuron: Reading analog output" << circuit << modbusAddress;
if (!m_modbusInterface)
return false;
QModbusDataUnit request = QModbusDataUnit(QModbusDataUnit::RegisterType::HoldingRegisters, modbusAddress, 1);
if (m_readRequestQueue.isEmpty()) {
//return modbusReadRequest(request);
return modbusReadRequest(request);
} else if (m_readRequestQueue.length() > 100) {
qCWarning(dcUniPi()) << "Neuron extension: too many pending read requests";
qCWarning(dcUniPi()) << "Neuron: Too many pending read requests";
return false;
} else {
//m_readRequestQueue.append(request); //FIXME
m_readRequestQueue.append(request);
}
return true;
}
@ -777,7 +788,7 @@ QUuid Neuron::setAnalogOutput(const QString &circuit, double value)
bool Neuron::getAnalogInput(const QString &circuit)
{
int modbusAddress = m_modbusAnalogInputRegisters.value(circuit);
qDebug(dcUniPi()) << "Neuron: Reading analog Input" << circuit << modbusAddress;
//qDebug(dcUniPi()) << "Neuron: Reading analog Input" << circuit << modbusAddress;
if (!m_modbusInterface)
return false;

4
unipi/neuron.h
View File

@ -112,7 +112,7 @@ private:
NeuronTypes m_neuronType = NeuronTypes::S103;
QHash<int, uint16_t> m_previousModbusRegisterValue;
QHash<QString, uint16_t> m_previousCircuitValue;
bool loadModbusMap();
bool modbusReadRequest(const QModbusDataUnit &request);
@ -122,6 +122,8 @@ private:
bool getHoldingRegisters(QList<int> registers);
bool getCoils(QList<int> registers);
bool circuitValueChanged(const QString &circuit, quint32 value);
signals:
void requestExecuted(const QUuid &requestId, bool success);
void requestError(const QUuid &requestId, const QString &error);

41
unipi/neuronextension.cpp
View File

@ -314,28 +314,21 @@ bool NeuronExtension::modbusReadRequest(const QModbusDataUnit &request)
//qCDebug(dcUniPi()) << "Neuron Extension: Start Address:" << unit.startAddress() << "Register Type:" << unit.registerType() << "Value:" << unit.value(i);
modbusAddress = unit.startAddress() + i;
if (m_previousModbusRegisterValue.contains(modbusAddress)) {
if (m_previousModbusRegisterValue.value(modbusAddress) == unit.value(i)) {
continue;
} else {
m_previousModbusRegisterValue.insert(modbusAddress, unit.value(i)); //update existing value
}
} else {
m_previousModbusRegisterValue.insert(modbusAddress, unit.value(i));
}
QString circuit;
switch (unit.registerType()) {
case QModbusDataUnit::RegisterType::Coils:
if(m_modbusDigitalInputRegisters.values().contains(modbusAddress)){
circuit = m_modbusDigitalInputRegisters.key(modbusAddress);
emit digitalInputStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit digitalInputStatusChanged(circuit, unit.value(i));
} else if(m_modbusDigitalOutputRegisters.values().contains(modbusAddress)){
circuit = m_modbusDigitalOutputRegisters.key(modbusAddress);
emit digitalOutputStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit digitalOutputStatusChanged(circuit, unit.value(i));
} else if(m_modbusUserLEDRegisters.values().contains(modbusAddress)){
circuit = m_modbusUserLEDRegisters.key(modbusAddress);
emit userLEDStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit userLEDStatusChanged(circuit, unit.value(i));
} else {
qCWarning(dcUniPi()) << "Neuron Extension: Received unrecorgnised coil register" << modbusAddress;
}
@ -344,7 +337,9 @@ bool NeuronExtension::modbusReadRequest(const QModbusDataUnit &request)
case QModbusDataUnit::RegisterType::InputRegisters:
if(m_modbusAnalogInputRegisters.values().contains(modbusAddress)){
circuit = m_modbusAnalogInputRegisters.key(modbusAddress);
emit analogInputStatusChanged(circuit, ((unit.value(i) << 16) | unit.value(i+1)));
quint32 value = ((unit.value(i) << 16) | unit.value(i+1));
if (circuitValueChanged(circuit, value))
emit analogInputStatusChanged(circuit, value);
i++;
} else {
qCWarning(dcUniPi()) << "Neuron Extension: Received unrecorgnised input register" << modbusAddress;
@ -353,7 +348,8 @@ bool NeuronExtension::modbusReadRequest(const QModbusDataUnit &request)
case QModbusDataUnit::RegisterType::HoldingRegisters:
if(m_modbusAnalogOutputRegisters.values().contains(modbusAddress)){
circuit = m_modbusAnalogOutputRegisters.key(modbusAddress);
emit analogOutputStatusChanged(circuit, unit.value(i));
if (circuitValueChanged(circuit, unit.value(i)))
emit analogOutputStatusChanged(circuit, unit.value(i));
} else {
qCWarning(dcUniPi()) << "Neuron Extension: Received unrecorgnised holding register" << modbusAddress;
}
@ -430,6 +426,21 @@ bool NeuronExtension::modbusWriteRequest(const Request &request)
return true;
}
bool NeuronExtension::circuitValueChanged(const QString &circuit, quint32 value)
{
if (m_previousCircuitValue.contains(circuit)) {
if (m_previousCircuitValue.value(circuit) == value) {
// Only emit status change of the circuit value has changed
return false;
} else {
m_previousCircuitValue.insert(circuit, value); //update existing value
return true;
}
} else {
m_previousCircuitValue.insert(circuit, value);
return true;
}
}
bool NeuronExtension::getDigitalInput(const QString &circuit)
{

4
unipi/neuronextension.h
View File

@ -104,12 +104,14 @@ private:
QModbusRtuSerialMaster *m_modbusInterface = nullptr;
int m_slaveAddress = 0;
ExtensionTypes m_extensionType = ExtensionTypes::xS10;
QHash<int, uint16_t> m_previousModbusRegisterValue;
QHash<QString, uint16_t> m_previousCircuitValue;
bool loadModbusMap();
bool modbusWriteRequest(const Request &request);
bool modbusReadRequest(const QModbusDataUnit &request);
bool circuitValueChanged(const QString &circuit, quint32 value);
signals:
void requestExecuted(const QUuid &requestId, bool success);
void requestError(const QUuid &requestId, const QString &error);