packages/keymaps/files/jornada6xx/keymap-* : update/add keymaps

* Lets update/add keymaps used on the jornada6xx.

5 files changed, 550 insertions, 26 deletions

diff --git a/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map
new file mode 100644
index 0000000000..454a1dae68
--- /dev/null
+++ b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map
@@ -0,0 +1,239 @@
+# English keymap for Jornada 620/660 devices.
+# for the jornada680.c driver
+#
+# plain, shift, altgr,  ctrl, shift + ctrl,  alt,  ctrl + alt
+
+keymaps 0-2,4-5,8,12
+keycode   57 = Escape           Escape          
+	alt	keycode   1 = Meta_Escape     
+keycode   59 = one              exclam		asciitilde
+	alt	keycode   2 = Meta_one
+keycode   60 = two              at		grave
+	alt	keycode   3 = Meta_two
+keycode   61 = three            numbersign      
+	alt	keycode   4 = Meta_three      
+	altgr	keycode   4 = pound
+keycode   66 = four             dollar
+	control	keycode   5 = Control_backslash
+	alt	keycode   5 = Meta_four       
+	altgr	keycode   5 = currency
+keycode   65 = five             percent         
+	control	keycode   6 = Control_bracketright
+	alt	keycode   6 = Meta_five       
+keycode   64 = six              asciicircum     
+	control	keycode   7 = Control_asciicircum
+	alt	keycode   7 = Meta_six        
+keycode   62 = seven            ampersand        braceleft
+	control	keycode   8 = Control_underscore
+	alt	keycode   8 = KP_7      
+keycode   63 = eight            asterisk         bracketleft
+	control	keycode   9 = Delete
+	alt	keycode   9 = KP_8      
+keycode  58 = nine             parenleft        bracketright    
+	alt	keycode  10 = KP_9       
+keycode  112 = zero             parenright       braceright      
+	alt	keycode  11 = KP_Divide       
+keycode  29 = minus            underscore       backslash
+	control	keycode  11 = Control_underscore
+	shift control	keycode  11 = Control_underscore
+	alt	keycode  11 = Meta_minus
+keycode  28 = equal            plus            
+	alt	keycode  13 = Meta_equal      
+keycode  88 = Delete           Delete          
+	control	keycode  14 = BackSpace       
+	alt	keycode  14 = Meta_Delete     
+keycode  76 = BackSpace
+keycode  32 = Tab              Tab             
+	alt	keycode  58 = Meta_Tab        
+keycode  45 = q               
+keycode  46 = w               
+keycode  47 = e
+	Shift	keycode  18 = E
+keycode  52 = r               
+keycode  51 = t               
+keycode  50 = y               
+	alt	keycode  21 = KP_4
+keycode  48 = u               
+	alt	keycode  22 = KP_5
+keycode  49 = i               
+	alt	keycode  23 = KP_6
+keycode  53 = o
+	alt	keycode  24 = KP_Multiply
+keycode  40 = p             
+		AltGr keycode 25 = braceleft  
+keycode  81 = backslash	bar
+keycode  77 = bracketleft	braceleft
+keycode  82 = bracketright	braceright
+keycode  43 = Return          
+	alt	keycode  28 = Meta_Control_m  
+keycode  1 = Control         
+	altgr	keycode  29 = Num_Lock
+keycode  68 = a
+keycode  89 = s               
+keycode  67 = d
+keycode  75 = f
+keycode  69 = g               
+keycode  70 = h               
+	alt	keycode  35 = KP_1
+keycode  56 = j               
+	alt	keycode  36 = KP_2
+keycode  123 = k               
+	alt	keycode  37 = KP_3
+keycode  80 = l               
+	alt	keycode  38 = KP_Subtract
+keycode  90 = semicolon        colon           bracketleft
+	alt	keycode  39 = Meta_semicolon
+keycode  27 = apostrophe       quotedbl        bracketright
+	control	keycode  40 = Control_g       
+	alt	keycode  40 = Meta_apostrophe
+keycode  41 = Shift
+keycode  74 = Caps_Lock
+keycode  18 = z               
+keycode  42 = x               
+keycode  71 = c
+keycode  37 = v               
+keycode  79 = b
+keycode  87 = n               
+	alt	keycode  49 = KP_0
+keycode  78 = m               
+	alt	keycode  50 = KP_Comma
+keycode  55 = comma            less            
+	alt	keycode  51 = KP_Period      
+keycode  35 = period           greater         
+	control	keycode  52 = Compose         
+	alt	keycode  52 = KP_Add     
+keycode  54 = Shift 
+keycode  73 = Alt             
+keycode  23 = space            space           
+	alt	keycode  57 = Meta_space      
+keycode  15 = Control              
+keycode  5 = F1              
+keycode  10 = F2              
+keycode  9 = F3              
+keycode  8 = F4              
+keycode  6 = F5              
+keycode  7 = F6              
+keycode  11 = F7              
+keycode  12 = F8              
+keycode  72 = Up
+	shift	keycode  72 = Scroll_Backward           
+	altgr	keycode  72 = Scroll_Backward           
+	alt	keycode  72 = Prior 
+keycode  25 = Left
+	altgr	keycode  75 = Decr_Console
+	alt	keycode  75 = Find      
+keycode  125 = Right
+	altgr	keycode  77 = Incr_Console
+	alt	keycode  77 = Select         
+keycode  26 = Down
+	shift	keycode  80 = Scroll_Forward
+	altgr	keycode  80 = Scroll_Forward
+	alt	keycode  80 = Next         
+keycode  88 = Remove	Remove		Meta_Delete
+	alt	keycode  83 = Meta_Delete            
+#keycode 112 = F10             
+#	shift	keycode 112 = F20             
+#	altgr	keycode 112 = Console_22      
+#	alt	keycode 112 = Console_10      
+#	control	alt	keycode 112 = Console_10      
+keycode 39 = slash	question        
+	control	keycode  115 = Delete          
+	alt	keycode  115 = Meta_slash      
+keycode 20 = AltGr
+keycode 219 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/keymaps/files/jornada6xx/keymap-br.map b/packages/keymaps/files/jornada6xx/keymap-br.map
new file mode 100644
index 0000000000..8bc0f0fab6
--- /dev/null
+++ b/packages/keymaps/files/jornada6xx/keymap-br.map
@@ -0,0 +1,285 @@
+# Brazilian keymap for Jornada 6xx devices.
+#
+# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk )
+# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com )
+# Mrazilian adaptation by Paulo Roberto ( stpaul <at> 0xbadc0ffe.org )
+# plain, shift, altgr,  ctrl, shift + ctrl,  alt,  ctrl + alt
+
+keymaps 0-2,4-5,8,12
+keycode   1 = Escape           Escape          
+	alt	keycode   1 = Meta_Escape     
+keycode   2 = one              exclam		asciitilde
+	alt	keycode   2 = Meta_one
+keycode   3 = two              at		grave
+	alt	keycode   3 = Meta_two
+keycode   4 = three            numbersign      
+	alt	keycode   4 = Meta_three      
+	altgr	keycode   4 = pound
+keycode   5 = four            backslash
+	control	keycode   5 = Control_backslash
+	alt	keycode   5 = Meta_four       
+	altgr	keycode   5 = dollar 
+keycode   6 = five             percent         
+	control	keycode   6 = Control_bracketright
+	alt	keycode   6 = Meta_five       
+keycode   7 = six              dead_diaeresis   
+	AltGr	keycode   7 = notsign
+	alt	keycode   7 = Meta_six        
+keycode   8 = seven            ampersand        braceleft
+	control	keycode   8 = Control_underscore
+	alt	keycode   8 = KP_7      
+keycode   9 = eight            asterisk         bracketleft
+	control	keycode   9 = Delete
+	alt	keycode   9 = KP_8      
+keycode  10 = nine             parenleft        bracketright    
+	alt	keycode  10 = KP_9       
+keycode  11 = zero             parenright       braceright      
+	alt	keycode  11 = KP_Divide       
+keycode  12 = minus            underscore       backslash
+	control	keycode  11 = Control_underscore
+	shift control	keycode  11 = Control_underscore
+	alt	keycode  11 = Meta_minus
+keycode  13 = equal            plus            
+	alt	keycode  13 = Meta_equal      
+keycode  14 = Delete           Delete          
+	control	keycode  14 = BackSpace       
+	alt	keycode  14 = Meta_Delete     
+keycode  15 = Tab              Tab             
+	alt	keycode  15 = Meta_Tab        
+keycode  16 = q               
+	AltGr	keycode  16 = slash
+keycode  17 = w               
+        AltGr	keycode	 17 = question
+keycode  18 = e
+	AltGr	keycode	 18 = E 
+keycode  19 = r               
+keycode  20 = t               
+keycode  21 = y               
+keycode  22 = u               
+	alt	keycode  22 = KP_4
+keycode  23 = i               
+	alt	keycode  23 = KP_5
+keycode  24 = o
+	alt	keycode  24 = KP_6
+keycode  25 = p             
+	alt	keycode  25 = KP_Multiply
+keycode  26 = dead_acute dead_grave 
+keycode  27 = bracketleft braceleft
+	AltGr	keycode	 27 = ordfeminine
+keycode  28 = Return          
+	alt	keycode  28 = Meta_Control_m  
+keycode  29 = F11             
+	shift	keycode  29 = F21
+	altgr	keycode  29 = Console_23      
+	alt	keycode  29 = Console_11      
+	control	alt	keycode  29 = Console_11      
+keycode  30 = a
+	AltGr	keycode	 30 = degree
+keycode  31 = s               
+keycode  32 = d
+keycode  33 = f
+keycode  34 = g               
+keycode  35 = h               
+keycode  36 = j               
+	alt	keycode  36 = KP_1
+keycode  37 = k               
+	alt	keycode  37 = KP_2
+keycode  38 = l               
+	alt	keycode  38 = KP_3
+keycode  39 = +ccedilla	       +Ccedilla 
+	alt	keycode  38 = KP_Subtract
+keycode  40 = dead_tilde       dead_circumflex 
+	shift control	keycode  40 = Control_asciicircum    
+	alt	keycode  40 = Meta_apostrophe
+keycode  42 = Shift           
+	altgr	keycode  42 = Caps_Lock
+keycode  43 = bracketright braceright
+	AltGr	keycode	 43 = masculine
+keycode  44 = z               
+	AltGr	keycode	 44 = backslash
+keycode  45 = x               
+	AltGr	keycode	 45 = bar
+keycode  46 = c
+keycode  47 = v               
+keycode  48 = b
+keycode  49 = n               
+keycode  50 = m               
+	alt	keycode  49 = KP_0
+keycode  51 = comma            less            
+	alt	keycode  50 = KP_Comma
+keycode  52 = period           greater         
+	control	keycode  52 = Compose         
+	alt	keycode  51 = KP_Period      
+keycode	 53 = semicolon colon
+	alt	keycode  52 = KP_Add     
+keycode  54 = Shift 
+keycode  55 = apostrophe
+keycode  56 = Alt      
+keycode  57 = space            space           
+	alt	keycode  57 = Meta_space      
+keycode  58 = F9              
+	shift	keycode  58 = F19             
+	altgr	keycode  58 = Console_21      
+	alt	keycode  58 = Console_9       
+	control	alt	keycode  58 = Console_9       
+keycode  59 = F1              
+	altgr	keycode  59 = Console_13      
+	alt	keycode  59 = Console_1       
+	control	alt	keycode  59 = Console_1 
+keycode  60 = F2              
+	shift	keycode  60 = F12             
+	altgr	keycode  60 = Console_14      
+	alt	keycode  60 = Console_2       
+	control	alt	keycode  60 = Console_2       
+keycode  61 = F3              
+	shift	keycode  61 = F13             
+	altgr	keycode  61 = Console_15      
+	alt	keycode  61 = Console_3       
+	control	alt	keycode  61 = Console_3       
+keycode  62 = F4              
+	shift	keycode  62 = F14             
+	altgr	keycode  62 = Console_16      
+	alt	keycode  62 = Console_4       
+	control	alt	keycode  62 = Console_4       
+keycode  63 = F5              
+	shift	keycode  63 = F15             
+	altgr	keycode  63 = Console_17      
+	alt	keycode  63 = Console_5       
+	control	alt	keycode  63 = Console_5       
+keycode  64 = F6              
+	shift	keycode  64 = F16             
+	altgr	keycode  64 = Console_18      
+	alt	keycode  64 = Console_6       
+	control	alt	keycode  64 = Console_6       
+keycode  65 = F7              
+	shift	keycode  65 = F17             
+	altgr	keycode  65 = Console_19      
+	alt	keycode  65 = Console_7       
+	control	alt	keycode  65 = Console_7       
+keycode  66 = F8              
+	shift	keycode  66 = F18             
+	altgr	keycode  66 = Console_20      
+	alt	keycode  66 = Console_8       
+	control	alt	keycode  66 = Console_8       
+keycode  72 = Up
+	shift	keycode  72 = Scroll_Backward           
+	altgr	keycode  72 = Scroll_Backward           
+	alt	keycode  72 = Prior 
+keycode  74 = Control         
+	altgr	keycode  74 = Num_Lock
+keycode  75 = Left
+	altgr	keycode  75 = Decr_Console
+	alt	keycode  75 = Find      
+keycode  77 = Right
+	altgr	keycode  77 = Incr_Console
+	alt	keycode  77 = Select         
+keycode  80 = Down
+	shift	keycode  80 = Scroll_Forward
+	altgr	keycode  80 = Scroll_Forward
+	alt	keycode  80 = Next         
+keycode  83 = Remove	Remove		Meta_Delete
+	alt	keycode  83 = Meta_Delete            
+keycode 112 = F10             
+	shift	keycode 112 = F20             
+	altgr	keycode 112 = Console_22      
+	alt	keycode 112 = Console_10      
+	control	alt	keycode 112 = Console_10      
+keycode 115 = AltGr        
+keycode 123 = comma quotedbl 
+keycode 0 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff --git a/packages/keymaps/files/jornada6xx/keymap-de.map b/packages/keymaps/files/jornada6xx/keymap-de.map
index 98083d2e58..4f6f53a74c 100644
--- a/packages/keymaps/files/jornada6xx/keymap-de.map
+++ b/packages/keymaps/files/jornada6xx/keymap-de.map
@@ -148,9 +148,9 @@ keycode  27 = plus             asterisk         asciitilde
 keycode  28 = Return          
 	shift	altgr	keycode  28 = VoidSymbol      
 	alt	keycode  28 = Meta_Control_m  
