From b4647a89fa84fce5fc20a980480373a03fecd6a1 Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Mon, 27 Oct 2014 09:17:33 +0000 Subject: [PATCH] 37_harmony.pm: small keyboard fixes git-svn-id: https://svn.fhem.de/fhem/trunk@6817 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/37_harmony.pm | 64 ++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/fhem/FHEM/37_harmony.pm b/fhem/FHEM/37_harmony.pm index d56bf0cfe..49d43fdda 100644 --- a/fhem/FHEM/37_harmony.pm +++ b/fhem/FHEM/37_harmony.pm @@ -503,7 +503,23 @@ use constant { CTRL => 0x01, RIGHT_GUI => 0x80, }; -my %keys = ( '!' => '0700001E', +my %keys = ( '1' => '0702001E', + '2' => '0702001F', + '3' => '07020020', + '4' => '07020021', + '5' => '07020022', + '6' => '07020023', + '7' => '07020024', + '8' => '07020025', + '9' => '07020026', + '0' => '07020027', + + '\\n'=> '07000028', + '\\e'=> '07000029', + '\\t'=> '0700002B', + ' ' => '0700002C', + + '!' => '0702001E', '"' => '0702001F', '§' => '07020020', '$' => '07020021', @@ -521,7 +537,7 @@ my %keys = ( '!' => '0700001E', '#' => '07000031', 'ö' => '07000033', 'ä' => '07000034', - '^' => '07000035', + '<' => '07000035', ',' => '07000036', '.' => '07000037', '-' => '07000038', @@ -533,10 +549,40 @@ my %keys = ( '!' => '0700001E', "'" => '07020031', 'Ö' => '07020033', 'Ä' => '07020034', + '>' => '07020035', ';' => '07020036', ':' => '07020037', '_' => '07020038', - ); + + 'F1' => '0700003A', + 'F2' => '0700003B', + 'F3' => '0700003C', + 'F4' => '0700003D', + 'F5' => '0700003E', + 'F6' => '0700003F', + 'F7' => '07000040', + 'F8' => '07000041', + 'F9' => '07000042', + 'F10' => '07000043', + 'F11' => '07000044', + 'F12' => '07000045', + + 'KP/' => '07000054', + 'KP*' => '07000055', + 'KP-' => '07000056', + 'KP+' => '07000057', + 'KP\\n' => '07000058', + 'KP1' => '07000059', + 'KP2' => '0700005A', + 'KP3' => '0700005C', + 'KP4' => '0700005C', + 'KP5' => '0700005D', + 'KP6' => '0700005E', + 'KP7' => '0700005F', + 'KP8' => '07000060', + 'KP9' => '07000061', + 'KP0' => '07000062', + ); sub @@ -546,17 +592,7 @@ harmony_char2hid($) Log 1, $char; my $ret; - if( $char eq ' ' ) { - $ret = '0700002C'; - } elsif( $char eq '\\n' ) { - $ret = '07000028'; - } elsif( $char eq '\\e' ) { - $ret = '07000029'; - } elsif( $char eq '\\t' ) { - $ret = '0700002B'; - } elsif( $char eq '0' ) { - $ret = '07000027'; - } elsif( $char ge '1' && $char le '9' ) { + if( $char ge '1' && $char le '9' ) { $ret = sprintf( "070000%02X", 0x1E + ord($char) - ord('1') ); } elsif( $char ge 'a' && $char le 'z' ) { $ret = sprintf( "070000%02X", 0x04 + ord($char) - ord('a') );