FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

fhem.pl: set featurelevel to 6.2

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27055 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2023-01-14 15:54:12 +00:00
parent d0da3f429a
commit b6c0345250
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/CHANGED
View File

@ -1,5 +1,8 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 6.2 released
- 2023-01-14 (6.2)
- feature: 76_SMAInverter: crypt Password - feature: 76_SMAInverter: crypt Password
add new Reading SPOT_EPVTOTAL / SPOT_EPVTODAY add new Reading SPOT_EPVTOTAL / SPOT_EPVTODAY
add new Reading BAT_UNLOADTODAY / BAT_UNLOADTOTAL, add new Reading BAT_UNLOADTODAY / BAT_UNLOADTOTAL,
@ -368,7 +371,7 @@
- bugfix: 73_km200: Allowing port behind IP address - bugfix: 73_km200: Allowing port behind IP address
- feature: 6.1 released - feature: 6.1 released
1- 2021-11-07 (6.1) - 2021-11-07 (6.1)
- change: 20_OWFS: Move to deprecated - change: 20_OWFS: Move to deprecated
- change: 21_OWTEMP: Move to deprecated - change: 21_OWTEMP: Move to deprecated
- change: 49_SSCam: set compability to SVS 8.2.10 - change: 49_SSCam: set compability to SVS 8.2.10

4
fhem/Makefile
View File

@ -1,7 +1,7 @@
# $Id$ # $Id$
VERS=6.1 VERS=6.2
DATE=2021-11-26 DATE=2023-01-14
# used for nightly build # used for nightly build
DATEN=$(shell date +"%Y-%m-%d") DATEN=$(shell date +"%Y-%m-%d")

2
fhem/UPGRADE
View File

@ -53,5 +53,5 @@ enable the old feature.
20_OWFS (=> OWServer, or OWX) 20_OWFS (=> OWServer, or OWX)
21_OWTEMP (=> OWDevice) 21_OWTEMP (=> OWDevice)
- (6.2) - 2023-01-14 (6.2)
- MQTT2_SERVER: respectRetain is 0 (i.e. false) by default from now on. - MQTT2_SERVER: respectRetain is 0 (i.e. false) by default from now on.

12
fhem/docs/fhem.html
View File

@ -232,10 +232,10 @@
<a name="Download"></a> <a name="Download"></a>
<h3>Download</h3> <h3>Download</h3>
<ul> <ul>
Last released version: (as of 2021-11-07): Last released version: (as of 2023-01-14):
<a href="http://fhem.de/fhem-6.1.tar.gz">fhem-6.1.tar.gz</a>, <a href="http://fhem.de/fhem-6.2.tar.gz">fhem-6.2.tar.gz</a>,
<a href="http://fhem.de/fhem-6.1.zip">fhem-6.1.zip</a>, <a href="http://fhem.de/fhem-6.2.zip">fhem-6.2.zip</a>,
<a href="http://fhem.de/fhem-6.1.deb">fhem-6.1.deb</a>, <a href="http://fhem.de/fhem-6.2.deb">fhem-6.2.deb</a>,
<br> <br>
See the <a href="CHANGED">CHANGED</a> file for the change history or the See the <a href="CHANGED">CHANGED</a> file for the change history or the
<a href="SVNLOG">svn log</a> for a more detailed log.<br><br> <a href="SVNLOG">svn log</a> for a more detailed log.<br><br>
@ -262,7 +262,7 @@
<ul> <ul>
<h4>Debian/Ubuntu/Raspbian</h4> <h4>Debian/Ubuntu/Raspbian</h4>
<ul> <ul>
<li>Install <a href="http://fhem.de/fhem-6.1.deb">this</a> package. <li>Install <a href="http://fhem.de/fhem-6.2.deb">this</a> package.
For a better integration check out <a For a better integration check out <a
href="http://debian.fhem.de/">debian.fhem.de</a> href="http://debian.fhem.de/">debian.fhem.de</a>
</ul> </ul>
@ -273,7 +273,7 @@
Device::SerialPort perl module, install it with "sudo cpan Device::SerialPort perl module, install it with "sudo cpan
Device::SerialPort" or "apt-get install libdevice-serialport-perl". Device::SerialPort" or "apt-get install libdevice-serialport-perl".
</li> </li>
<li>Download the <a href="http://fhem.de/fhem-6.1.tar.gz"> <li>Download the <a href="http://fhem.de/fhem-6.2.tar.gz">
.tar.gz</a> package, unpack it, and change to the unpacked directory. .tar.gz</a> package, unpack it, and change to the unpacked directory.
<li>start FHEM directly from this directory (perl fhem.pl fhem.cfg). <li>start FHEM directly from this directory (perl fhem.pl fhem.cfg).
</ul> </ul>

4
fhem/fhem.pl
View File

@ -312,7 +312,7 @@ my $readytimeout = ($^O eq "MSWin32") ? 0.1 : 5.0;
$init_done = 0; $init_done = 0;
$lastDefChange = 0; $lastDefChange = 0;
$featurelevel = 6.1; # see also GlobalAttr $featurelevel = 6.2; # see also GlobalAttr
$numCPUs = `grep -c ^processor /proc/cpuinfo 2>&1` if($^O eq "linux"); $numCPUs = `grep -c ^processor /proc/cpuinfo 2>&1` if($^O eq "linux");
$numCPUs = ($numCPUs && $numCPUs =~ m/(\d+)/ ? $1 : 1); $numCPUs = ($numCPUs && $numCPUs =~ m/(\d+)/ ? $1 : 1);
@ -2918,7 +2918,7 @@ GlobalAttr($$$$)
if($type eq "del") { if($type eq "del") {
my %noDel = ( modpath=>1, verbose=>1, logfile=>1, configfile=>1, encoding=>1 ); my %noDel = ( modpath=>1, verbose=>1, logfile=>1, configfile=>1, encoding=>1 );
return "The global attribute $name cannot be deleted" if($noDel{$name}); return "The global attribute $name cannot be deleted" if($noDel{$name});
$featurelevel = 6.1 if($name eq "featurelevel"); $featurelevel = 6.2 if($name eq "featurelevel");
$haveInet6 = 0 if($name eq "useInet6"); # IPv6 $haveInet6 = 0 if($name eq "useInet6"); # IPv6
delete($defs{global}{ignoreRegexpObj}) if($name eq "ignoreRegexp"); delete($defs{global}{ignoreRegexpObj}) if($name eq "ignoreRegexp");
return undef; return undef;