diff --git a/fhem/FHEM/72_FRITZBOX.pm b/fhem/FHEM/72_FRITZBOX.pm index 09970d28e..132bbd340 100644 --- a/fhem/FHEM/72_FRITZBOX.pm +++ b/fhem/FHEM/72_FRITZBOX.pm @@ -415,7 +415,9 @@ sub FRITZBOX_Set($$@) return "Unknown argument $cmd or wrong parameter(s), choose one of $list"; } # end FRITZBOX_Set - +# ctlmgr_ctl r timer settings/KidsTimerXML1/ +# ctlmgr_ctl r filter_profile settings/profile5/timeprofile_id +# ctlmgr_ctl r filter_profile settings/profile5/name ########################################## sub FRITZBOX_Get($@) @@ -756,7 +758,7 @@ sub FRITZBOX_Readout_Run($) # 1 Dect-Telefonname push @readoutCmdArray, [ "dect".$_, "ctlmgr_ctl r telcfg settings/Foncontrol/User".$_."/Name" ]; # 2 Handset manufacturer - push @readoutCmdArray, [ "dect".$_."_manufacturer", "ctlmgr_ctl r dect settings/Handset".($_-1)."/Manufacturer" ]; + push @readoutCmdArray, [ "", "ctlmgr_ctl r dect settings/Handset".($_-1)."/Manufacturer" ]; # 3 Internal Ring Tone Name push @readoutCmdArray, [ "dect".$_."_intRingTone", "ctlmgr_ctl r telcfg settings/Foncontrol/User".$_."/IntRingTone", "ringtone" ]; # 4 Alarm Ring Tone Name @@ -770,21 +772,26 @@ sub FRITZBOX_Readout_Run($) # 8 Customer Ring Tone Name push @readoutCmdArray, [ "dect".$_."_custRingToneName", "ctlmgr_ctl r telcfg settings/Foncontrol/User".$_."/G722RingToneName" ]; # 9 Firmware Version - push @readoutCmdArray, [ "dect".$_."_fwVersion", "ctlmgr_ctl r dect settings/Handset".($_-1)."/FWVersion" ]; + push @readoutCmdArray, [ "", "ctlmgr_ctl r dect settings/Handset".($_-1)."/FWVersion" ]; # 10 Phone Model - push @readoutCmdArray, [ "dect".$_."_model", "ctlmgr_ctl r dect settings/Handset".($_-1)."/Model", "model" ]; + push @readoutCmdArray, [ "", "ctlmgr_ctl r dect settings/Handset".($_-1)."/Model" ]; + # 11 Handset FonUser + push @readoutCmdArray, [ "", "ctlmgr_ctl r dect settings/Handset".($_-1)."/User", "" ]; } $resultArray = FRITZBOX_Readout_Query( $hash, \@readoutCmdArray, \@readoutReadings ); for (0..$dectCount-1) { - my $offset = $_ * 11; - my $intern = $resultArray->[ $offset ]; + my $offset = $_ * 12; + my $intern = $resultArray->[ $offset + 11]; if ( $intern ) { push @readoutReadings, "fhem->$intern->name|" . $resultArray->[ $offset + 1 ]; push @readoutReadings, "fhem->$intern->brand|" . $resultArray->[ $offset + 2 ]; + push @readoutReadings, "dect".$intern."_manufacturer|" . $resultArray->[ $offset + 2 ]; + push @readoutReadings, "dect".$intern."_fwVersion|" . $resultArray->[ $offset + 1 ]; push @readoutReadings, "fhem->$intern->model|" . FRITZBOX_Readout_Format($hash, "model", $resultArray->[ $offset + 10 ] ); + push @readoutReadings, "dect".$intern."_model|" . FRITZBOX_Readout_Format($hash, "model", $resultArray->[ $offset + 10 ] ); } } @@ -917,7 +924,7 @@ sub FRITZBOX_Readout_Done($) my ($string) = @_; unless (defined $string) { - Log3 "FRITZBOX_Readout_Done", 1, "Fatal Error: no parameter handed over"; + Log 1, "Fatal Error: no parameter handed over"; return; } @@ -940,7 +947,7 @@ sub FRITZBOX_Readout_Process($$) my ($hash,$string) = @_; unless (defined $hash) { - Log3 "FRITZBOX_Readout_Process", 1, "Fatal Error: no hash parameter handed over"; + Log 1, "Fatal Error: no hash parameter handed over"; return; } @@ -1792,7 +1799,7 @@ sub FRITZBOX_Cmd_Done($) my ($string) = @_; unless (defined $string) { - Log3 "FRITZBOX_Cmd_Done", 1, "Fatal Error: no parameter handed over"; + Log 1, "Fatal Error: no parameter handed over"; return; } @@ -2550,7 +2557,8 @@ sub FRITZBOX_fritztris($)
set <name> diversity <number> <on|off>
set <name> sendMail [to:<Address>] [subject:<Subject>] [body:<Text>]