ETM-Schurig
/
nymea-plugins-modbus
mirror of https://github.com/nymea/nymea-plugins-modbus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed neuron analog input request

pull/8/head
Boernsman 2021-02-04 19:20:10 +01:00
parent 6d60a973b5
commit fadb3a1649
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unipi/neuron.cpp
View File

@ -698,7 +698,7 @@ bool Neuron::getDigitalInput(const QString &circuit)
bool Neuron::getAnalogOutput(const QString &circuit)
{
int modbusAddress = m_modbusAnalogInputRegisters.value(circuit);
int modbusAddress = m_modbusAnalogOutputRegisters.value(circuit);
//qDebug(dcUniPi()) << "Neuron: Reading analog output" << circuit << modbusAddress;
if (!m_modbusInterface)

16
unipi/neuronextension.cpp
View File

@ -546,7 +546,7 @@ bool NeuronExtension::getAllDigitalInputs()
if (m_readRequestQueue.isEmpty()) {
modbusReadRequest(request);
} else if (m_readRequestQueue.length() > 100) {
qCWarning(dcUniPi()) << "Neuron extension: too many pending read requests";
qCWarning(dcUniPi()) << "Neuron extension: Too many pending read requests";
} else {
m_readRequestQueue.append(request);
}
@ -614,7 +614,7 @@ bool NeuronExtension::getAllDigitalOutputs()
if (m_readRequestQueue.isEmpty()) {
modbusReadRequest(request);
} else if (m_readRequestQueue.length() > 100) {
qCWarning(dcUniPi()) << "Neuron extension: too many pending read requests";
qCWarning(dcUniPi()) << "Neuron extension: Too many pending read requests";
} else {
m_readRequestQueue.append(request);
}
@ -656,7 +656,7 @@ bool NeuronExtension::getAnalogOutput(const QString &circuit)
if (m_readRequestQueue.isEmpty()) {
return modbusReadRequest(request);
} else if (m_readRequestQueue.length() > 100) {
qCWarning(dcUniPi()) << "Neuron extension: too many pending read requests";
qCWarning(dcUniPi()) << "Neuron extension: Too many pending read requests";
return false;
} else {
m_readRequestQueue.append(request);
@ -667,7 +667,7 @@ bool NeuronExtension::getAnalogOutput(const QString &circuit)
bool NeuronExtension::getAnalogInput(const QString &circuit)
{
int modbusAddress = m_modbusAnalogInputRegisters.value(circuit);
int modbusAddress = m_modbusAnalogInputRegisters.value(circuit);
if (!m_modbusInterface)
return false;
@ -676,7 +676,7 @@ bool NeuronExtension::getAnalogInput(const QString &circuit)
if (m_readRequestQueue.isEmpty()) {
return modbusReadRequest(request);
} else if (m_readRequestQueue.length() > 100) {
qCWarning(dcUniPi()) << "Neuron extension: too many pending read requests";
qCWarning(dcUniPi()) << "Neuron extension: Too many pending read requests";
return false;
} else {
m_readRequestQueue.append(request);
@ -687,7 +687,7 @@ bool NeuronExtension::getAnalogInput(const QString &circuit)
QUuid NeuronExtension::setUserLED(const QString &circuit, bool value)
{
int modbusAddress = m_modbusUserLEDRegisters.value(circuit);
//qDebug(dcUniPi()) << "Setting digital ouput" << circuit << modbusAddress << value;
//qDebug(dcUniPi()) << "Neuron Extension: Setting user LED" << circuit << modbusAddress << value;
if (!m_modbusInterface)
return "";
@ -713,7 +713,7 @@ QUuid NeuronExtension::setUserLED(const QString &circuit, bool value)
bool NeuronExtension::getUserLED(const QString &circuit)
{
int modbusAddress = m_modbusUserLEDRegisters.value(circuit);
//qDebug(dcUniPi()) << "Reading digital Output" << circuit << modbusAddress;
//qDebug(dcUniPi()) << "Neuron Extension: Get user LED" << circuit << modbusAddress;
if (!m_modbusInterface)
return false;
@ -722,7 +722,7 @@ bool NeuronExtension::getUserLED(const QString &circuit)
if (m_readRequestQueue.isEmpty()) {
return modbusReadRequest(request);
} else if (m_readRequestQueue.length() > 100) {
qCWarning(dcUniPi()) << "Neuron extension: too many pending read requests";
qCWarning(dcUniPi()) << "Neuron extension: Too many pending read requests";
return false;
} else {
m_readRequestQueue.append(request);