-keycode  29 = Control        
-	shift	keycode  29 = Compose         
-	shift	altgr	keycode  29 = VoidSymbol      
+keycode  29 = F11		F23      
+	control	keycode  29 = Control_asciicircum
+	control	alt	keycode  29 = Meta_Control_asciicircum    
 keycode  30 = +a              
 	shift	keycode  30 = +A              
 	shift	altgr	keycode  30 = VoidSymbol      
@@ -243,9 +243,6 @@ keycode  38 = +l
 	control	alt	keycode  38 = Meta_Control_l  
 keycode  39 = +odiaeresis      +Odiaeresis     
 keycode  40 = +adiaeresis      +Adiaeresis     
-keycode  41 = F11		F23      
-	control	keycode  41 = Control_asciicircum
-	control	alt	keycode  41 = Meta_Control_asciicircum
 keycode  42 = Shift		Shift		Caps_Lock           
 	shift	altgr	keycode  42 = VoidSymbol      
 	control	keycode  42 = Compose         
@@ -373,6 +370,9 @@ keycode  66 = F8               F20              Console_20
 keycode  72 = Up
 	alt	keycode  72 = Prior           
 	shift	alt	keycode  72 = Scroll_Backward      
+keycode  74 = Control        
+	shift	keycode  74 = Compose         
+	shift	altgr	keycode  74 = VoidSymbol      
 keycode  75 = KP_4            
 	altgr	keycode  75 = Hex_4           
 	shift	altgr	keycode  75 = VoidSymbol      
