SmartSleep; Простые устройства

Fix double commands - on buttons OTA: Response FW Простые устройства SmartSleep; Очередь сообщений Info: Battery / Program state / Stack count NodeManager commands
Shagrat2 · May 29, 2017 · a8111eb · a8111eb
1 parent 2353538
commit a8111eb
Show file tree

Hide file tree

Showing 11 changed files with 274 additions and 88 deletions.
diff --git a/languages/mysensor_default.php b/languages/mysensor_default.php
@@ -38,6 +38,7 @@
 'DISCOVER'=>'Discover',
 'DISCOVER_INFO'=>'Discover nodes',
 'INFO'=>'Information',
+'QUEUING'=>'Queuing',
 /* end module names */
 
 );

diff --git a/languages/mysensor_ru.php b/languages/mysensor_ru.php
@@ -38,6 +38,7 @@
 'DISCOVER'=>'Поиск',
 'DISCOVER_INFO'=>'Поиск узлов',
 'INFO'=>'Информация',
+'QUEUING'=>'Очередь',
 /* end module names */
 
 );

diff --git a/modules/mysensor/ms_bins.inc.php b/modules/mysensor/ms_bins.inc.php
@@ -2,10 +2,8 @@
 
 require("phpMS.php");
 
-//$qry="1";
-
 // SEARCH RESULTS  
-$res=SQLSelect("SELECT ID, TITLE, VER, CRC, BLOKS FROM msbins"); // WHERE $qry ORDER BY id");
+$res=SQLSelect("SELECT ID, TITLE, VER, CRC, BLOKS FROM msbins");
 
 if ($res[0]['ID']) {  
 	$out['BINS']=$res;

diff --git a/modules/mysensor/ms_edit.inc.php b/modules/mysensor/ms_edit.inc.php
@@ -13,6 +13,7 @@
 if ($this->mode=='cmd') {
   global $data;
   $this->cmd($data);
+  $this->redirect("?id=".$id."&view_mode=".$this->view_mode."&edit_mode=".$this->edit_mode."&tab=".$this->tab);
 }
 
 if ($this->mode=='resetbat'){
@@ -22,6 +23,15 @@
 	$rec=SQLSelectOne("SELECT * FROM $table_name WHERE NID='$data'");
 	$rec['BATTERY'] = "";
 	SQLUpdate($table_name, $rec); // update
+	$this->redirect("?id=".$id."&view_mode=".$this->view_mode."&edit_mode=".$this->edit_mode."&tab=".$this->tab);
+}
+
+if ($this->mode=='respfw'){
+	global $data;
+	$NId = $data;
+
+	$this->ResponseFW($NId);
+	$this->redirect("?id=".$id."&view_mode=".$this->view_mode."&edit_mode=".$this->edit_mode."&tab=".$this->tab);
 }
 
 if ($this->owner->name=='panel') {
@@ -135,30 +145,30 @@
       if ($rec['ID']) {
         $total=count($sensors);
         for($i=0;$i<$total;$i++) {
-					if ($sensors[$i]['UPDATED'] == 0)
-						$sensors[$i]['UPDATED'] = date('Y-m-d H:i:s'); 
+			if ($sensors[$i]['UPDATED'] == 0)
+				$sensors[$i]['UPDATED'] = date('Y-m-d H:i:s'); 
 
-          global ${'linked_object'.$sensors[$i]['ID']};
-          global ${'linked_property'.$sensors[$i]['ID']};
+			global ${'linked_object'.$sensors[$i]['ID']};
+			global ${'linked_property'.$sensors[$i]['ID']};
 
-					global ${'ack'.$sensors[$i]['ID']};					
-          if (${'ack'.$sensors[$i]['ID']}) {
-            $sensors[$i]['ACK']=1;            
-          } else {
-            $sensors[$i]['ACK']=0;            
-          } 
+			global ${'ack'.$sensors[$i]['ID']};					
+			if (${'ack'.$sensors[$i]['ID']}) {
+				$sensors[$i]['ACK']=1;            
+			} else {
+				$sensors[$i]['ACK']=0;            
+			} 
 
-					global ${'req'.$sensors[$i]['ID']};
-					if (${'req'.$sensors[$i]['ID']}) {
-            $sensors[$i]['REQ']=1;            
-          } else {
-            $sensors[$i]['REQ']=0;            
-          } 
-					SQLUpdate('msnodeval', $sensors[$i]);					
+			global ${'req'.$sensors[$i]['ID']};
+			if (${'req'.$sensors[$i]['ID']}) {
+				$sensors[$i]['REQ']=1;            
+			} else {
+				$sensors[$i]['REQ']=0;            
+			} 
+			SQLUpdate('msnodeval', $sensors[$i]);					
 
-					// Battery
-          $old_linked_object=$sensors[$i]['LINKED_OBJECT'];
-          $old_linked_property=$sensors[$i]['LINKED_PROPERTY'];
+			// Battery
+			$old_linked_object=$sensors[$i]['LINKED_OBJECT'];
+			$old_linked_property=$sensors[$i]['LINKED_PROPERTY'];
 
           if (${'linked_object'.$sensors[$i]['ID']} && ${'linked_property'.$sensors[$i]['ID']}) {
             $sensors[$i]['LINKED_OBJECT']=${'linked_object'.$sensors[$i]['ID']};
@@ -178,7 +188,7 @@
             removeLinkedProperty($old_linked_object, $old_linked_property, $this->name);          
           }
 
-					// Heartheat
+		  // Heartheat
           $old_linked_object=$sensors[$i]['HEARTBEAT_OBJECT'];
           $old_linked_property=$sensors[$i]['HEARTBEAT_PROPERTY'];
 
@@ -253,14 +263,16 @@
           $pres = $itm['SUBTYPE'];
           $sensors[$k]['STITLE'] = $mysensor_presentation[$pres][0];
           $sensors[$k]['SDESCR'] = $mysensor_presentation[$pres][1];
-					$sensors[$k]['NOTE'] = $itm['INFO'];
+		  $sensors[$k]['NOTE'] = $itm['INFO'];
           break;
         }
       }
 
       $subtype = $v['SUBTYPE'];        
       $sensors[$k]['SUBTITLE'] = $mysensor_property[ $subtype ][0];
       $sensors[$k]['SUBDESCR'] = $mysensor_property[ $subtype ][1];
+
+	  $sensors[$k]['SDEVICE_TYPE'] = $mysensor_property[$sensors[$k]['SUBTYPE']][2];
     }
   }    
 

diff --git a/modules/mysensor/ms_queuing.inc.php b/modules/mysensor/ms_queuing.inc.php
@@ -0,0 +1,17 @@
+<?php
+
+require("phpMS.php");
+
+$res=SQLSelect("SELECT * FROM mssendstack WHERE SENDRX=1 ORDER BY id");
+
+if ($res[0]['ID']) {  
+	$total=count($res);
+    for($i=0;$i<$total;$i++) {
+		$res[$i]['EXPIRE'] = date("Y-m-d H:i:s", $res[$i]['EXPIRE']);
+	}
+	$out['QUEUING']=$res;
+}
+
+?>
+
+?>