Diff: snmp.cpp

Revision:

14:ee6cc1632166

Parent:

9:8c63e4f3edab

Child:

18:9286e5010c14

--- a/snmp.cpp	Sat Mar 19 21:24:01 2011 +0000
+++ b/snmp.cpp	Tue Mar 29 18:15:27 2011 +0000
@@ -9,6 +9,7 @@
 #include "Agentbed.h"
 #include "EthernetNetIf.h"
 #include "ConfigFile.h"
+#include "conf.h"
 
 AgentbedClass Agentbed;
 
@@ -57,7 +58,7 @@
 SNMP_ERR_CODES status;
 
 extern DigitalOut led_y;
-extern float pres, temp, humi, light, anemo, vane, rain, uv, moist, temp2;
+extern Sensor sensor;
 
 void pduReceived()
 {
@@ -128,34 +129,34 @@
         // response packet from get-request - enterprises
         switch (oid[strlen(enterprises)]) {
         case '0':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, pres);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.pres);
             break;
         case '1':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, temp);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.temp);
             break;
         case '2':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, humi);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.humi);
             break;
         case '3':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, anemo);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.anemo);
             break;
         case '4':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, vane);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.vane);
             break;
         case '5':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, rain);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.rain);
             break;
         case '6':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, light);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.light);
             break;
         case '7':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, uv);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.uv);
             break;
         case '8':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, moist);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.moist);
             break;
         case '9':
-            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, temp2);
+            status = pdu.VALUE.encode(SNMP_SYNTAX_OPAQUE_FLOAT, sensor.temp2);
             break;
         }
         pdu.error = status;