wzh hace 5 años
padre
commit
1bcf51aba5
Se han modificado 1 ficheros con 32 adiciones y 24 borrados
  1. 32 24
      api/application/controllers/Lampcontrol.php

+ 32 - 24
api/application/controllers/Lampcontrol.php

@@ -603,6 +603,7 @@ class Lampcontrol extends Base_Controller {
         // $data['light_voltage']         = $this->input->post('light_voltage',true);
         $data['intell_power']    = $this->input->post('intell_power',true);
         $data['light_type']   = $this->input->post('light_type',true);
+        $data['load_current']   = $this->input->post('load_current',true);
         $data['first_light_time']    = $this->input->post('first_light_time',true);
         $data['first_light_human_power']   = $this->input->post('first_light_human_power',true);
         $data['first_light_unman_power']    = $this->input->post('first_light_unman_power',true);
@@ -649,6 +650,7 @@ class Lampcontrol extends Base_Controller {
 
         $data['intell_power']    = $this->input->post('intell_power',true);
         $data['light_type']   = $this->input->post('light_type',true);
+        $data['load_current']   = $this->input->post('load_current',true);
         $data['first_light_time']    = $this->input->post('first_light_time',true);
         $data['first_light_human_power']   = $this->input->post('first_light_human_power',true);
         $data['first_light_unman_power']    = $this->input->post('first_light_unman_power',true);
@@ -683,6 +685,8 @@ class Lampcontrol extends Base_Controller {
                 $t = explode(':', $value);
                 $m = $t[0]*60+$t[1];
                 $word = substr('00'.base_convert($m, 10, 16), -2);
+            }elseif ($key == 'load_current') {
+                $word = substr('0000'.base_convert(round($value/10), 10, 16), -4);
             }else{
                 $word = substr('00'.base_convert($value, 10, 16), -2);
             }
@@ -1013,6 +1017,7 @@ class Lampcontrol extends Base_Controller {
         if ($type == 1) { // 负载参数
             $update['intell_power']    = '2';
             $update['light_type']    = '1';
+            $update['load_current']    = '900';
             $update['first_light_time']    = '00:30';
             $update['first_light_human_power']   = '50';
             $update['first_light_unman_power']    = '20';
@@ -1085,30 +1090,33 @@ class Lampcontrol extends Base_Controller {
                 $data = array();
                 $data['intell_power'] = base_convert(substr($res['msg'], 18,1), 16, 10).''; // 智能功率
                 $data['light_type'] = base_convert(substr($res['msg'], 19,1), 16, 10).''; // 灯控模式
-                $data['first_light_time'] = base_convert(substr($res['msg'], 20,2), 16, 10).''; // 第一段亮灯时间
-                $data['first_light_human_power'] = base_convert(substr($res['msg'], 22,2), 16, 10).''; // 第一段有人功率
-                $data['first_light_unman_power'] = base_convert(substr($res['msg'], 24,2), 16, 10).''; // 第一段无人功率
-                $data['second_light_time'] = base_convert(substr($res['msg'], 26,2), 16, 10).''; // 第二段亮灯时间
-                $data['second_light_human_power'] = base_convert(substr($res['msg'], 28,2), 16, 10).''; // 第二段有人功率
-                $data['second_light_unman_power'] = base_convert(substr($res['msg'], 30,2), 16, 10).''; // 第二段无人功率
-                $data['third_light_time'] = base_convert(substr($res['msg'], 32,2), 16, 10).''; // 第三段亮灯时间
-                $data['third_light_human_power'] = base_convert(substr($res['msg'], 34,2), 16, 10).''; // 第三段有人功率
-                $data['third_light_unman_power'] = base_convert(substr($res['msg'], 36,2), 16, 10).''; // 第三段无人功率
-                $data['fourth_light_time'] = base_convert(substr($res['msg'], 38,2), 16, 10).''; // 第四段亮灯时间
-                $data['fourth_light_human_power'] = base_convert(substr($res['msg'], 40,2), 16, 10).''; // 第四段有人功率
-                $data['fourth_light_unman_power'] = base_convert(substr($res['msg'], 42,2), 16, 10).''; // 第四段无人功率
-                $data['fifth_light_time'] = base_convert(substr($res['msg'], 44,2), 16, 10).''; // 第五段亮灯时间
-                $data['fifth_light_human_power'] = base_convert(substr($res['msg'], 46,2), 16, 10).''; // 第五段有人功率
-                $data['fifth_light_unman_power'] = base_convert(substr($res['msg'], 48,2), 16, 10).''; // 第五段无人功率
-                $data['sixth_light_time'] = base_convert(substr($res['msg'], 50,2), 16, 10).''; // 第六段亮灯时间
-                $data['sixth_light_human_power'] = base_convert(substr($res['msg'], 52,2), 16, 10).''; // 第六段有人功率
-                $data['sixth_light_unman_power'] = base_convert(substr($res['msg'], 54,2), 16, 10).''; // 第六段无人功率
-                $data['seventh_light_time'] = base_convert(substr($res['msg'], 56,2), 16, 10).''; // 第七段亮灯时间
-                $data['seventh_light_human_power'] = base_convert(substr($res['msg'], 58,2), 16, 10).''; // 第七段有人功率
-                $data['seventh_light_unman_power'] = base_convert(substr($res['msg'], 60,2), 16, 10).''; // 第七段无人功率
-                $data['tenth_light_time'] = base_convert(substr($res['msg'], 62,2), 16, 10).''; // 晨亮时间
-                $data['tenth_light_human_power'] = base_convert(substr($res['msg'], 64,2), 16, 10).''; // 晨亮有人功率
-                $data['tenth_light_unman_power'] = base_convert(substr($res['msg'], 68,2), 16, 10).''; // 晨亮无人功率
+                $data['load_current'] = (base_convert(substr($res['msg'], 20,4), 16, 10)*10).''; // 负载电流
+                $data['first_light_time'] = base_convert(substr($res['msg'], 24,2), 16, 10).''; // 第一段亮灯时间
+                $data['first_light_human_power'] = base_convert(substr($res['msg'], 26,2), 16, 10).''; // 第一段有人功率
+                $data['first_light_unman_power'] = base_convert(substr($res['msg'], 28,2), 16, 10).''; // 第一段无人功率
+                $data['second_light_time'] = base_convert(substr($res['msg'], 30,2), 16, 10).''; // 第二段亮灯时间
+                $data['second_light_human_power'] = base_convert(substr($res['msg'], 32,2), 16, 10).''; // 第二段有人功率
+                $data['second_light_unman_power'] = base_convert(substr($res['msg'], 34,2), 16, 10).''; // 第二段无人功率
+                $data['third_light_time'] = base_convert(substr($res['msg'], 36,2), 16, 10).''; // 第三段亮灯时间
+                $data['third_light_human_power'] = base_convert(substr($res['msg'], 38,2), 16, 10).''; // 第三段有人功率
+                $data['third_light_unman_power'] = base_convert(substr($res['msg'], 40,2), 16, 10).''; // 第三段无人功率
+                $data['fourth_light_time'] = base_convert(substr($res['msg'], 42,2), 16, 10).''; // 第四段亮灯时间
+                $data['fourth_light_human_power'] = base_convert(substr($res['msg'], 44,2), 16, 10).''; // 第四段有人功率
+                $data['fourth_light_unman_power'] = base_convert(substr($res['msg'], 46,2), 16, 10).''; // 第四段无人功率
+                $data['fifth_light_time'] = base_convert(substr($res['msg'], 48,2), 16, 10).''; // 第五段亮灯时间
+                $data['fifth_light_human_power'] = base_convert(substr($res['msg'], 50,2), 16, 10).''; // 第五段有人功率
+                $data['fifth_light_unman_power'] = base_convert(substr($res['msg'], 52,2), 16, 10).''; // 第五段无人功率
+                $data['sixth_light_time'] = base_convert(substr($res['msg'], 54,2), 16, 10).''; // 第六段亮灯时间
+                $data['sixth_light_human_power'] = base_convert(substr($res['msg'], 56,2), 16, 10).''; // 第六段有人功率
+                $data['sixth_light_unman_power'] = base_convert(substr($res['msg'], 58,2), 16, 10).''; // 第六段无人功率
+                $data['seventh_light_time'] = base_convert(substr($res['msg'], 60,2), 16, 10).''; // 第七段亮灯时间
+                $data['seventh_light_human_power'] = base_convert(substr($res['msg'], 62,2), 16, 10).''; // 第七段有人功率
+                $data['seventh_light_unman_power'] = base_convert(substr($res['msg'], 64,2), 16, 10).''; // 第七段无人功率
+                $data['tenth_light_time'] = base_convert(substr($res['msg'], 66,2), 16, 10).''; // 晨亮时间
+                $data['tenth_light_human_power'] = base_convert(substr($res['msg'], 68,2), 16, 10).''; // 晨亮有人功率
+                $data['tenth_light_unman_power'] = base_convert(substr($res['msg'], 70,2), 16, 10).''; // 晨亮无人功率
+                // $data['tenth_light_human_power'] = base_convert(substr($res['msg'], 64,2), 16, 10).''; // 晨亮有人功率
+                // $data['tenth_light_unman_power'] = base_convert(substr($res['msg'], 68,2), 16, 10).''; // 晨亮无人功率
                 // $data['begin_voltage'] = round(base_convert(substr($res['msg'], 146,4), 16, 10)/10,1).''; // 智能功率USER1起始电压
                 // $data['end_voltage'] = round(base_convert(substr($res['msg'], 150,4), 16, 10)/10,1).''; // 智能功率USER1终止电压
                 // $data['end_current'] = round(base_convert(substr($res['msg'], 158,4), 16, 10)/100,2).''; // 智能功率USER1终止电流