]> git.donarmstrong.com Git - kiibohd-controller.git/commitdiff
MBC-55x support virtually complete.
authorJacob Alexander <triplehaata@gmail.com>
Fri, 1 Feb 2013 21:49:32 +0000 (16:49 -0500)
committerJacob Alexander <triplehaata@gmail.com>
Fri, 1 Feb 2013 21:49:32 +0000 (16:49 -0500)
- I won't do any more, as I can't make the converter fully functional on a modern computer
- Basic typing support is working
- Some of the function modes move around the ASCII values, and this takes a while to decipher and figure out the pattern; it's not hard to do, and I don't really feel like doing it
- The hard part is already done :P

Keymap/keymap.h
Keymap/mbc55x.h [new file with mode: 0644]
Scan/MBC-55X/scan_loop.c
Scan/MBC-55X/setup.cmake

index dc7497ec8a20391f469151829d20f8111ec3ce0a..4f12803c5968dd616aaf3f517b49e0b04ec938c1 100644 (file)
@@ -49,6 +49,7 @@
 #include "hp150.h"
 #include "ibmconvertible.h"
 #include "kaypro1.h"
+#include "mbc55x.h"
 #include "microswitch8304.h"
 #include "skm67001.h"
 #include "sonynews.h"
diff --git a/Keymap/mbc55x.h b/Keymap/mbc55x.h
new file mode 100644 (file)
index 0000000..4f0f7b1
--- /dev/null
@@ -0,0 +1,553 @@
+/* Copyright (C) 2013 by Jacob Alexander
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __MBC55X_H
+#define __MBC55X_H
+
+// This file contains various key layouts for the Sanyo MBC-55X Computer Keyboard
+
+
+// ----- Variables -----
+
+static uint8_t mbc55x_ModifierMask[] = { 0xF5, 0xF6 };
+
+static uint8_t mbc55x_DefaultMap[] = { 
+                               0, // 0x00
+                               0, // 0x01
+                               0, // 0x02
+                               0, // 0x03
+                               0, // 0x04
+                               0, // 0x05
+                               0, // 0x06
+                               0, // 0x07
+                               KEY_BACKSPACE, // 0x08
+                               KEY_TAB, // 0x09
+                               0, // 0x0A
+                               0, // 0x0B
+                               0, // 0x0C
+                               KEY_ENTER, // 0x0D
+                               0, // 0x0E
+                               0, // 0x0F
+                               0, // 0x10
+                               0, // 0x11
+                               0, // 0x12
+                               0, // 0x13
+                               0, // 0x14
+                               0, // 0x15
+                               0, // 0x16
+                               0, // 0x17
+                               0, // 0x18
+                               0, // 0x19
+                               0, // 0x1A
+                               KEY_ESC, // 0x1B
+                               0, // 0x1C
+                               0, // 0x1D
+                               0, // 0x1E
+                               0, // 0x1F
+                               KEY_SPACE, // 0x20
+                               0, // 0x21
+                               0, // 0x22
+                               0, // 0x23
+                               0, // 0x24
+                               0, // 0x25
+                               0, // 0x26
+                               KEY_QUOTE, // 0x27
+                               0, // 0x28
+                               0, // 0x29
+                               0, // 0x2A
+                               0, // 0x2B
+                               KEY_COMMA, // 0x2C
+                               KEY_MINUS, // 0x2D
+                               KEY_PERIOD, // 0x2E
+                               KEY_SLASH, // 0x2F
+                               KEY_0, // 0x30
+                               KEY_1, // 0x31
+                               KEY_2, // 0x32
+                               KEY_3, // 0x33
+                               KEY_4, // 0x34
+                               KEY_5, // 0x35
+                               KEY_6, // 0x36
+                               KEY_7, // 0x37
+                               KEY_8, // 0x38
+                               KEY_9, // 0x39
+                               0, // 0x3A
+                               KEY_SEMICOLON, // 0x3B
+                               0, // 0x3C
+                               KEY_EQUAL, // 0x3D
+                               0, // 0x3E
+                               0, // 0x3F
+                               0, // 0x40
+                               0, // 0x41
+                               0, // 0x42
+                               0, // 0x43
+                               0, // 0x44
+                               0, // 0x45
+                               0, // 0x46
+                               0, // 0x47
+                               0, // 0x48
+                               0, // 0x49
+                               0, // 0x4A
+                               0, // 0x4B
+                               0, // 0x4C
+                               0, // 0x4D
+                               0, // 0x4E
+                               0, // 0x4F
+                               0, // 0x50
+                               0, // 0x51
+                               0, // 0x52
+                               0, // 0x53
+                               0, // 0x54
+                               0, // 0x55
+                               0, // 0x56
+                               0, // 0x57
+                               0, // 0x58
+                               0, // 0x59
+                               0, // 0x5A
+                               KEY_LEFT_BRACE, // 0x5B
+                               KEY_BACKSLASH, // 0x5C
+                               KEY_RIGHT_BRACE, // 0x5D
+                               0, // 0x5E
+                               0, // 0x5F
+                               KEY_TILDE, // 0x60
+                               KEY_A, // 0x61
+                               KEY_B, // 0x62
+                               KEY_C, // 0x63
+                               KEY_D, // 0x64
+                               KEY_E, // 0x65
+                               KEY_F, // 0x66
+                               KEY_G, // 0x67
+                               KEY_H, // 0x68
+                               KEY_I, // 0x69
+                               KEY_J, // 0x6A
+                               KEY_K, // 0x6B
+                               KEY_L, // 0x6C
+                               KEY_M, // 0x6D
+                               KEY_N, // 0x6E
+                               KEY_O, // 0x6F
+                               KEY_P, // 0x70
+                               KEY_Q, // 0x71
+                               KEY_R, // 0x72
+                               KEY_S, // 0x73
+                               KEY_T, // 0x74
+                               KEY_U, // 0x75
+                               KEY_V, // 0x76
+                               KEY_W, // 0x77
+                               KEY_X, // 0x78
+                               KEY_Y, // 0x79
+                               KEY_Z, // 0x7A
+                               0, // 0x7B
+                               0, // 0x7C
+                               0, // 0x7D
+                               0, // 0x7E
+                               KEY_DELETE, // 0x7F
+                               0, // 0x80
+                               0, // 0x81
+                               0, // 0x82
+                               0, // 0x83
+                               0, // 0x84
+                               0, // 0x85
+                               0, // 0x86
+                               0, // 0x87
+                               0, // 0x88
+                               0, // 0x89
+                               0, // 0x8A
+                               0, // 0x8B
+                               0, // 0x8C
+                               0, // 0x8D
+                               0, // 0x8E
+                               0, // 0x8F
+                               0, // 0x90
+                               0, // 0x91
+                               0, // 0x92
+                               0, // 0x93
+                               0, // 0x94
+                               0, // 0x95
+                               0, // 0x96
+                               0, // 0x97
+                               0, // 0x98
+                               0, // 0x99
+                               0, // 0x9A
+                               0, // 0x9B
+                               0, // 0x9C
+                               0, // 0x9D
+                               0, // 0x9E
+                               0, // 0x9F
+                               0, // 0xA0
+                               0, // 0xA1
+                               0, // 0xA2
+                               0, // 0xA3
+                               0, // 0xA4
+                               0, // 0xA5
+                               0, // 0xA6
+                               0, // 0xA7
+                               0, // 0xA8
+                               0, // 0xA9
+                               0, // 0xAA
+                               0, // 0xAB
+                               0, // 0xAC
+                               0, // 0xAD
+                               0, // 0xAE
+                               0, // 0xAF
+                               0, // 0xB0
+                               KEYPAD_0, // 0xB1
+                               KEYPAD_PERIOD, // 0xB2
+                               0, // 0xB3
+                               0, // 0xB4
+                               0, // 0xB5
+                               0, // 0xB6
+                               0, // 0xB7
+                               0, // 0xB8
+                               0, // 0xB9
+                               0, // 0xBA
+                               0, // 0xBB
+                               0, // 0xBC
+                               0, // 0xBD
+                               0, // 0xBE
+                               0, // 0xBF
+                               KEYPAD_1, // 0xC0
+                               KEYPAD_2, // 0xC1
+                               KEYPAD_3, // 0xC2
+                               KEYPAD_ENTER, // 0xC3
+                               0, // 0xC4
+                               0, // 0xC5
+                               0, // 0xC6
+                               0, // 0xC7
+                               0, // 0xC8
+                               0, // 0xC9
+                               0, // 0xCA
+                               0, // 0xCB
+                               0, // 0xCC
+                               0, // 0xCD
+                               0, // 0xCE
+                               0, // 0xCF
+                               KEYPAD_4, // 0xD0
+                               KEYPAD_5, // 0xD1
+                               KEYPAD_6, // 0xD2
+                               KEYPAD_COMMA, // 0xD3
+                               0, // 0xD4
+                               0, // 0xD5
+                               0, // 0xD6
+                               0, // 0xD7
+                               0, // 0xD8
+                               0, // 0xD9
+                               0, // 0xDA
+                               0, // 0xDB
+                               0, // 0xDC
+                               0, // 0xDD
+                               0, // 0xDE
+                               0, // 0xDF
+                               0, // 0xE0
+                               KEYPAD_7, // 0xE1
+                               KEYPAD_8, // 0xE2
+                               KEYPAD_9, // 0xE3
+                               KEYPAD_MINUS, // 0xE4
+                               0, // 0xE5
+                               0, // 0xE6
+                               0, // 0xE7
+                               0, // 0xE8
+                               0, // 0xE9
+                               0, // 0xEA
+                               0, // 0xEB
+                               0, // 0xEC
+                               0, // 0xED
+                               0, // 0xEE
+                               0, // 0xEF
+                               0, // 0xF0
+                               KEY_UP, // 0xF1
+                               KEY_DOWN, // 0xF2
+                               KEY_LEFT, // 0xF3
+                               KEY_RIGHT, // 0xF4
+                               KEY_LEFT_SHIFT, // 0xF5
+                               KEY_CTRL, // 0xF6
+                               0, // 0xF7
+                               0, // 0xF8
+                               0, // 0xF9
+                               0, // 0xFA
+                               0, // 0xFB
+                               0, // 0xFC
+                               0, // 0xFD
+                               0, // 0xFE
+                               0, // 0xFF
+};
+
+static uint8_t mbc55x_ColemakMap[] = {
+                               0, // 0x00
+                               0, // 0x01
+                               0, // 0x02
+                               0, // 0x03
+                               0, // 0x04
+                               0, // 0x05
+                               0, // 0x06
+                               0, // 0x07
+                               KEY_BACKSPACE, // 0x08
+                               KEY_TAB, // 0x09
+                               0, // 0x0A
+                               0, // 0x0B
+                               0, // 0x0C
+                               KEY_ENTER, // 0x0D
+                               0, // 0x0E
+                               0, // 0x0F
+                               0, // 0x10
+                               0, // 0x11
+                               0, // 0x12
+                               0, // 0x13
+                               0, // 0x14
+                               0, // 0x15
+                               0, // 0x16
+                               0, // 0x17
+                               0, // 0x18
+                               0, // 0x19
+                               0, // 0x1A
+                               KEY_ESC, // 0x1B
+                               0, // 0x1C
+                               0, // 0x1D
+                               0, // 0x1E
+                               0, // 0x1F
+                               KEY_SPACE, // 0x20
+                               0, // 0x21
+                               0, // 0x22
+                               0, // 0x23
+                               0, // 0x24
+                               0, // 0x25
+                               0, // 0x26
+                               KEY_QUOTE, // 0x27
+                               0, // 0x28
+                               0, // 0x29
+                               0, // 0x2A
+                               0, // 0x2B
+                               KEY_COMMA, // 0x2C
+                               KEY_MINUS, // 0x2D
+                               KEY_PERIOD, // 0x2E
+                               KEY_SLASH, // 0x2F
+                               KEY_0, // 0x30
+                               KEY_1, // 0x31
+                               KEY_2, // 0x32
+                               KEY_3, // 0x33
+                               KEY_4, // 0x34
+                               KEY_5, // 0x35
+                               KEY_6, // 0x36
+                               KEY_7, // 0x37
+                               KEY_8, // 0x38
+                               KEY_9, // 0x39
+                               0, // 0x3A
+                               KEY_O, // 0x3B
+                               0, // 0x3C
+                               KEY_EQUAL, // 0x3D
+                               0, // 0x3E
+                               0, // 0x3F
+                               0, // 0x40
+                               0, // 0x41
+                               0, // 0x42
+                               0, // 0x43
+                               0, // 0x44
+                               0, // 0x45
+                               0, // 0x46
+                               0, // 0x47
+                               0, // 0x48
+                               0, // 0x49
+                               0, // 0x4A
+                               0, // 0x4B
+                               0, // 0x4C
+                               0, // 0x4D
+                               0, // 0x4E
+                               0, // 0x4F
+                               0, // 0x50
+                               0, // 0x51
+                               0, // 0x52
+                               0, // 0x53
+                               0, // 0x54
+                               0, // 0x55
+                               0, // 0x56
+                               0, // 0x57
+                               0, // 0x58
+                               0, // 0x59
+                               0, // 0x5A
+                               KEY_LEFT_BRACE, // 0x5B
+                               KEY_BACKSLASH, // 0x5C
+                               KEY_RIGHT_BRACE, // 0x5D
+                               0, // 0x5E
+                               0, // 0x5F
+                               KEY_TILDE, // 0x60
+                               KEY_A, // 0x61
+                               KEY_B, // 0x62
+                               KEY_C, // 0x63
+                               KEY_S, // 0x64
+                               KEY_F, // 0x65
+                               KEY_T, // 0x66
+                               KEY_D, // 0x67
+                               KEY_H, // 0x68
+                               KEY_U, // 0x69
+                               KEY_N, // 0x6A
+                               KEY_E, // 0x6B
+                               KEY_I, // 0x6C
+                               KEY_M, // 0x6D
+                               KEY_K, // 0x6E
+                               KEY_Y, // 0x6F
+                               KEY_SEMICOLON, // 0x70
+                               KEY_Q, // 0x71
+                               KEY_P, // 0x72
+                               KEY_R, // 0x73
+                               KEY_G, // 0x74
+                               KEY_L, // 0x75
+                               KEY_V, // 0x76
+                               KEY_W, // 0x77
+                               KEY_X, // 0x78
+                               KEY_J, // 0x79
+                               KEY_Z, // 0x7A
+                               0, // 0x7B
+                               0, // 0x7C
+                               0, // 0x7D
+                               0, // 0x7E
+                               KEY_DELETE, // 0x7F
+                               0, // 0x80
+                               0, // 0x81
+                               0, // 0x82
+                               0, // 0x83
+                               0, // 0x84
+                               0, // 0x85
+                               0, // 0x86
+                               0, // 0x87
+                               0, // 0x88
+                               0, // 0x89
+                               0, // 0x8A
+                               0, // 0x8B
+                               0, // 0x8C
+                               0, // 0x8D
+                               0, // 0x8E
+                               0, // 0x8F
+                               0, // 0x90
+                               0, // 0x91
+                               0, // 0x92
+                               0, // 0x93
+                               0, // 0x94
+                               0, // 0x95
+                               0, // 0x96
+                               0, // 0x97
+                               0, // 0x98
+                               0, // 0x99
+                               0, // 0x9A
+                               0, // 0x9B
+                               0, // 0x9C
+                               0, // 0x9D
+                               0, // 0x9E
+                               0, // 0x9F
+                               0, // 0xA0
+                               0, // 0xA1
+                               0, // 0xA2
+                               0, // 0xA3
+                               0, // 0xA4
+                               0, // 0xA5
+                               0, // 0xA6
+                               0, // 0xA7
+                               0, // 0xA8
+                               0, // 0xA9
+                               0, // 0xAA
+                               0, // 0xAB
+                               0, // 0xAC
+                               0, // 0xAD
+                               0, // 0xAE
+                               0, // 0xAF
+                               0, // 0xB0
+                               KEYPAD_0, // 0xB1
+                               KEYPAD_PERIOD, // 0xB2
+                               0, // 0xB3
+                               0, // 0xB4
+                               0, // 0xB5
+                               0, // 0xB6
+                               0, // 0xB7
+                               0, // 0xB8
+                               0, // 0xB9
+                               0, // 0xBA
+                               0, // 0xBB
+                               0, // 0xBC
+                               0, // 0xBD
+                               0, // 0xBE
+                               0, // 0xBF
+                               KEYPAD_1, // 0xC0
+                               KEYPAD_2, // 0xC1
+                               KEYPAD_3, // 0xC2
+                               KEYPAD_ENTER, // 0xC3
+                               0, // 0xC4
+                               0, // 0xC5
+                               0, // 0xC6
+                               0, // 0xC7
+                               0, // 0xC8
+                               0, // 0xC9
+                               0, // 0xCA
+                               0, // 0xCB
+                               0, // 0xCC
+                               0, // 0xCD
+                               0, // 0xCE
+                               0, // 0xCF
+                               KEYPAD_4, // 0xD0
+                               KEYPAD_5, // 0xD1
+                               KEYPAD_6, // 0xD2
+                               KEYPAD_COMMA, // 0xD3
+                               0, // 0xD4
+                               0, // 0xD5
+                               0, // 0xD6
+                               0, // 0xD7
+                               0, // 0xD8
+                               0, // 0xD9
+                               0, // 0xDA
+                               0, // 0xDB
+                               0, // 0xDC
+                               0, // 0xDD
+                               0, // 0xDE
+                               0, // 0xDF
+                               0, // 0xE0
+                               KEYPAD_7, // 0xE1
+                               KEYPAD_8, // 0xE2
+                               KEYPAD_9, // 0xE3
+                               KEYPAD_MINUS, // 0xE4
+                               0, // 0xE5
+                               0, // 0xE6
+                               0, // 0xE7
+                               0, // 0xE8
+                               0, // 0xE9
+                               0, // 0xEA
+                               0, // 0xEB
+                               0, // 0xEC
+                               0, // 0xED
+                               0, // 0xEE
+                               0, // 0xEF
+                               0, // 0xF0
+                               KEY_UP, // 0xF1
+                               KEY_DOWN, // 0xF2
+                               KEY_LEFT, // 0xF3
+                               KEY_RIGHT, // 0xF4
+                               KEY_LEFT_SHIFT, // 0xF5
+                               KEY_CTRL, // 0xF6
+                               0, // 0xF7
+                               0, // 0xF8
+                               0, // 0xF9
+                               0, // 0xFA
+                               0, // 0xFB
+                               0, // 0xFC
+                               0, // 0xFD
+                               0, // 0xFE
+                               0, // 0xFF
+};
+
+
+
+#endif
+
index 79fbeb73b237186e4bcca0fdfe77edbde7256725..7853f13feb56fe9bb5345b54b9bce50d81130df1 100644 (file)
@@ -72,25 +72,26 @@ void uart0_status_isr(void)
        cli(); // Disable Interrupts
 
        // Variable for UART data read
-       uint8_t tmp = 0x00;
+       uint8_t keyValue = 0x00;
 
 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
-       tmp = UDR1;
+       keyValue = UDR1;
 #elif defined(_mk20dx128_) // ARM
        // UART0_S1 must be read for the interrupt to be cleared
        if ( UART0_S1 & UART_S1_RDRF )
        {
                // Only doing single byte FIFO here
-               tmp = UART0_D;
+               keyValue = UART0_D;
        }
 #endif
 
        // Debug
        char tmpStr[6];
-       hexToStr( tmp, tmpStr );
+       hexToStr( keyValue, tmpStr );
        dPrintStrs( tmpStr, " " ); // Debug
 
-       // TODO
+       // Decipher scan value
+       processKeyValue( keyValue );
 
        sei(); // Re-enable Interrupts
 }
@@ -113,14 +114,12 @@ inline void scan_setup()
        UBRR1H = (uint8_t)(baud >> 8);
        UBRR1L = (uint8_t)baud;
 
-       // Enable the receiver, transmitter, and RX Complete Interrupt
-       // TODO - Only receiver, and rx interrupt
-       UCSR1B = 0x98;
+       // Enable the receiver, and RX Complete Interrupt
+       UCSR1B = 0x90;
 
-       // Set frame format: 8 data, 1 stop bit, odd parity
+       // Set frame format: 8 data, 1 stop bit, even parity
        // Asynchrounous USART mode
-       // TODO - Even parity
-       UCSR1C = 0x36;
+       UCSR1C = 0x26;
 
        // Reset the keyboard before scanning, we might be in a wierd state
        scan_resetKeyboard();
@@ -172,7 +171,7 @@ inline void scan_setup()
 
        // TX Disabled, RX Enabled, RX Interrupt Enabled
        // UART_C2_TE UART_C2_RE UART_C2_RIE
-       UART0_C2 = UART_C2_TE | UART_C2_RE | UART_C2_RIE;
+       UART0_C2 = UART_C2_RE | UART_C2_RIE;
 
        // Add interrupt to the vector table
        NVIC_ENABLE_IRQ( IRQ_UART0_STATUS );
@@ -186,60 +185,147 @@ inline void scan_setup()
 // Main Detection Loop
 inline uint8_t scan_loop()
 {
-       UART0_D = 0x56;
-       _delay_ms( 10 );
-       UART0_D = 0x1C;
-       _delay_ms( 100 );
        return 0;
 }
 
 void processKeyValue( uint8_t keyValue )
 {
-       // TODO Process ASCII
-
-       // Make sure the key isn't already in the buffer
-       for ( uint8_t c = 0; c < KeyIndex_BufferUsed + 1; c++ )
+       // XXX NOTE: The key processing is not complete for this keyboard
+       //           Mostly due to laziness, and that the keyboard can't really be useful on a modern computer
+       //           Basic typing will work, but some of the keys and the Graph mode changes things around
+
+       // Add key(s) to processing buffer
+       // First split out Shift and Ctrl
+       //  Reserved Codes:
+       //   Shift - 0xF5
+       //   Ctrl  - 0xF6
+       switch ( keyValue )
        {
-               // Key isn't in the buffer yet
-               if ( c == KeyIndex_BufferUsed )
+       // - Ctrl Keys -
+       // Exception keys
+       case 0x08: // ^H
+       case 0x09: // ^I
+       case 0x0D: // ^M
+       case 0x1B: // ^[
+               bufferAdd( keyValue );
+               break;
+       // 0x40 Offset Keys
+       // Add Ctrl key and offset to the lower alphabet
+       case 0x00: // ^@
+       case 0x1C: // "^\"
+       case 0x1D: // ^]
+       case 0x1E: // ^^
+       case 0x1F: // ^_
+               bufferAdd( 0xF6 );
+               bufferAdd( keyValue + 0x40 );
+               break;
+
+       // - Add Shift key and offset to non-shifted key -
+       // 0x10 Offset Keys
+       case 0x21: // !
+       case 0x23: // #
+       case 0x24: // $
+       case 0x25: // %
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue + 0x10 );
+               break;
+       // 0x11 Offset Keys
+       case 0x26: // &
+       case 0x28: // (
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue + 0x11 );
+               break;
+       // 0x07 Offset Keys
+       case 0x29: // )
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue + 0x07 );
+               break;
+       // -0x0E Offset Keys
+       case 0x40: // @
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue - 0x0E );
+               break;
+       // 0x0E Offset Keys
+       case 0x2A: // *
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue + 0x0E );
+               break;
+       // 0x12 Offset Keys
+       case 0x2B: // +
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue + 0x12 );
+               break;
+       // 0x05 Offset Keys
+       case 0x22: // "
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue + 0x05 );
+               break;
+       // 0x01 Offset Keys
+       case 0x3A: // :
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue + 0x01 );
+               break;
+       // -0x10 Offset Keys
+       case 0x3C: // <
+       case 0x3E: // >
+       case 0x3F: // ?
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue - 0x10 );
+               break;
+       // -0x28 Offset Keys
+       case 0x5E: // ^
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue - 0x28 );
+               break;
+       // -0x32 Offset Keys
+       case 0x5F: // _
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue - 0x32 );
+               break;
+       // -0x20 Offset Keys
+       case 0x7B: // {
+       case 0x7C: // |
+       case 0x7D: // }
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue - 0x20 );
+               break;
+       // -0x1E Offset Keys
+       case 0x7E: // ~
+               bufferAdd( 0xF5 );
+               bufferAdd( keyValue - 0x1E );
+               break;
+       // All other keys
+       default:
+               // Ctrl Characters are from 0x00 to 0x1F, excluding:
+               //  0x08 - Backspace
+               //  0x09 - [Horizontal] Tab
+               //  0x0D - [Carriage] Return
+               //  0x1B - Escape
+               //  0x7F - Delete (^?) (Doesn't need to be split out)
+
+               // 0x60 Offset Keys
+               // Add Ctrl key and offset to the lower alphabet
+               if ( keyValue >= 0x00 && keyValue <= 0x1F )
                {
-                       bufferAdd( keyValue );
-                       break;
+                       bufferAdd( 0xF6 );
+                       bufferAdd( keyValue + 0x60 );
                }
 
-               // Key already in the buffer
-               if ( KeyIndex_Buffer[c] == keyValue )
-                       break;
-       }
-}
-
-void removeKeyValue( uint8_t keyValue )
-{
-       // Check for the released key, and shift the other keys lower on the buffer
-       uint8_t c;
-       for ( c = 0; c < KeyIndex_BufferUsed; c++ )
-       {
-               // Key to release found
-               if ( KeyIndex_Buffer[c] == keyValue )
+               // Shift Characters are from 0x41 to 0x59
+               //  No exceptions here :D
+               // Add Shift key and offset to the lower alphabet
+               else if ( keyValue >= 0x41 && keyValue <= 0x5A )
                {
-                       // Shift keys from c position
-                       for ( uint8_t k = c; k < KeyIndex_BufferUsed - 1; k++ )
-                               KeyIndex_Buffer[k] = KeyIndex_Buffer[k + 1];
-
-                       // Decrement Buffer
-                       KeyIndex_BufferUsed--;
-
-                       break;
+                       bufferAdd( 0xF5 );
+                       bufferAdd( keyValue + 0x20 );
                }
-       }
 
-       // Error case (no key to release)
-       if ( c == KeyIndex_BufferUsed + 1 )
-       {
-               errorLED( 1 );
-               char tmpStr[6];
-               hexToStr( keyValue, tmpStr );
-               erro_dPrint( "Could not find key to release: ", tmpStr );
+               // Everything else
+               else
+               {
+                       bufferAdd( keyValue );
+               }
+               break;
        }
 }
 
@@ -269,15 +355,21 @@ void scan_finishedWithBuffer( uint8_t sentKeys )
 // Signal that the keys have been properly sent over USB
 void scan_finishedWithUSBBuffer( uint8_t sentKeys )
 {
+       cli(); // Disable Interrupts
+
+       // Reset the buffer counter
+       KeyIndex_BufferUsed = 0;
+
+       sei(); // Re-enable Interrupts
 }
 
 // Reset/Hold keyboard
-// NOTE: Does nothing with the FACOM6684
+// NOTE: Does nothing with the MBC-55x
 void scan_lockKeyboard( void )
 {
 }
 
-// NOTE: Does nothing with the FACOM6684
+// NOTE: Does nothing with the MBC-55x
 void scan_unlockKeyboard( void )
 {
 }
index 32f484e5b682ebfcb102174243dbd8938534aa35..1f93b0606af862c0e89612b5efbf64442e50a82e 100644 (file)
@@ -41,9 +41,9 @@ add_definitions( -I${HEAD_DIR}/Keymap )
 
 #| Keymap Settings
 add_definitions(
-       -DMODIFIER_MASK=facom6684_ModifierMask
-       #-DKEYINDEX_MASK=facom6684_ColemakMap
-       -DKEYINDEX_MASK=facom6684_DefaultMap
+       -DMODIFIER_MASK=mbc55x_ModifierMask
+       #-DKEYINDEX_MASK=mbc55x_ColemakMap
+       -DKEYINDEX_MASK=mbc55x_DefaultMap
 )