diff --git a/fhem/FHEM/72_FRITZBOX.pm b/fhem/FHEM/72_FRITZBOX.pm
index c52284d18..7a9c60212 100644
--- a/fhem/FHEM/72_FRITZBOX.pm
+++ b/fhem/FHEM/72_FRITZBOX.pm
@@ -46,7 +46,7 @@ use Blocking;
use HttpUtils;
use feature 'state';
-my $ModulVersion = "08.20.08";
+my $ModulVersion = "08.20.08a";
my $missingModul = "";
my $missingXML = "";
my $FRITZBOX_TR064pwd;
@@ -1101,23 +1101,26 @@ sub FRITZBOX_Initialize($)
."enableUserInfo:0,1 "
."enableWLANneighbors:0,1 "
."enableXtamInfo:0,1 "
-
-
."enableSIP:0,1 "
+
."enableSmartHome:off,all,group,device "
."enableReadingsFilter:multiple-strict,"
."dectID_alarmRingTone,dectID_custRingTone,dectID_device,dectID_fwVersion,dectID_intern,dectID_intRingTone,"
."dectID_manufacturer,dectID_model,dectID_NoRingWithNightSetting,dectID_radio,dectID_NoRingTime,"
- ."shdeviceID_battery,shdeviceID_category,shdeviceID_device,shdeviceID_firmwareVersion,shdeviceID_manufacturer,"
- ."shdeviceID_model,shdeviceID_status,shdeviceID_tempOffset,shdeviceID_temperature,shdeviceID_type,"
- ."shdeviceID_voltage,shdeviceID_powerPerHour,shdeviceID_currentInAmp,shdeviceID_powerInWatt,shdeviceSD_ledState,shdeviceSH_state,"
- ."shdeviceID_buttonLocked,shdeviceID_externalLocked,shdeviceID_adaptivHeatingActive,shdeviceID_adaptivHeatingEnabled,shdeviceID_adaptivHeatingSupported,"
- ."shdeviceID_temperatureDropMinutes,shdeviceID_temperatureDropSens,shdeviceID_timeControl,shdeviceID_currentState,shdeviceID_currentStateAction,"
- ."shdeviceID_currentStateEndTime,shdeviceID_summerTimeAction,shdeviceID_summerTimeEnabled,shdeviceID_targetTemp,shdeviceID_mode,shdeviceID_modeNextChangeTime "
+ ."shdeviceID_adaptivHeatingActive,shdeviceID_adaptivHeatingEnabled,shdeviceID_adaptivHeatingSupported,"
+ ."shdeviceID_battery,shdeviceID_batteryLow,shdeviceID_buttonLocked,"
+ ."shdeviceID_category,shdeviceID_currentInAmp,shdeviceID_currentState,shdeviceID_currentStateAction,shdeviceID_currentStateEndTime,"
+ ."shdeviceID_device,shdeviceID_externalLocked,shdeviceID_firmwareVersion,shdeviceID_holidayActive,"
+ ."shdeviceID_ledState,shdeviceID_manufacturer,shdeviceID_mode,shdeviceID_modeNextChangeTime,shdeviceID_model,"
+ ."shdeviceID_powerPerHour,shdeviceID_powerInWatt,"
+ ."shdeviceID_state,shdeviceID_status,shdeviceID_summerTimeAction,shdeviceID_summerTimeEnabled,shdeviceID_summerTimePeriod,shdeviceID_summerTimeRepetition,"
+ ."shdeviceID_targetTemp,shdeviceID_tempOffset,shdeviceID_temperature,shdeviceID_temperatureDropMinutes,shdeviceID_temperatureDropSens,shdeviceID_timeControl,shdeviceID_type,"
+ ."shdeviceID_uid,shdeviceID_voltage "
."enableBoxReadings:multiple-strict,"
."box_energyMode,box_globalFilter,box_led,box_vdsl,box_dns,box_pwr,box_guestWlan,box_usb,box_notify "
."enableLogReadings:multiple-strict,"
."box_sys_Log,box_wlan_Log,box_fon_Log "
+
."deviceInfo:sortable,ipv4,name,uid,connection,speed,rssi,statIP,_noDefInf_ "
."disableTableFormat:multiple-strict,border(8),cellspacing(10),cellpadding(20) "
."FhemLog3Std:0,1 "
@@ -6947,7 +6950,7 @@ sub FRITZBOX_Readout_Run_Web_LuaData($$$$)
}
if (defined $outhash->{devicelist}->{device}->[$i]->{hkr}->{summeractive}) {
- FRITZBOX_Readout_Add_Reading $hash, $roReadings, "shdevice" . $id . "_holidayactive", $outhash->{devicelist}->{device}->[$i]->{hkr}->{holidayactive};
+ FRITZBOX_Readout_Add_Reading $hash, $roReadings, "shdevice" . $id . "_holidayActive", $outhash->{devicelist}->{device}->[$i]->{hkr}->{summeractive}->{holidayactive};
}
}
}
@@ -6959,7 +6962,7 @@ sub FRITZBOX_Readout_Run_Web_LuaData($$$$)
}
if (defined $outhash->{devicelist}->{device}->{hkr}->{summeractive}) {
- FRITZBOX_Readout_Add_Reading $hash, $roReadings, "shdevice" . $id . "_holidayactive", $outhash->{devicelist}->{device}->{hkr}->{holidayactive};
+ FRITZBOX_Readout_Add_Reading $hash, $roReadings, "shdevice" . $id . "_holidayActive", $outhash->{devicelist}->{device}->{hkr}->{summeractive}->{holidayactive};
}
}
}
@@ -8699,12 +8702,15 @@ sub FRITZBOX_Readout_Process($$)
."enableReadingsFilter:multiple-strict,"
."dectID_alarmRingTone,dectID_custRingTone,dectID_device,dectID_fwVersion,dectID_intern,dectID_intRingTone,"
."dectID_manufacturer,dectID_model,dectID_NoRingWithNightSetting,dectID_radio,dectID_NoRingTime,"
- ."shdeviceID_battery,shdeviceID_category,shdeviceID_device,shdeviceID_firmwareVersion,shdeviceID_manufacturer,"
- ."shdeviceID_model,shdeviceID_status,shdeviceID_tempOffset,shdeviceID_temperature,shdeviceID_type,"
- ."shdeviceID_voltage,shdeviceID_powerPerHour,shdeviceID_currentInAmp,shdeviceID_powerInWatt,shdeviceID_ledState,shdeviceID_state,"
- ."shdeviceID_buttonLocked,shdeviceID_externalLocked,shdeviceID_adaptivHeatingActive,shdeviceID_adaptivHeatingEnabled,shdeviceID_adaptivHeatingSupported,"
- ."shdeviceID_temperatureDropMinutes,shdeviceID_temperatureDropSens,shdeviceID_timeControl,shdeviceID_currentState,shdeviceID_currentStateAction,"
- ."shdeviceID_currentStateEndTime,shdeviceID_summerTimeAction,shdeviceID_summerTimeEnabled,shdeviceID_targetTemp,shdeviceID_mode,shdeviceID_modeNextChangeTime "
+ ."shdeviceID_adaptivHeatingActive,shdeviceID_adaptivHeatingEnabled,shdeviceID_adaptivHeatingSupported,"
+ ."shdeviceID_battery,shdeviceID_batteryLow,shdeviceID_buttonLocked,"
+ ."shdeviceID_category,shdeviceID_currentInAmp,shdeviceID_currentState,shdeviceID_currentStateAction,shdeviceID_currentStateEndTime,"
+ ."shdeviceID_device,shdeviceID_externalLocked,shdeviceID_firmwareVersion,shdeviceID_holidayActive,"
+ ."shdeviceID_ledState,shdeviceID_manufacturer,shdeviceID_mode,shdeviceID_modeNextChangeTime,shdeviceID_model,"
+ ."shdeviceID_powerPerHour,shdeviceID_powerInWatt,"
+ ."shdeviceID_state,shdeviceID_status,shdeviceID_summerTimeAction,shdeviceID_summerTimeEnabled,shdeviceID_summerTimePeriod,shdeviceID_summerTimeRepetition,"
+ ."shdeviceID_targetTemp,shdeviceID_tempOffset,shdeviceID_temperature,shdeviceID_temperatureDropMinutes,shdeviceID_temperatureDropSens,shdeviceID_timeControl,shdeviceID_type,"
+ ."shdeviceID_uid,shdeviceID_voltage "
."enableBoxReadings:multiple-strict,"
."box_energyMode,box_globalFilter,box_led,box_dns,box_pwr,box_guestWlan,box_usb,box_notify "
."enableLogReadings:multiple-strict,"
@@ -18176,36 +18182,43 @@ sub reformat{
sip_inactive - Shows the number of inactive SIP connections.
sip_error - Shows the number of faulty SIP connections. 0 == everything OK.
- shdevicen_battery -
- shdevicen_category -
- shdevicen_device -
- shdevicen_firmwareVersion -
- shdevicen_manufacturer -
- shdevicen_model -
- shdevicen_status -
- shdevicen_tempOffset -
- shdevicen_temperature -
- shdevicen_type -
- shdevicen_voltage -
- shdevicen_powerPerHour -
- shdevicen_currentInAmp -
- shdevicen_powerInWatt -
- shdevicen_buttonLocked -
- shdevicen_externalLocked -
shdevicen_adaptivHeatingActive -
shdevicen_adaptivHeatingEnabled -
shdevicen_adaptivHeatingSupported -
- shdevicen_temperatureDropMinutes -
- shdevicen_temperatureDropSens -
- shdevicen_timeControl -
+ shdevicen_battery -
+ shdevicen_batteryLow -
+ shdevicen_buttonLocked -
+ shdevicen_category -
+ shdevicen_currentInAmp -
shdevicen_currentState -
shdevicen_currentStateAction -
shdevicen_currentStateEndTime -
- shdevicen_summerTimeAction -
- shdevicen_summerTimeEnabled -
- shdevicen_targetTemp -
+ shdevicen_device -
+ shdevicen_externalLocked -
+ shdevicen_firmwareVersion -
+ shdevicen_holidayActive -
+ shdevicen_ledState -
+ shdevicen_manufacturer -
shdevicen_mode -
shdevicen_modeNextChangeTime -
+ shdevicen_model -
+ shdevicen_powerPerHour -
+ shdevicen_powerInWatt -
+ shdevicen_state -
+ shdevicen_status -
+ shdevicen_summerTimeAction -
+ shdevicen_summerTimeEnabled -
+ shdevicen_summerTimePeriod -
+ shdevicen_summerTimeRepetition -
+ shdevicen_targetTemp -
+ shdevicen_tempOffset -
+ shdevicen_temperature -
+ shdevicen_temperatureDropMinutes -
+ shdevicen_temperatureDropSens -
+ shdevicen_timeControl -
+ shdevicen_type -
+ shdevicen_uid -
+ shdevicen_voltage -
retStat_blockIncomingPhoneCall - Return Status: set <name> blockIncomingPhoneCall ...
retStat_chgProfile - Return Status: set <name> chgProfile <number> <filtprofn>
@@ -19352,36 +19365,43 @@ sub reformat{
sip_inactive - zeigt die Anzahl inaktiver SIP.
sip_error - zeigt die Anzahl fehlerhafter SIP. 0 == alles Ok.
- shdevicen_battery -
- shdevicen_category -
- shdevicen_device -
- shdevicen_firmwareVersion -
- shdevicen_manufacturer -
- shdevicen_model -
- shdevicen_status -
- shdevicen_tempOffset -
- shdevicen_temperature -
- shdevicen_type -
- shdevicen_voltage -
- shdevicen_powerPerHour -
- shdevicen_currentInAmp -
- shdevicen_powerInWatt -
- shdevicen_buttonLocked -
- shdevicen_externalLocked -
shdevicen_adaptivHeatingActive -
shdevicen_adaptivHeatingEnabled -
shdevicen_adaptivHeatingSupported -
- shdevicen_temperatureDropMinutes -
- shdevicen_temperatureDropSens -
- shdevicen_timeControl -
+ shdevicen_battery -
+ shdevicen_batteryLow -
+ shdevicen_buttonLocked -
+ shdevicen_category -
+ shdevicen_currentInAmp -
shdevicen_currentState -
shdevicen_currentStateAction -
shdevicen_currentStateEndTime -
- shdevicen_summerTimeAction -
- shdevicen_summerTimeEnabled -
- shdevicen_targetTemp -
+ shdevicen_device -
+ shdevicen_externalLocked -
+ shdevicen_firmwareVersion -
+ shdevicen_holidayActive -
+ shdevicen_ledState -
+ shdevicen_manufacturer -
shdevicen_mode -
shdevicen_modeNextChangeTime -
+ shdevicen_model -
+ shdevicen_powerPerHour -
+ shdevicen_powerInWatt -
+ shdevicen_state -
+ shdevicen_status -
+ shdevicen_summerTimeAction -
+ shdevicen_summerTimeEnabled -
+ shdevicen_summerTimePeriod -
+ shdevicen_summerTimeRepetition -
+ shdevicen_targetTemp -
+ shdevicen_tempOffset -
+ shdevicen_temperature -
+ shdevicen_temperatureDropMinutes -
+ shdevicen_temperatureDropSens -
+ shdevicen_timeControl -
+ shdevicen_type -
+ shdevicen_uid -
+ shdevicen_voltage -
retStat_blockIncomingPhoneCall - Return Status: set <name> blockIncomingPhoneCall ...
retStat_chgProfile - Return Status: set <name> chgProfile <number> <filtprofn>