snmp changes

doxikus · Jul 25, 2015 · 67b72c0 · 67b72c0
1 parent 38581af
commit 67b72c0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/modules/highcharts/highcharts2 b/modules/highcharts/highcharts2
@@ -29,7 +29,7 @@ done
 
 # sensors
 
-for n in temp press lux humid snmp; do
+for n in temp press lux humid; do
     name=$(sqlite3 $dir/dbf/nettemp.db "SELECT name FROM sensors WHERE type='$n'")
     for i in $name; do
 	rom=$(sqlite3 $dir/dbf/nettemp.db "SELECT rom FROM sensors WHERE name='$i'")

diff --git a/modules/sensors/html/sensors.php b/modules/sensors/html/sensors.php
@@ -41,10 +41,10 @@
 		    }    
 		    $device='wireless';
 	    }
-	    elseif (strpos($id_rom_new,'snmp') !== false) {
+	    //elseif (strpos($id_rom_new,'snmp') !== false) {
 
-		    $type='snmp';
-	    }
+	    //	    $type='snmp';
+	    //}
 	    elseif (strpos($id_rom_new,'lux') !== false) {
 		    $type='lux';
 	    }

diff --git a/modules/sensors/snmp/html/snmp_settings.php b/modules/sensors/snmp/html/snmp_settings.php
@@ -22,7 +22,7 @@
 	$rom=snmp_ . $snmp_name . _temp;
 	$db->exec("INSERT OR IGNORE INTO snmp (name, rom, community, host, oid, divider) VALUES ('$snmp_name','$rom','$snmp_community', '$snmp_host', '$snmp_oid', '$snmp_divider')") or die ("cannot insert to DB 1" );
 	$dbn->exec("INSERT OR IGNORE INTO newdev (list) VALUES ('$rom')");
-        $dbn->exec("INSERT OR IGNORE INTO sensors (name, rom, type, alarm, tmp, gpio) VALUES ('$snmp_name','$rom','snmp', 'off', 'wait', '$gpio_post' )") or die ("cannot insert to DB 2" );
+        $dbn->exec("INSERT OR IGNORE INTO sensors (name, rom, type, alarm, tmp, gpio) VALUES ('$snmp_name','$rom','temp', 'off', 'wait', '$gpio_post' )") or die ("cannot insert to DB 2" );
 
 	$dbnew = new PDO("sqlite:db/$rom.sql");
 	$dbnew->exec("CREATE TABLE def (time DATE DEFAULT (datetime('now','localtime')), value INTEEGER)");

diff --git a/modules/sensors/snmp/snmp_read b/modules/sensors/snmp/snmp_read
@@ -2,19 +2,19 @@
 
 dir=$( cd "$( dirname "$0" )" && cd ../../../ && pwd )
 date=`date +%y%m%d-%H%M`
-if name=$(sqlite3 $dir/dbf/snmp.db "SELECT name FROM snmp")
+if name=$(sqlite3 $dir/dbf/snmp.db "SELECT rom FROM snmp")
     then
-    for snmp in $name; do 
-	community=$(sqlite3 $dir/dbf/snmp.db "SELECT community FROM snmp WHERE name='$snmp'")
-	host=$(sqlite3 $dir/dbf/snmp.db "SELECT host FROM snmp WHERE name='$snmp'")
-	oid=$(sqlite3 $dir/dbf/snmp.db "SELECT oid FROM snmp WHERE name='$snmp'")
-	divider=$(sqlite3 $dir/dbf/snmp.db "SELECT divider FROM snmp WHERE name='$snmp'")
+    for rom in $name; do 
+	community=$(sqlite3 $dir/dbf/snmp.db "SELECT community FROM snmp WHERE rom='$rom'")
+	host=$(sqlite3 $dir/dbf/snmp.db "SELECT host FROM snmp WHERE rom='$rom'")
+	oid=$(sqlite3 $dir/dbf/snmp.db "SELECT oid FROM snmp WHERE rom='$rom'")
+	divider=$(sqlite3 $dir/dbf/snmp.db "SELECT divider FROM snmp WHERE rom='$rom'")
 	walk=$(snmpget -v 2c -c $community $host $oid -O v)
         wynik=`echo $walk | tr -d \" | awk '{printf "%3.1f\n", $2/'$divider' }'`  
-	sqlite3 $dir/db/$snmp.sql "INSERT OR IGNORE INTO def (value) VALUES ('$wynik');"
-	sqlite3 $dir/dbf/nettemp.db "UPDATE sensors SET tmp='$wynik' WHERE rom='$snmp'"
+	sqlite3 $dir/db/$rom.sql "INSERT OR IGNORE INTO def (value) VALUES ('$wynik');"
+	sqlite3 $dir/dbf/nettemp.db "UPDATE sensors SET tmp='$wynik' WHERE rom='$rom'"
 	if date +%M |cut -c 2-2 | grep -E '0|5'; then
-	    sqlite3 $dir/dbf/nettemp.db "UPDATE sensors SET tmp_5ago='$wynik' WHERE rom='$snmp'"
+	    sqlite3 $dir/dbf/nettemp.db "UPDATE sensors SET tmp_5ago='$wynik' WHERE rom='$rom'"
 	fi
 
 	echo SNMP: $wynik C

diff --git a/modules/sensors/snmp/snmp_scan b/modules/sensors/snmp/snmp_scan
@@ -5,7 +5,7 @@ dir=$( cd "$( dirname "$0" )" && cd ../../../ && pwd )
 date=`date +%y%m%d-%H%M`
 
 
-snmp=`sqlite3 $dir/dbf/snmp.db "SELECT name FROM snmp"`
+snmp=`sqlite3 $dir/dbf/snmp.db "SELECT rom FROM snmp"`
 if [ -n "$snmp" ]
     then
     snmp_count=$(echo "$snmp" |grep -c snmp)

diff --git a/modules/view/html/view.php b/modules/view/html/view.php
@@ -24,9 +24,6 @@ function timedRefresh(timeoutPeriod) {
 if (glob('db/*altitude*.sql')) {?>
 <a href="index.php?id=view&type=altitude" ><button class="btn btn-default">Altitude view</button></a>
 <?php }
-if (glob('db/*snmp*.sql')) {?>
-<a href="index.php?id=view&type=snmp" ><button class="btn btn-default">SNMP</button></a>
-<?php }
 if (glob('tmp/kwh/*.json')) {?>
 <a href="index.php?id=view&type=kwh" ><button class="btn btn-default">kWh</button></a>
 <?php }