FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

00_ZWDongle: add the MEMORY functions to the backup commands (Forum #53023)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11798 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-07-16 07:29:21 +00:00
parent ee96320475
commit 67939b980f
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fhem/FHEM/00_ZWDongle.pm
View File

@ -253,21 +253,29 @@ ZWDongle_Set($@)
} }
if($type eq "backupCreate") { if($type eq "backupCreate") {
my $caps = ReadingsVal($name, "caps","");
my $is4 = ($caps =~ m/MEMORY_GET_BUFFER/);
my $is5 = ($caps =~ m/NVM_EXT_READ_LONG_BUFFER/);
return "Creating a backup is not supported by this device" return "Creating a backup is not supported by this device"
if(ReadingsVal($name, "caps","") !~ m/NVM_EXT_READ_LONG_BUFFER/); if(!$is4 && !$is5);
return "Usage: set $name backupCreate [64k|128k|256k]" return "Usage: set $name backupCreate [16k|32k|64k|128k|256k]"
if(int(@a) != 1 || $a[0] !~ m/^(64|128|256)k$/); if(int(@a) != 1 || $a[0] !~ m/^(16|32|64|128|256)k$/);
my $fn = ($is5 ? "NVM_EXT_READ_LONG_BUFFER" : "MEMORY_GET_BUFFER");
my $cmdFormat = ($is5 ? "002a%06x0040" : "0023%04x20");
my $cmdRe = ($is5 ? "^012a" : "^0123");
my $inc = ($is5 ? 64 : 32);
my $l = $1 * 1024; my $l = $1 * 1024;
my $fName = "$attr{global}{modpath}/$name.bin"; my $fName = "$attr{global}{modpath}/$name.bin";
open(OUT, ">$fName") || return "Cant open $fName: $!"; open(OUT, ">$fName") || return "Cant open $fName: $!";
binmode(OUT); binmode(OUT);
for(my $off = 0; $off < $l;) { for(my $off = 0; $off < $l;) {
ZWDongle_Write($hash, "", sprintf("002a%06x0040", $off)); ZWDongle_Write($hash, "", sprintf($cmdFormat, $off));
my ($err, $ret) = my ($err, $ret) = ZWDongle_ReadAnswer($hash, $fn, $cmdRe);
ZWDongle_ReadAnswer($hash, "NVM_EXT_READ_LONG_BUFFER", "^012a");
return $err if($err); return $err if($err);
print OUT pack('H*', substr($ret, 4)); print OUT pack('H*', substr($ret, 4));
$off += 64; $off += $inc;
Log 3, "$name backupCreate at $off bytes" if($off % 16384 == 0); Log 3, "$name backupCreate at $off bytes" if($off % 16384 == 0);
} }
@ -276,8 +284,17 @@ ZWDongle_Set($@)
} }
if($type eq "backupRestore") { if($type eq "backupRestore") {
my $caps = ReadingsVal($name, "caps","");
my $is4 = ($caps =~ m/MEMORY_PUT_BUFFER/);
my $is5 = ($caps =~ m/NVM_EXT_WRITE_LONG_BUFFER/);
return "Restoring a backup is not supported by this device" return "Restoring a backup is not supported by this device"
if(ReadingsVal($name, "caps","") !~ m/NVM_EXT_WRITE_LONG_BUFFER/); if(!$is4 && !$is5);
my $fn = ($is5 ? "NVM_EXT_WRITE_LONG_BUFFER" : "MEMORY_PUT_BUFFER");
my $cmdFormat = ($is5 ? "002b%06x0040%s" : "0024%04x40%s");
my $cmdRe = ($is5 ? "^012b" : "^0124");
my $cmdRet = ($is5 ? "^012b01" : "^012401");
my $inc = ($is5 ? 64 : 32);
return "Usage: set $name backupRestore" if(int(@a) != 0); return "Usage: set $name backupRestore" if(int(@a) != 0);
my $fName = "$attr{global}{modpath}/$name.bin"; my $fName = "$attr{global}{modpath}/$name.bin";
my $l = -s $fName; my $l = -s $fName;
@ -287,16 +304,15 @@ ZWDongle_Set($@)
my $buf; my $buf;
for(my $off = 0; $off < $l;) { for(my $off = 0; $off < $l;) {
if(sysread(IN, $buf, 64) != 64) { if(sysread(IN, $buf, $inc) != $inc) {
return "Cant read 64 bytes from $fName"; return "Cant read $inc bytes from $fName";
} }
ZWDongle_Write($hash,"",sprintf("002b%06x0040%s",$off,unpack('H*',$buf))); ZWDongle_Write($hash, "", sprintf($cmdFormat, $off, unpack('H*',$buf)));
my ($err, $ret) = my ($err, $ret) = ZWDongle_ReadAnswer($hash, $fn, $cmdRe);
ZWDongle_ReadAnswer($hash, "NVM_EXT_WRITE_LONG_BUFFER", "^012b");
return $err if($err); return $err if($err);
return "Unexpected NVM_EXT_WRITE_LONG_BUFFER return value $ret" return "Unexpected $fn return value $ret"
if($ret !~ m/^012b01/); if($ret !~ m/$cmdRet/);
$off += 64; $off += $inc;
Log 3, "$name backupRestore at $off bytes" if($off % 16384 == 0); Log 3, "$name backupRestore at $off bytes" if($off % 16384 == 0);
} }
@ -981,7 +997,7 @@ ZWDongle_Ready($)
device supports the SECURITY class, then a secure inclusion is attempted. device supports the SECURITY class, then a secure inclusion is attempted.
</li> </li>
<li>backupCreate 64k|128k|256k<br> <li>backupCreate 16k|32k|64k|128k|256k<br>
read out the NVRAM of the ZWDongle, and store it in a file called read out the NVRAM of the ZWDongle, and store it in a file called
&lt;ZWDongle_Name&gt;.bin in the modpath folder. Since the size of the &lt;ZWDongle_Name&gt;.bin in the modpath folder. Since the size of the
NVRAM is currently unknown to FHEM, you have to specify the size. The NVRAM is currently unknown to FHEM, you have to specify the size. The
@ -993,6 +1009,8 @@ ZWDongle_Ready($)
<li>backupRestore<br> <li>backupRestore<br>
Restore the file created by backupCreate. Restoring the file takes about Restore the file created by backupCreate. Restoring the file takes about
the same time as saving it, and FHEM is blocked during this time. the same time as saving it, and FHEM is blocked during this time.
Note / Important: this function is not yet tested for older devices using
the MEMORY functions.
</li> </li>
<li>controllerChange on|stop|stopFailed<br> <li>controllerChange on|stop|stopFailed<br>