FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-29 05:24:10 +00:00
Code Issues Releases Wiki Activity

fb7390 fixes/tests

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1182 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-01-07 12:18:10 +00:00
parent 4340ced147
commit 670c7b5e2f
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
- SVN - SVN
- feature: internal NotifyOrderPrefix: 98_average.pm is more straightforward - feature: internal NotifyOrderPrefix: 98_average.pm is more straightforward
- feature: the usb command tries to flash unflashed CULs on linux
- 2011-12-31 (5.2) - 2011-12-31 (5.2)

8
fhem/FHEM/98_autocreate.pm
View File

@ -343,7 +343,7 @@ CommandUsb($$)
$culType = "CUL_V4" if($lsusb =~ m/03eb:2ff0/); $culType = "CUL_V4" if($lsusb =~ m/03eb:2ff0/);
$culType = "CUL_V3" if($lsusb =~ m/03eb:2ff4/); $culType = "CUL_V3" if($lsusb =~ m/03eb:2ff4/);
$culType = "CUL_V2" if($lsusb =~ m/03eb:2ffa/); $culType = "CUL_V2" if($lsusb =~ m/03eb:2ffa/);
last if(!$culType); if($culType) {
$msg = "$culType: flash it with: CULflash none $culType"; $msg = "$culType: flash it with: CULflash none $culType";
Log 4, $msg; $ret .= $msg . "\n"; Log 4, $msg; $ret .= $msg . "\n";
if(!$scan) { if(!$scan) {
@ -351,6 +351,7 @@ CommandUsb($$)
sleep(4); # Leave time for linux to load th drivers sleep(4); # Leave time for linux to load th drivers
} }
} }
}
################ ################
# Now the /dev scan # Now the /dev scan
@ -407,7 +408,10 @@ CommandUsb($$)
$msg = "$dev: create as a fhem device with: define $define"; $msg = "$dev: create as a fhem device with: define $define";
Log 4, $msg; $ret .= $msg . "\n"; Log 4, $msg; $ret .= $msg . "\n";
CommandDefine($cl, $define) if($scan); if(!$scan) {
Log 1, "define $define";
CommandDefine($cl, $define);
}
goto NEXTDEVICE; goto NEXTDEVICE;
} }

8
fhem/contrib/FB7390/install
View File

@ -57,9 +57,7 @@ if test $r != 0; then
fi fi
rm -f /var/nvi.tmp rm -f /var/nvi.tmp
echo "########################### Starting fhem ############################" # We have to restart with exit code 1, else the frontend tells us:
sync # update failed: no error
$home/startfhem
echo "########################### FHEM INSTALL END #########################" echo "########################### FHEM INSTALL END #########################"
exit 1 # INSTALL_SUCCESS_REBOOT exit 1

2
fhem/contrib/FB7390/startfhem
View File

@ -28,7 +28,7 @@ if [ "$?" -ne "0" ]; then
chown -R boxusr80 ${home}/FHEM chown -R boxusr80 ${home}/FHEM
chown root ${home}/dfu-programmer chown root ${home}/dfu-programmer
chmod 2755 ${home}/dfu-programmer chmod 4755 ${home}/dfu-programmer
fi fi
perl fhem.pl fhem.cfg perl fhem.pl fhem.cfg