Browse Source

no message

DESKTOP-9JTA2JJ\HP 5 năm trước cách đây
mục cha
commit
497e141166
1 tập tin đã thay đổi với 9 bổ sung8 xóa
  1. 9 8
      api/application/controllers/Lampcontrol.php

+ 9 - 8
api/application/controllers/Lampcontrol.php

@@ -790,8 +790,8 @@ class Lampcontrol extends Base_Controller {
         $data['increa_char_time']               = $this->input->post('increa_char_time',true) * 60;  // 提升充电时间
         $data['balan_char_interval']               = $this->input->post('balan_char_interval',true);  // 均衡充电间隔
         $data['temper_compen_coeff']               = $this->input->post('temper_compen_coeff',true);  // 温度补偿系数
-        $data['char_upper_limit_temper']           = $this->input->post('char_upper_limit_temper',true);  // 上限温度
         $data['char_lower_limit_temper']           = $this->input->post('char_lower_limit_temper',true);  // 下限温度
+        $data['char_upper_limit_temper']           = $this->input->post('char_upper_limit_temper',true);  // 上限温度
         $data['reduced_start_voltage']         = $this->input->post('reduced_start_voltage',true);  // 智能功率起始电压
         $data['reduced_stop_voltage']         = $this->input->post('reduced_stop_voltage',true);  // 智能功率结束电压
         $data['light_voltage']         = $this->input->post('light_voltage',true);  // 光控电压
@@ -1182,19 +1182,20 @@ class Lampcontrol extends Base_Controller {
             $data['balan_char_interval']               = base_convert(substr($info, 70,2), 16, 10);  // 均衡充电间隔
             $data['temper_compen_coeff']               = base_convert(substr($info, 72,2), 16, 10);  // 温度补偿系数
 
-            $char_upper_limit_temper           = base_convert(substr($info, 74,2), 16, 2);  // 上限温度
-            if (substr(substr('00000000'.$char_upper_limit_temper, -8), 0,1) == 1) {
-                $data['char_upper_limit_temper'] = 0 - base_convert(substr('0000000'.$char_upper_limit_temper, -7), 2, 10);
-            }else{
-                $data['char_upper_limit_temper'] = base_convert($char_upper_limit_temper, 2, 10);
-            }
-            $char_lower_limit_temper           = base_convert(substr($info, 76,2), 16, 2); // 下限温度
+            $char_lower_limit_temper           = base_convert(substr($info, 74,2), 16, 2); // 下限温度
             if (substr(substr('00000000'.$char_lower_limit_temper, -8), 0,1) == 1) {
                 $data['char_lower_limit_temper'] = 0 - base_convert(substr('0000000'.$char_lower_limit_temper, -7), 2, 10);
             }else{
                 $data['char_lower_limit_temper'] = base_convert($char_lower_limit_temper, 2, 10);
             }
 
+            $char_upper_limit_temper           = base_convert(substr($info, 76,2), 16, 2);  // 上限温度
+            if (substr(substr('00000000'.$char_upper_limit_temper, -8), 0,1) == 1) {
+                $data['char_upper_limit_temper'] = 0 - base_convert(substr('0000000'.$char_upper_limit_temper, -7), 2, 10);
+            }else{
+                $data['char_upper_limit_temper'] = base_convert($char_upper_limit_temper, 2, 10);
+            }
+
             $data['reduced_start_voltage']         = round(base_convert(substr($info, 78,4), 16, 10)/1000,1);  // 智能功率起始电压
             $data['reduced_stop_voltage']         = round(base_convert(substr($info, 82,4), 16, 10)/1000,1);  // 智能功率结束电压
             $data['light_voltage']         = round(base_convert(substr($info, 86,2), 16, 10)/10);  // 光控电压