|
@@ -499,14 +499,16 @@ class Lampcontrol extends Base_Controller {
|
|
$seq = get_seq();
|
|
$seq = get_seq();
|
|
$seq = '01';
|
|
$seq = '01';
|
|
|
|
|
|
- $sendData = '14'.PROTOCOL_VERSION.$seq.'0000000000';
|
|
|
|
- $sendData .= $lightness > 0 ? '01' : '00';
|
|
|
|
|
|
+ // $sendData = '14'.PROTOCOL_VERSION.$seq.'0000000000';
|
|
|
|
+ $sendData = $lightness > 0 ? '01' : '00';
|
|
$lightness2 = empty($lightness) ? '00' : '00'.base_convert($lightness, 10, 16);
|
|
$lightness2 = empty($lightness) ? '00' : '00'.base_convert($lightness, 10, 16);
|
|
$sendData .= strlen($lightness2) == 2 ? $lightness2 : substr($lightness2, -2);
|
|
$sendData .= strlen($lightness2) == 2 ? $lightness2 : substr($lightness2, -2);
|
|
$sendData .= '00';
|
|
$sendData .= '00';
|
|
|
|
|
|
- $sendData .= crc16(pack('H*',$sendData));
|
|
|
|
- $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/IDCOL/CmdOutput/'.$lampData['address'],pack('H*',$sendData),10);
|
|
|
|
|
|
+ // $sendData .= crc16(pack('H*',$sendData));
|
|
|
|
+ // $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/IDCOL/CmdOutput/'.$lampData['address'],pack('H*',$sendData),10);
|
|
|
|
+ $res = $this->send_cmd('14',$lampData['address'],$sendData);
|
|
|
|
+
|
|
if (empty($res)) {
|
|
if (empty($res)) {
|
|
$data = ['code'=>'0016','status'=>2,'msg'=>$this->response['0016'],'data'=>['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]];
|
|
$data = ['code'=>'0016','status'=>2,'msg'=>$this->response['0016'],'data'=>['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]];
|
|
exit(send_websocket($clientid,$data));
|
|
exit(send_websocket($clientid,$data));
|