[bknr-cvs] hans changed trunk/projects/symbolics-keyboard/

[BKNR Commits]

Revision: 4356
Author: hans
URL: http://bknr.net/trac/changeset/4356

fix f-mode map generation
U   trunk/projects/symbolics-keyboard/make-keymap.lisp
U   trunk/projects/symbolics-keyboard/teensy-firmware/keymap.inc

Modified: trunk/projects/symbolics-keyboard/make-keymap.lisp
===================================================================
--- trunk/projects/symbolics-keyboard/make-keymap.lisp	2009-04-06 06:07:30 UTC (rev 4355)
+++ trunk/projects/symbolics-keyboard/make-keymap.lisp	2009-04-06 06:17:07 UTC (rev 4356)
@@ -572,12 +572,13 @@
              (usb-keycode (map-symbolics->usb symbolics-keyname))
              (f-mode-usb-keycode (map-symbolics->usb symbolics-keyname t)))
         (cond
-          (usb-keycode
-           (setf unmapped-usb-keys (remove usb-keycode unmapped-usb-keys :key #'cadr :test #'equal))
-           (define-key/usb symbolics-scancode usb-keycode normal-map))
-          (f-mode-usb-keycode
-           (setf unmapped-usb-keys (remove f-mode-usb-keycode unmapped-usb-keys :key #'cadr :test #'equal))
-           (define-key/usb symbolics-scancode f-mode-usb-keycode f-mode-map))
+          ((or usb-keycode f-mode-usb-keycode)
+           (when usb-keycode
+             (setf unmapped-usb-keys (remove usb-keycode unmapped-usb-keys :key #'cadr :test #'equal))
+             (define-key/usb symbolics-scancode usb-keycode normal-map))
+           (when f-mode-usb-keycode
+             (setf unmapped-usb-keys (remove f-mode-usb-keycode unmapped-usb-keys :key #'cadr :test #'equal))
+             (define-key/usb symbolics-scancode f-mode-usb-keycode f-mode-map)))
           (t
            (push symbolics-keyname unmapped-symbolics-keys)))))
     (with-open-file (*standard-output* filename :direction :output :if-exists :supersede)

Modified: trunk/projects/symbolics-keyboard/teensy-firmware/keymap.inc
===================================================================
--- trunk/projects/symbolics-keyboard/teensy-firmware/keymap.inc	2009-04-06 06:07:30 UTC (rev 4355)
+++ trunk/projects/symbolics-keyboard/teensy-firmware/keymap.inc	2009-04-06 06:17:07 UTC (rev 4356)
@@ -130,37 +130,124 @@
 };
 const uint8_t keymap_f[128] PROGMEM = {
     0,
+    0x80 | NUM_KEY_LEFT_GUI,
+    KEY_CAPS_LOCK,
+    KEY_F8,
+    0x80 | NUM_KEY_LEFT_ALT,
+    0x80 | NUM_KEY_RIGHT_CTRL,
+    KEY_DOWN,
+    KEY_PAGE_DOWN,
     0,
     0,
     0,
     0,
+    KEY_F1,
+    KEYPAD_8,
+    KEY_F7,
+    0x80 | NUM_KEY_LEFT_CTRL,
+    KEY_SPACE,
+    KEY_LEFT,
+    KEY_RIGHT,
+    KEY_END,
     0,
     0,
     0,
+    KEY_Z,
+    KEY_C,
+    KEY_B,
+    KEY_M,
+    KEY_PERIOD,
+    0x80 | NUM_KEY_RIGHT_SHIFT,
+    KEY_PAGE_UP,
+    KEY_F6,
     0,
     0,
     0,
+    0x80 | NUM_KEY_LEFT_SHIFT,
+    KEY_X,
+    KEY_V,
+    KEY_N,
+    KEY_COMMA,
+    KEY_SLASH,
+    KEY_UP,
+    KEY_F12,
     0,
     0,
     0,
+    KEY_DELETE,
+    KEY_S,
+    KEY_F,
+    KEY_H,
+    KEY_K,
+    KEY_SEMICOLON,
+    KEY_ENTER,
+    KEY_HOME,
     0,
     0,
     0,
+    KEY_F2,
+    KEY_A,
+    KEY_D,
+    KEY_G,
+    KEY_J,
+    KEY_L,
+    KEY_QUOTE,
+    KEYPAD_7,
     0,
     0,
     0,
+    KEY_F3,
+    KEY_W,
+    KEY_R,
+    KEY_Y,
+    KEY_I,
+    KEY_P,
+    KEY_RIGHT_BRACE,
+    KEYPAD_6,
     0,
     0,
     0,
+    KEY_TAB,
+    KEY_Q,
+    KEY_E,
+    KEY_T,
+    KEY_U,
+    KEY_O,
+    KEY_LEFT_BRACE,
+    KEY_BACKSPACE,
     0,
     0,
     0,
+    KEYPAD_ASTERIX,
+    KEY_2,
+    KEY_4,
+    KEY_6,
+    KEY_8,
+    KEY_0,
+    KEY_EQUAL,
+    KEY_BACKSLASH,
     0,
     0,
     0,
+    KEY_1,
+    KEY_3,
+    KEY_5,
+    KEY_7,
+    KEY_9,
+    KEY_MINUS,
+    KEY_TILDE,
+    KEYPAD_MINUS,
     0,
     0,
     0,
+    KEY_ESC,
+    KEYPAD_0,
+    KEYPAD_4,
+    KEYPAD_3,
+    KEYPAD_2,
+    KEY_F10,
+    KEY_F4,
+    KEY_F5,
     0,
     0,
     0,
@@ -169,92 +256,5 @@
     0,
     0,
     0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
     0
 };