diff --git a/packages/keymaps/files/jornada6xx/keymap-sp.map b/packages/keymaps/files/jornada6xx/keymap-sp.map
index ba05387743..2e5d7388f0 100644
--- a/packages/keymaps/files/jornada6xx/keymap-sp.map
+++ b/packages/keymaps/files/jornada6xx/keymap-sp.map
@@ -60,8 +60,10 @@ keycode  26 = dead_acute
         shift   keycode  26 = dead_diaeresis
 keycode  27 = plus             asterisk         asciitilde      
 keycode  28 = Return          
-keycode  29 = Control
-         AltGr keycode 29 = Num_Lock
+keycode  29 = F11
+         alt    keycode 29 = Console_11      
+         shift  keycode 29 = F12      
+         shift alt    keycode 29 = Console_12      
 keycode  30 = +a              
 	shift	keycode  30 = +A              
 keycode  31 = +s              
@@ -85,10 +87,6 @@ keycode  39 = +0244
 keycode  40 = braceleft          
          shift keycode 40 = bracketleft
          AltGr keycode 40 = dead_circumflex         
-keycode  41 = F11
-         alt    keycode 41 = Console_11      
-         shift  keycode 41 = F12      
-         shift alt    keycode 41 = Console_12      
 keycode  42 = Shift         
          AltGr keycode 42 = Caps_Lock         
 keycode  43 = braceright      
