diff --git a/fhem/CHANGED b/fhem/CHANGED index 0d371c24a..ecf4e4257 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - feature: YAMAHA_BD: support 95_remotecontrol.pm module features - changed: Reverted to previous version. Module not working on RPi - feature: 71_PHILIPS_AUDIO: Implemented UPNP/DLNA player discovery. - feature: 57_CALVIEW: added multiple CALENDAR support, reading source and location for terms diff --git a/fhem/FHEM/71_YAMAHA_BD.pm b/fhem/FHEM/71_YAMAHA_BD.pm index 9d295332d..5b75cf3f5 100755 --- a/fhem/FHEM/71_YAMAHA_BD.pm +++ b/fhem/FHEM/71_YAMAHA_BD.pm @@ -54,6 +54,10 @@ YAMAHA_BD_Initialize($) $hash->{UndefFn} = "YAMAHA_BD_Undefine"; $hash->{AttrList} = "do_not_notify:0,1 disable:0,1 request-timeout:1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20 model ". $readingFnAttributes; + + $data{RC_layout}{YAMAHA_BluRay} = "YAMAHA_BD_RClayout"; + $data{RC_makenotify}{YAMAHA_BD} = "YAMAHA_BD_RCmakenotify"; + } ################################### @@ -143,7 +147,7 @@ YAMAHA_BD_Set($@) return "No Argument given" if(!defined($a[1])); my $what = $a[1]; - my $usage = "Unknown argument $what, choose one of on:noArg off:noArg statusRequest:noArg tray:open,close remoteControl:up,down,left,right,return,enter,OSDonScreen,OSDstatus,topMenu,popupMenu,red,green,blue,yellow,0,1,2,3,4,5,6,7,8,9,setup,home,clear,program,search,repeat,repeat-AB,subtitle,angle,audio,pictureInPicture,secondVideo,secondAudio fast:forward,reverse slow:forward,reverse skip:forward,reverse play:noArg pause:noArg stop:noArg trickPlay:normal,repeatChapter,repeatTitle,repeatFolder,repeat-AB,randomChapter,randomTitle,randomAll,shuffleChapter,shuffleTitle,shuffleAll,setApoint"; + my $usage = "Unknown argument $what, choose one of on:noArg off:noArg statusRequest:noArg tray:open,close remoteControl:eject,up,down,left,right,return,enter,OSDonScreen,OSDstatus,topMenu,popupMenu,red,green,blue,yellow,0,1,2,3,4,5,6,7,8,9,setup,home,clear,program,search,repeat,repeat-AB,subtitle,angle,audio,pictureInPicture,secondVideo,secondAudio,power fast:forward,reverse slow:forward,reverse skip:forward,reverse play:noArg pause:noArg stop:noArg trickPlay:normal,repeatChapter,repeatTitle,repeatFolder,repeat-AB,randomChapter,randomTitle,randomAll,shuffleChapter,shuffleTitle,shuffleAll,setApoint"; if($what eq "on") { @@ -303,6 +307,14 @@ YAMAHA_BD_Set($@) { YAMAHA_BD_SendCommand($hash,"2nd Audio","remoteControl","secondAudio"); } + elsif($a[2] eq "power") + { + YAMAHA_BD_SendCommand($hash,"7C80","remoteControl","repeat-AB"); + } + elsif($a[2] eq "eject") + { + YAMAHA_BD_SendCommand($hash,"7C81","remoteControl","repeat-AB"); + } else { return $usage; @@ -769,6 +781,47 @@ YAMAHA_BD_ResetTimer($;$) } } +############################# +# define the layout for module 95_remotecontrol.pm +sub YAMAHA_BD_RClayout() +{ + my @row; + + $row[0] = "remoteControl eject:EJECT,:blank,:blank,remoteControl power:POWEROFF3"; + $row[1] = "remoteControl red:RED,remoteControl green:GREEN,remoteControl yellow:YELLOW,remoteControl blue:BLUE"; + $row[2] = "remoteControl 1:1,remoteControl 2:2,remoteControl 3:3,remoteControl repeat-AB:REPEAT_AB"; + $row[3] = "remoteControl 4:4,remoteControl 5:5,remoteControl 6:6,remoteControl subtitle:SUBTITLE"; + $row[4] = "remoteControl 7:7,remoteControl 8:8,remoteControl 9:9,remoteControl angle:ANGLE"; + $row[5] = "remoteControl clear:CLEAR,remoteControl 0:0,remoteControl search:SEARCH,remoteControl audio:AUDIO2"; + $row[6] = ":blank,:blank,:blank,:blank"; + $row[7] = "remoteControl pictureInPicture:PIP,:blank,:blank,:blank"; + $row[8] = "remoteControl secondAudio:2ND_AUDIO,remoteControl home:HOMEtxt,remoteControl setup:SETUP,:blank"; + $row[9] = ":blank,:blank,:blank,:blank"; + $row[10] = "remoteControl topMenu:TOPMENU,remoteControl up:UP,remoteControl popupMenu:POPUP_MENU,:blank"; + $row[11] = "remoteControl left:LEFT,remoteControl enter:ENTER3,remoteControl right:RIGHT,:blank"; + $row[12] = "remoteControl return:RETURN,remoteControl down:DOWN,remoteControl OSDonScreen:ONSCREEN,:blank"; + $row[13] = ":blank,:blank,:blank,:blank"; + $row[14] = "stop:STOP,pause:PAUSE,play:PLAY,:blank"; + $row[15] = "slow reverse:SLOW_REWIND,slow forward:SLOW_FORWARD,fast reverse:REWIND,fast forward:FF"; + $row[16] = ":blank,remoteControl OSDstatus:STATUS,skip reverse:SKIP_REVERSE,skip forward:SKIP_FORWARD"; + + + $row[17] = "attr rc_iconpath icons/remotecontrol"; + $row[18] = "attr rc_iconprefix black_btn_"; + return @row; +} + +##################################### +# Callback from 95_remotecontrol for command makenotify. +sub YAMAHA_BD_RCmakenotify($$) +{ + my ($name, $dev) = @_; + my $new_name="notify_$name"; + + fhem("define $new_name notify $name set $dev ".'$EVENT',1); + Log3 undef, 2, "[remotecontrol:YAMAHA_BD] Notify created: $new_name"; + return "Notify created by YAMAHA_BD: $new_name"; +} ############################# # formats a 3 byte Hex Value into human readable time duration diff --git a/fhem/www/images/default/remotecontrol/black_btn_2ND_AUDIO.png b/fhem/www/images/default/remotecontrol/black_btn_2ND_AUDIO.png new file mode 100755 index 000000000..2e007acbc Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_2ND_AUDIO.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_ANGLE.png b/fhem/www/images/default/remotecontrol/black_btn_ANGLE.png new file mode 100755 index 000000000..c42d6f430 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_ANGLE.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_AUDIO2.png b/fhem/www/images/default/remotecontrol/black_btn_AUDIO2.png new file mode 100755 index 000000000..3951d96f9 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_AUDIO2.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_CLEAR.png b/fhem/www/images/default/remotecontrol/black_btn_CLEAR.png new file mode 100755 index 000000000..3a229011a Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_CLEAR.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_EJECT.png b/fhem/www/images/default/remotecontrol/black_btn_EJECT.png new file mode 100755 index 000000000..e309761fc Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_EJECT.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_ENTER3.png b/fhem/www/images/default/remotecontrol/black_btn_ENTER3.png new file mode 100755 index 000000000..b85431d37 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_ENTER3.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_FF.png b/fhem/www/images/default/remotecontrol/black_btn_FF.png index f5036359c..0f49eaa2a 100644 Binary files a/fhem/www/images/default/remotecontrol/black_btn_FF.png and b/fhem/www/images/default/remotecontrol/black_btn_FF.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_ONSCREEN.png b/fhem/www/images/default/remotecontrol/black_btn_ONSCREEN.png new file mode 100755 index 000000000..554422188 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_ONSCREEN.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_PIP.png b/fhem/www/images/default/remotecontrol/black_btn_PIP.png new file mode 100755 index 000000000..44fff4724 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_PIP.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_POPUP_MENU.png b/fhem/www/images/default/remotecontrol/black_btn_POPUP_MENU.png new file mode 100755 index 000000000..738cb67c4 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_POPUP_MENU.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_POWEROFF3.png b/fhem/www/images/default/remotecontrol/black_btn_POWEROFF3.png new file mode 100755 index 000000000..7c3c9abd5 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_POWEROFF3.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_REPEAT_AB.png b/fhem/www/images/default/remotecontrol/black_btn_REPEAT_AB.png new file mode 100755 index 000000000..0b1150812 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_REPEAT_AB.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_REWIND.png b/fhem/www/images/default/remotecontrol/black_btn_REWIND.png index fcc3d598a..efaec1d23 100644 Binary files a/fhem/www/images/default/remotecontrol/black_btn_REWIND.png and b/fhem/www/images/default/remotecontrol/black_btn_REWIND.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_SEARCH.png b/fhem/www/images/default/remotecontrol/black_btn_SEARCH.png new file mode 100755 index 000000000..c2b7b01cb Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_SEARCH.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_SETUP.png b/fhem/www/images/default/remotecontrol/black_btn_SETUP.png new file mode 100755 index 000000000..db47c472c Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_SETUP.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_SKIP_FORWARD.png b/fhem/www/images/default/remotecontrol/black_btn_SKIP_FORWARD.png new file mode 100755 index 000000000..455c91a52 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_SKIP_FORWARD.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_SKIP_REVERSE.png b/fhem/www/images/default/remotecontrol/black_btn_SKIP_REVERSE.png new file mode 100755 index 000000000..33de89db5 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_SKIP_REVERSE.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_SLOW_FORWARD.png b/fhem/www/images/default/remotecontrol/black_btn_SLOW_FORWARD.png new file mode 100755 index 000000000..132ea1bbf Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_SLOW_FORWARD.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_SLOW_REWIND.png b/fhem/www/images/default/remotecontrol/black_btn_SLOW_REWIND.png new file mode 100755 index 000000000..794e1d160 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_SLOW_REWIND.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_STATUS.png b/fhem/www/images/default/remotecontrol/black_btn_STATUS.png new file mode 100755 index 000000000..7be02de31 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_STATUS.png differ diff --git a/fhem/www/images/default/remotecontrol/black_btn_SUBTITLE.png b/fhem/www/images/default/remotecontrol/black_btn_SUBTITLE.png new file mode 100755 index 000000000..75b268636 Binary files /dev/null and b/fhem/www/images/default/remotecontrol/black_btn_SUBTITLE.png differ