DESKTOP-9JTA2JJ\HP преди 5 години
родител
ревизия
fa9aa5a6b0
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      api/application/controllers/Home.php
  2. 1 1
      api/application/controllers/Lampcontrol.php

+ 1 - 1
api/application/controllers/Home.php

@@ -396,7 +396,7 @@ class Home extends Base_Controller {
             array('name'=>'路灯亮度(%)','field'=>'L.lighteness','fields1'=>'lighteness','enname'=>'Brightness(%)'),
             array('name'=>'无线模块地址','field'=>'L.address','fields1'=>'address','enname'=>'Wireless module address'),
             array('name'=>'负载功率(W)','field'=>'RI.loadpower','fields1'=>'loadpower','enname'=>'LED power(W)'),
-            array('name'=>'蓄电池电压(V)','field'=>'RI.batpower as battvoltage','fields1'=>'battvoltage','enname'=>'Battery voltage(V)'),
+            array('name'=>'蓄电池电压(V)','field'=>'RI.batvoltage as battvoltage','fields1'=>'battvoltage','enname'=>'Battery voltage(V)'),
             array('name'=>'蓄电池总过放次数','field'=>'HI.overtimes','fields1'=>'overtimes','enname'=>'Over discharge times'),
             array('name'=>'太阳能板功率(W)','field'=>'RI.panelpower as solarpower','fields1'=>'solarpower','enname'=>'Solar panel power(W)'),
             array('name'=>'是否故障','field'=>'AI.batstatus,AI.panelstatus,AI.lampstatus,AI.tempstatus,AI.status as alarmStatus','fields1'=>'isfaulted','enname'=>'Fault'),

+ 1 - 1
api/application/controllers/Lampcontrol.php

@@ -1517,7 +1517,7 @@ class Lampcontrol extends Base_Controller {
 
         $lampData = $this->Lamp_model->get_one(['id'=>$lamp_id],'address,number,projectid');
 
-        $res = $this->send_cmd('91',$lampData['address'],'');
+        $res = $this->send_cmd('11',$lampData['address'],'');
 
         
         // $lampData = $this->Lamp_model->getData(array('id'=>$lamp_id),'projectid,address,number');