@@ -135,6 +133,8 @@ keycode  66 = F8
 keycode  72 = Up
          alt    keycode 72 = PageUp
          shift alt    keycode 72 = Scroll_Backward
+keycode  74 = Control
+         AltGr keycode 74 = Num_Lock
 keycode  75 = Left            
          alt    keycode  75 = Home           
 keycode  77 = Right            
diff --git a/packages/keymaps/files/jornada6xx/keymap-uk.map b/packages/keymaps/files/jornada6xx/keymap-uk.map
index a7bb082464..6bb959801c 100644
--- a/packages/keymaps/files/jornada6xx/keymap-uk.map
+++ b/packages/keymaps/files/jornada6xx/keymap-uk.map
@@ -65,8 +65,11 @@ keycode  26 = backslash	bar
 		AltGr keycode 26 = braceright 
 keycode  28 = Return          
 	alt	keycode  28 = Meta_Control_m  
-keycode  29 = Control         
-	altgr	keycode  29 = Num_Lock
+keycode  29 = F11             
+	shift	keycode  29 = F21
+	altgr	keycode  29 = Console_23      
+	alt	keycode  29 = Console_11      
+	control	alt	keycode  29 = Console_11      
 keycode  30 = a
 keycode  31 = s               
 keycode  32 = d
