summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--converter/ibm4704_usb/README.md1
-rw-r--r--converter/ibm4704_usb/config.h6
-rw-r--r--converter/ibm4704_usb/ibm4704.txt11
-rw-r--r--converter/ibm4704_usb/matrix.c30
-rw-r--r--converter/ps2_usb/Makefile4
-rw-r--r--converter/ps2_usb/README.md2
-rw-r--r--converter/ps2_usb/config.h6
-rw-r--r--tmk_core/common/action.h1
-rw-r--r--tmk_core/common/avr/suspend.c2
-rw-r--r--tmk_core/common/keyboard.c6
-rw-r--r--tmk_core/common/keyboard.h8
-rw-r--r--tmk_core/common/keymap.c5
-rw-r--r--tmk_core/common/matrix.h4
-rw-r--r--tmk_core/protocol/ibm4704.c45
-rw-r--r--tmk_core/protocol/lufa/lufa.c9
-rw-r--r--tmk_core/protocol/pjrc/main.c2
16 files changed, 82 insertions, 60 deletions
diff --git a/converter/ibm4704_usb/README.md b/converter/ibm4704_usb/README.md
index 25b72ba671..15c826ab8b 100644
--- a/converter/ibm4704_usb/README.md
+++ b/converter/ibm4704_usb/README.md
@@ -8,6 +8,7 @@ Keyboard initialization process takes a few seconds at start up. During that you
Update
------
2015/05/05 Added keymaps for 107-key, 77-key and 50-key. Thanks, orihalcon @ geekhack!
+2015/05/19 Fixed a protocol handling bug.
diff --git a/converter/ibm4704_usb/config.h b/converter/ibm4704_usb/config.h
index 4f267b3b7a..2fee10fd61 100644
--- a/converter/ibm4704_usb/config.h
+++ b/converter/ibm4704_usb/config.h
@@ -51,9 +51,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define IBM4704_DATA_DDR DDRD
#define IBM4704_DATA_BIT 0
-/* Pin interrupt on rising edge */
-#define IBM4704_INT_INIT() do { EICRA |= ((1<<ISC11)|(0<<ISC10)); } while (0)
-#define IBM4704_INT_ON() do { EIMSK |= (1<<INT1); } while (0)
+/* Pin interrupt on rising edge of clock */
+#define IBM4704_INT_INIT() do { EICRA |= ((1<<ISC11)|(1<<ISC10)); } while (0)
+#define IBM4704_INT_ON() do { EIFR |= (1<<INTF1); EIMSK |= (1<<INT1); } while (0)
#define IBM4704_INT_OFF() do { EIMSK &= ~(1<<INT1); } while (0)
#define IBM4704_INT_VECT INT1_vect
diff --git a/converter/ibm4704_usb/ibm4704.txt b/converter/ibm4704_usb/ibm4704.txt
index 9c4895d922..e2d42f08fd 100644
--- a/converter/ibm4704_usb/ibm4704.txt
+++ b/converter/ibm4704_usb/ibm4704.txt
@@ -57,15 +57,15 @@ Keyboard to Host
----------------
Data bits are LSB first and Pairty is odd. Clock has around 60us high and 30us low part.
- ____ __ __ __ __ __ __ __ __ __ ________
- Clock \____/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
+ ____ __ __ __ __ __ __ __ __ __ _______
+ Clock \_____/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
____ ____ ____ ____ ____ ____ ____ ____ ____ ____
Data ____/ X____X____X____X____X____X____X____X____X____X________
Start 0 1 2 3 4 5 6 7 P Stop
Start bit: can be long as 300-350us.
Inhibit: Pull Data line down to inhibit keyboard to send.
-Timing: Host reads bit while Clock is hi.
+Timing: Host reads bit while Clock is hi.(rising edge)
Stop bit: Keyboard pulls down Data line to lo after 9th clock.
@@ -166,13 +166,14 @@ Data sent from host:
| `-----`--- scan code
`------------- enable bit(0: enable repeat, 1: enable break)
- 00-77 Enable repeat(78-7F: invalid scancode)
- 80-F7 Enable break(F8-FF: invalid scancode)
+ 00-79 Enable repeat
+ 80-F9 Enable break(FA-FF are used as other commands, see above.)
FE Resend(011ah) no need to use
FF End(0114h) exits FC command mode.
Response from keyboard:
FD Out of bound - Invalid scancode
+ -- OK - No response means that command is accepted.
Examples:
To enable break code of all keys.
diff --git a/converter/ibm4704_usb/matrix.c b/converter/ibm4704_usb/matrix.c
index 5f928d716f..155df9c38f 100644
--- a/converter/ibm4704_usb/matrix.c
+++ b/converter/ibm4704_usb/matrix.c
@@ -67,35 +67,31 @@ uint8_t matrix_cols(void)
static void enable_break(void)
{
- uint8_t ret;
print("Enable break: ");
// valid scancode: 00-79h
for (uint8_t code = 0; code < 0x7A; code++) {
- while (ibm4704_send(0x80|code)) _delay_ms(1);
- // get none when ok, get FD when out of bound
- _delay_ms(5);
- if ((ret = ibm4704_recv()) != 0xff) {
- xprintf("c%02X:r%02X ", code, ret);
- }
- _delay_ms(1);
+ while (ibm4704_send(0x80|code)) _delay_ms(10);
+ _delay_ms(5); // wait for response
+ // No response(FF) when ok, FD when out of bound
+ xprintf("s%02X:r%02X ", code, ibm4704_recv());
}
- _delay_us(1000);
- while (ibm4704_send(0xFF)) { _delay_ms(1); } // End
+ while (ibm4704_send(0xFF)) { _delay_ms(10); } // End
print("End\n");
}
-void matrix_init(void)
-{
- debug_enable = true;
+void matrix_setup(void)
+{
ibm4704_init();
- matrix_clear();
+}
- _delay_ms(2000); // wait for starting up debug console
+void matrix_init(void)
+{
+ debug_enable = true;
print("IBM 4704 converter\n");
- while (ibm4704_send(0xFE)) _delay_ms(1); // resend
- _delay_ms(5);
+ matrix_clear();
+ _delay_ms(2000); // wait for keyboard starting up
xprintf("Keyboard ID: %02X\n", ibm4704_recv());
enable_break();
}
diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index edcbddfdfa..51b2225661 100644
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -87,8 +87,8 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
# PS/2 Options
#
-PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened)
-#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
+#PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened)
+PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_BUSYWAIT = yes # uses primitive reference code
diff --git a/converter/ps2_usb/README.md b/converter/ps2_usb/README.md
index 8a535949d8..74464e2640 100644
--- a/converter/ps2_usb/README.md
+++ b/converter/ps2_usb/README.md
@@ -14,7 +14,7 @@ In case of Teensy2.0(ATMega32U4):
- **USART**: **Clock** is on `PD5` and **Data** on `PD2`.
3. Optionally you need pull-up resistor. 1K-10K Ohm is OK.
-To change pin configuration edit config.h.
+To change pin configuration edit **config.h** and **Makefile**.
Build Firmware
diff --git a/converter/ps2_usb/config.h b/converter/ps2_usb/config.h
index c9bab1b072..c0a4fab13b 100644
--- a/converter/ps2_usb/config.h
+++ b/converter/ps2_usb/config.h
@@ -50,11 +50,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
-#define PS2_CLOCK_BIT 5
+#define PS2_CLOCK_BIT 1
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
-#define PS2_DATA_BIT 2
+#define PS2_DATA_BIT 0
#endif
/*
@@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
-#define PS2_DATA_BIT 2
+#define PS2_DATA_BIT 0
#define PS2_INT_INIT() do { \
EICRA |= ((1<<ISC11) | \
(0<<ISC10)); \
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h
index 8a4736d7bc..e76161c17f 100644
--- a/tmk_core/common/action.h
+++ b/tmk_core/common/action.h
@@ -51,6 +51,7 @@ void action_exec(keyevent_t event);
/* action for key */
action_t action_for_key(uint8_t layer, keypos_t key);
+action_t action_for_key_default(uint8_t layer, keypos_t key);
/* macro */
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index 80243f02bc..af99f52b5e 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -85,6 +85,8 @@ void suspend_power_down(void)
power_down(WDTO_15MS);
}
+__attribute__ ((weak)) void matrix_power_up(void) {}
+__attribute__ ((weak)) void matrix_power_down(void) {}
bool suspend_wakeup_condition(void)
{
matrix_power_up();
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index b03b124d76..eb7b096bed 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -62,6 +62,12 @@ static bool has_ghost_in_row(uint8_t row)
#endif
+__attribute__ ((weak)) void matrix_setup(void) {}
+void keyboard_setup(void)
+{
+ matrix_setup();
+}
+
void keyboard_init(void)
{
timer_init();
diff --git a/tmk_core/common/keyboard.h b/tmk_core/common/keyboard.h
index 6442716fc7..7738251b64 100644
--- a/tmk_core/common/keyboard.h
+++ b/tmk_core/common/keyboard.h
@@ -58,13 +58,15 @@ static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) &&
}
+/* it runs once at early stage of startup before keyboard_init. */
+void keyboard_setup(void);
+/* it runs once after initializing host side protocol, debug and MCU peripherals. */
void keyboard_init(void);
+/* it runs repeatedly in main loop */
void keyboard_task(void);
+/* it runs when host LED status is updated */
void keyboard_set_leds(uint8_t leds);
-__attribute__ ((weak)) void matrix_power_up(void) {}
-__attribute__ ((weak)) void matrix_power_down(void) {}
-
#ifdef __cplusplus
}
#endif
diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c
index 9f4fab5216..a43ca460f2 100644
--- a/tmk_core/common/keymap.c
+++ b/tmk_core/common/keymap.c
@@ -27,8 +27,13 @@ static action_t keycode_to_action(uint8_t keycode);
/* converts key to action */
+__attribute__((__weak__))
action_t action_for_key(uint8_t layer, keypos_t key)
{
+ return action_for_key_default(layer, key);
+}
+
+action_t action_for_key_default(uint8_t layer, keypos_t key)
uint8_t keycode = keymap_key_to_keycode(layer, key);
switch (keycode) {
case KC_FN0 ... KC_FN31:
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index 107ee72653..ec6f8cd431 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -43,7 +43,9 @@ extern "C" {
uint8_t matrix_rows(void);
/* number of matrix columns */
uint8_t matrix_cols(void);
-/* intialize matrix for scaning. should be called once. */
+/* should be called at early stage of startup before matrix_init.(optional) */
+void matrix_setup(void);
+/* intialize matrix for scaning. */
void matrix_init(void);
/* scan all key states on matrix */
uint8_t matrix_scan(void);
diff --git a/tmk_core/protocol/ibm4704.c b/tmk_core/protocol/ibm4704.c
index a10a5e74d9..6a03cd4419 100644
--- a/tmk_core/protocol/ibm4704.c
+++ b/tmk_core/protocol/ibm4704.c
@@ -21,9 +21,10 @@ uint8_t ibm4704_error = 0;
void ibm4704_init(void)
{
+ inhibit(); // keep keyboard from sending
IBM4704_INT_INIT();
IBM4704_INT_ON();
- idle();
+ idle(); // allow keyboard sending
}
/*
@@ -104,51 +105,44 @@ uint8_t ibm4704_recv_response(void)
return rbuf_dequeue();
}
+uint8_t ibm4704_recv(void)
+{
+ if (rbuf_has_data()) {
+ return rbuf_dequeue();
+ } else {
+ return -1;
+ }
+}
+
/*
Keyboard to Host
----------------
Data bits are LSB first and Parity is odd. Clock has around 60us high and 30us low part.
- ____ __ __ __ __ __ __ __ __ __ ________
-Clock \____/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
+ ____ __ __ __ __ __ __ __ __ __ _______
+Clock \_____/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
____ ____ ____ ____ ____ ____ ____ ____ ____ ____
Data ____/ X____X____X____X____X____X____X____X____X____X________
Start 0 1 2 3 4 5 6 7 P Stop
Start bit: can be long as 300-350us.
Inhibit: Pull Data line down to inhibit keyboard to send.
-Timing: Host reads bit while Clock is hi.
+Timing: Host reads bit while Clock is hi.(rising edge)
Stop bit: Keyboard pulls down Data line to lo after 9th clock.
*/
-uint8_t ibm4704_recv(void)
-{
- if (rbuf_has_data()) {
- return rbuf_dequeue();
- } else {
- return -1;
- }
-}
-
ISR(IBM4704_INT_VECT)
{
static enum {
- INIT, START, BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7, PARITY,
- } state = INIT;
+ BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7, PARITY, STOP
+ } state = BIT0;
// LSB first
static uint8_t data = 0;
// Odd parity
static uint8_t parity = false;
ibm4704_error = 0;
- // return unless falling edge
- if (clock_in()) { goto RETURN; } // why this occurs?
- state++;
switch (state) {
- case START:
- // Data:Low
- WAIT(data_hi, 10, state);
- break;
case BIT0:
case BIT1:
case BIT2:
@@ -169,6 +163,10 @@ ISR(IBM4704_INT_VECT)
}
if (!parity)
goto ERROR;
+ break;
+ case STOP:
+ // Data:Low
+ WAIT(data_lo, 100, state);
rbuf_enqueue(data);
ibm4704_error = IBM4704_ERR_NONE;
goto DONE;
@@ -176,13 +174,14 @@ ISR(IBM4704_INT_VECT)
default:
goto ERROR;
}
+ state++;
goto RETURN;
ERROR:
ibm4704_error = state;
while (ibm4704_send(0xFE)) _delay_ms(1); // resend
xprintf("R:%02X%02X\n", state, data);
DONE:
- state = INIT;
+ state = BIT0;
data = 0;
parity = false;
RETURN:
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index cdfc7bc6ad..391064c9b2 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -544,7 +544,7 @@ int8_t sendchar(uint8_t c)
/*******************************************************************************
* main
******************************************************************************/
-static void SetupHardware(void)
+static void setup_mcu(void)
{
/* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF);
@@ -552,7 +552,10 @@ static void SetupHardware(void)
/* Disable clock division */
clock_prescale_set(clock_div_1);
+}
+static void setup_usb(void)
+{
// Leonardo needs. Without this USB device is not recognized.
USB_Disable();
@@ -566,7 +569,9 @@ static void SetupHardware(void)
int main(void) __attribute__ ((weak));
int main(void)
{
- SetupHardware();
+ setup_mcu();
+ keyboard_setup();
+ setup_usb();
sei();
/* wait for USB startup & debug output */
diff --git a/tmk_core/protocol/pjrc/main.c b/tmk_core/protocol/pjrc/main.c
index e7bdcc059a..45eb17d4cd 100644
--- a/tmk_core/protocol/pjrc/main.c
+++ b/tmk_core/protocol/pjrc/main.c
@@ -46,6 +46,8 @@ int main(void)
// set for 16 MHz clock
CPU_PRESCALE(0);
+ keyboard_setup();
+
// Initialize the USB, and then wait for the host to set configuration.
// If the Teensy is powered without a PC connected to the USB port,
// this will wait forever.