MAJ

root
1 parent 7622b5db
Showing 7 changed files with 18 additions and 5 deletions Show diff stats
Ansible/MainTask.retry
Ansible/inventaire-rasp.ini
Ansible/roles/arduino/tasks/main.yml
site/accesBase.php
site/add.php
site/reception.php
site/upload/inventaire.ini
@@ -0,0 +1 @@
+172.26.145.111
@@ -0,0 +1 @@
+172.26.145.111
 ---
-- name: "envoyer du fichier binaire.c"
+- name: "envoyer du fichier main.c"
   copy:
     src: ../../../../site/upload/main.c
     dest: /home/pi/capteur{{capteur}}/main.c
@@ -352,4 +352,14 @@
 			return False;
 		}
 	}
+
+	function getNumero($nom)
+	{
+		$db = connexion();
+		$query = "SELECT numero FROM capteurs WHERE nom = '$nom'";
+		$result = pg_query($db, $query) or die("La requ  te a echou   : ".pg_last_error());
+                $tab = pg_fetch_assoc($result);
+                deconnexion($db);
+                return $tab['numero'];
+	}
 ?>
@@ -23,7 +23,7 @@ session_start();
 					if(add($_POST['nom'], $_POST['type'], $_POST['raspberry'], $_POST['unite'], $_POST['version']))
 					{
 						$arduino_simple = "[Arduino_init]\r\n";
-						$arduino_spi = "[Arduino_spi_init]\r\n";
+						$arduino_spi = "[Arduino_init]\r\n";
 						$nucleo = "[Nucleo_init]\r\n";
  
 						$setup = getSetup($_POST['raspberry']);
@@ -40,7 +40,8 @@ session_start();
 						{
 							$ini = $nucleo;
 						}
-						$ini = $ini.$_POST['raspberry']." capteur=".$_POST['numero']."-".$_POST['version']." setup=".$setup."\n";
+						$numero = getNumero($_POST['nom']);
+						$ini = $ini.$_POST['raspberry']." capteur=".$numero."-".$_POST['version']." setup=".$setup."\n";
 						file_put_contents('upload/inventaire.ini', $ini);
 						setup($_POST['raspberry']);
 						exec("super cmd.sh");	
@@ -7,7 +7,7 @@ if(isset($_POST[&#39;sensor&#39;]))
 {
 	$ini = "";
 	$arduino_simple = "[Arduino]\r\n";
-	$arduino_spi = "[Arduino_spi]\r\n";
+	$arduino_spi = "[Arduino]\r\n";
 	$nucleo = "[Nucleo]\r\n";
  
 	$a_simple = false;
 [Arduino]
-172.26.145.113 capteur=1-0
+172.26.145.111 capteur=2-0