|
|
@@ -801,7 +801,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
$lampData = $this->Lamp_model->get_one($where,'projectid,address,number');
|
|
|
$sendData = '';
|
|
|
foreach ($data as $k=>$v) {
|
|
|
- if ($k == 'system_voltage' || $k == 'light_voltage' || $k == 'light_delay_time' || $k == 'balan_char_interval' || $k == 'temper_compen_coeff') {
|
|
|
+ if ($k == 'light_voltage' || $k == 'light_delay_time' || $k == 'balan_char_interval' || $k == 'temper_compen_coeff') {
|
|
|
$word = substr('00'.base_convert($v, 10, 16), -2);
|
|
|
}elseif ($k == 'char_upper_limit_temper' || $k == 'char_lower_limit_temper') {
|
|
|
if ($v < 0){
|
|
|
@@ -812,6 +812,8 @@ class Lampcontrol extends Base_Controller {
|
|
|
}
|
|
|
}elseif ($k == 'battery_type' || $k == 'battery_count') {
|
|
|
$word = substr('0'.base_convert($v, 10, 16), -1);
|
|
|
+ }elseif ($k == 'system_voltage') {
|
|
|
+ $word = $v.'';
|
|
|
}else{
|
|
|
$word = substr('0000'.base_convert($v, 10, 16), -4);
|
|
|
}
|
|
|
@@ -1164,7 +1166,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
// var_dump($res);
|
|
|
if (!empty($res)) {
|
|
|
$info = unpack('H*', $res['msg'])[1];
|
|
|
- $data['system_voltage'] = base_convert(substr($info, 18,2), 16, 10); // 电池电压
|
|
|
+ $data['system_voltage'] = substr($info, 18,2) == 'ff' ? '0' : intval(substr($info, 18,2)); // 电池电压
|
|
|
$data['battery_count'] = base_convert(substr($info, 20,1), 16, 10); // 电池串数
|
|
|
$data['battery_type'] = base_convert(substr($info, 21,1), 16, 10); //蓄电池类型
|
|
|
$data['overvoltage'] = round(base_convert(substr($info, 22,4), 16, 10)/1000,1); // 超压电压
|