@@ -84,12 +87,7 @@ keycode  39 = semicolon        colon           bracketleft
 	alt	keycode  39 = Meta_semicolon
 keycode  40 = apostrophe       quotedbl        bracketright
 	control	keycode  40 = Control_g       
-	alt	keycode  40 = Meta_apostrophe
-keycode  41 = F11             
-	shift	keycode  41 = F21
-	altgr	keycode  41 = Console_23      
-	alt	keycode  41 = Console_11      
-	control	alt	keycode  41 = Console_11      
+	alt	keycode  40 = Meta_apostrophe 
 keycode  42 = Shift           
 	altgr	keycode  42 = Caps_Lock
 keycode  44 = z               
@@ -158,6 +156,8 @@ keycode  72 = Up
 	shift	keycode  72 = Scroll_Backward           
 	altgr	keycode  72 = Scroll_Backward           
 	alt	keycode  72 = Prior 
+keycode  74 = Control         
+	altgr	keycode  74 = Num_Lock
 keycode  75 = Left
 	altgr	keycode  75 = Decr_Console
 	alt	keycode  75 = Find      
@@ -179,12 +179,12 @@ keycode 115 = slash	question
 	control	keycode  115 = Delete          
 	alt	keycode  115 = Meta_slash      
 keycode 123 = AltGr
-keycode 219 = Insert
-string F1 = "\033[11~"
-string F2 = "\033[12~"
-string F3 = "\033[13~"
-string F4 = "\033[14~"
-string F5 = "\033[15~"
+keycode 0 = Insert
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
 string F6 = "\033[17~"
 string F7 = "\033[18~"
 string F8 = "\033[19~"