From fadb3a1649c49ea65091c911daf5c8de3126c712 Mon Sep 17 00:00:00 2001
From: Boernsman <bernhard.trinnes@nymea.io>
Date: Thu, 4 Feb 2021 19:20:10 +0100
Subject: [PATCH] fixed neuron analog input request

---
 unipi/neuron.cpp          |  2 +-
 unipi/neuronextension.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/unipi/neuron.cpp b/unipi/neuron.cpp
index 783ee66..0e60f82 100644
--- a/unipi/neuron.cpp
+++ b/unipi/neuron.cpp
@@ -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)
diff --git a/unipi/neuronextension.cpp b/unipi/neuronextension.cpp
index aae7b9c..b493799 100644
--- a/unipi/neuronextension.cpp
+++ b/unipi/neuronextension.cpp
@@ -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);