trigger_delay

doxikus · Jul 10, 2015 · 130335f · 130335f
1 parent 04fa6f7
commit 130335f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/modules/gpio/html/gpio_trigger.php b/modules/gpio/html/gpio_trigger.php
@@ -42,7 +42,7 @@
 $trigger_delay = isset($_POST['trigger_delay']) ? $_POST['trigger_delay'] : '';
 $trigger_delay1 = isset($_POST['trigger_delay1']) ? $_POST['trigger_delay1'] : '';
 if ($trigger_delay1 == "trigger_delay1") {
-    $db->exec("UPDATE gpio SET trigger_delay='$trigger_delay' WHERE gpio='$gpio_post'") or exit(header("Location: html/errors/db_error.php"));
+    $db->exec("UPDATE gpio SET trigger_delay='$trigger_delay' WHERE gpio='20'") or exit(header("Location: html/errors/db_error.php"));
     $db = null;
     header("location: " . $_SERVER['REQUEST_URI']);
     exit();
@@ -79,13 +79,13 @@
 }
 ?>
      <form action="" method="post" style=" display:inline!important;">
-	 <select name="trigger_delay" value="<?php echo $a['trigger_delay']; ?>" onchange="this.form.submit()">
-	    <option type="submit" value="">Delay</option>
-	    <option <?php echo $a['trigger_delay'] == "5" ? 'selected="selected"' : ''; ?> value="5">5 sec</option>
-	    <option <?php echo $a['trigger_delay'] == "30" ? 'selected="selected"' : ''; ?> value="30">30 sec</option>
-	    <option <?php echo $a['trigger_delay'] == "60" ? 'selected="selected"' : ''; ?> value="60">1 min</option>
-	    <option <?php echo $a['trigger_delay'] == "120" ? 'selected="selected"' : ''; ?> value="120">2 min</option>
-	    <option <?php echo $a['trigger_delay'] == "360" ? 'selected="selected"' : ''; ?> value="360">5 min</option>
+	 <select name="trigger_delay" onchange="this.form.submit()">
+	    <option <?php echo $a['trigger_delay'] == "" ? 'selected="selected"' : ''; ?> value="">Delay 0</option>
+	    <option <?php echo $a['trigger_delay'] == "5" ? 'selected="selected"' : ''; ?> value="5">Delay 5 sec</option>
+	    <option <?php echo $a['trigger_delay'] == "30" ? 'selected="selected"' : ''; ?> value="30">Delay 30 sec</option>
+	    <option <?php echo $a['trigger_delay'] == "60" ? 'selected="selected"' : ''; ?> value="60">Delay 1 min</option>
+	    <option <?php echo $a['trigger_delay'] == "120" ? 'selected="selected"' : ''; ?> value="120">Delay 2 min</option>
+	    <option <?php echo $a['trigger_delay'] == "360" ? 'selected="selected"' : ''; ?> value="360">Delay 5 min</option>
 	</select> 
 	<input type="hidden" name="gpio" value="<?php echo $a['gpio']; ?>"/>
 	<input type="hidden" name="trigger_delay1" value="trigger_delay1" />

diff --git a/modules/gpio/trigger_proc b/modules/gpio/trigger_proc
@@ -50,10 +50,10 @@ trigger_notice=$(sqlite3 $dir/dbf/nettemp.db "SELECT trigger_notice FROM gpio WH
 get_mail=$(sqlite3 $dir/dbf/nettemp.db "SELECT mail FROM recipient WHERE mail_alarm='yes'" | awk '{ printf " "$1 }')
 user=$(sqlite3 $dir/dbf/nettemp.db "SELECT user FROM mail_settings")
 led=$(sqlite3 $dir/dbf/nettemp.db "SELECT gpio FROM gpio where mode='led'")
+delay=$(sqlite3 $dir/dbf/nettemp.db "SELECT trigger_delay FROM gpio where gpio='$gpio'")
 
-ledflash="5"
 
-for i in $(seq $ledflash)
+for i in $(seq $delay)
     do
     /usr/local/bin/gpio -g write $led 1
     sleep 1

diff --git a/modules/tools/update_db b/modules/tools/update_db
@@ -100,7 +100,7 @@ sqlite3 $dir/dbf/hosts.db "ALTER TABLE hosts ADD rom type TEXT";
 for i in $(seq 1 30);
     do
     sqlite3 $dir/dbf/nettemp.db "ALTER TABLE gpio ADD tout$i type TEXT";
-Bdone
+done
 sqlite3 $dir/dbf/nettemp.db "ALTER TABLE gpio ADD control type TEXT";
 sqlite3 $dir/dbf/nettemp.db "ALTER TABLE gpio ADD control_run type TEXT";
 sqlite3 $dir/dbf/nettemp.db "ALTER TABLE gpio ADD trigger_delay type TEXT";