|
@@ -816,8 +816,6 @@ class Lampcontrol extends Base_Controller {
|
|
|
}
|
|
}
|
|
|
}elseif ($k == 'battery_type' || $k == 'battery_count') {
|
|
}elseif ($k == 'battery_type' || $k == 'battery_count') {
|
|
|
$word = substr('0'.base_convert($v, 10, 16), -1);
|
|
$word = substr('0'.base_convert($v, 10, 16), -1);
|
|
|
- }elseif ($k == 'system_voltage') {
|
|
|
|
|
- $word = $v.'';
|
|
|
|
|
}else{
|
|
}else{
|
|
|
$word = substr('0000'.base_convert($v, 10, 16), -4);
|
|
$word = substr('0000'.base_convert($v, 10, 16), -4);
|
|
|
}
|
|
}
|
|
@@ -1190,7 +1188,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
if (!empty($res)) {
|
|
if (!empty($res)) {
|
|
|
$info = unpack('H*', $res['msg'])[1];
|
|
$info = unpack('H*', $res['msg'])[1];
|
|
|
set_log('battery_setting.txt',$info);
|
|
set_log('battery_setting.txt',$info);
|
|
|
- $data['system_voltage'] = substr($info, 18,2) == 'ff' ? '0' : intval(substr($info, 18,2)); // 电池电压
|
|
|
|
|
|
|
+ $data['system_voltage'] = substr($info, 18,2) == 'ff' ? '0' : base_convert(substr($info, 18,2),16,10); // 电池电压
|
|
|
$data['battery_count'] = base_convert(substr($info, 20,1), 16, 10); // 电池串数
|
|
$data['battery_count'] = base_convert(substr($info, 20,1), 16, 10); // 电池串数
|
|
|
$data['battery_type'] = base_convert(substr($info, 21,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); // 超压电压
|
|
$data['overvoltage'] = round(base_convert(substr($info, 22,4), 16, 10)/1000,1); // 超压电压
|
