Diff: devices.cpp

Revision:

11:013a2ab0c12e

Parent:

10:b61bb770f7b2

Child:

12:254c32b4ece7

--- a/devices.cpp	Thu Nov 09 12:53:30 2017 +0000
+++ b/devices.cpp	Wed Jan 03 14:06:46 2018 +0000
@@ -185,7 +185,7 @@
                                     leitura_float = temperaturas[this->alarms[alarmIndex].regModbusRead];
                                 }    
                             }
-                            if((this->alarms[alarmIndex].regModbusRead>100)&&(this->alarms[alarmIndex].regModbusRead<104)){//Registradores das entradas analógicas
+                            if((this->alarms[alarmIndex].regModbusRead>99)&&(this->alarms[alarmIndex].regModbusRead<104)){//Registradores das entradas analógicas
                                 leitura_float = aiFiltrada[this->alarms[alarmIndex].regModbusRead - 100];                            
                             }
                          }
@@ -312,8 +312,8 @@
                                 &leitura_uint16_t
                             );     
                         }else{
-                            if((this->alarms[alarmIndex].regModbusRead > 0) &&(this->alarms[alarmIndex].regModbusRead<4)){
-                                leitura_uint16_t = aiFiltrada[this->alarms[alarmIndex].regModbusRead-1];
+                            if(this->alarms[alarmIndex].regModbusRead<4){
+                                leitura_uint16_t = aiFiltrada[this->alarms[alarmIndex].regModbusRead];
                             }
                          }