From 9a2282157fbdf57ef0a50d4fea7da72505906588 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 14 May 2015 15:38:15 +0900 Subject: ibm4704_usb: Fix interrupt of clock(rising edge) --- tmk_core/protocol/ibm4704.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/ibm4704.c b/tmk_core/protocol/ibm4704.c index a10a5e74d9..a2c6700477 100644 --- a/tmk_core/protocol/ibm4704.c +++ b/tmk_core/protocol/ibm4704.c @@ -104,50 +104,47 @@ 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; + STOP, BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7, PARITY + } state = STOP; // 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: + switch (state++) { + case STOP: // Data:Low - WAIT(data_hi, 10, state); + WAIT(data_lo, 10, state); break; case BIT0: case BIT1: @@ -182,7 +179,7 @@ ERROR: while (ibm4704_send(0xFE)) _delay_ms(1); // resend xprintf("R:%02X%02X\n", state, data); DONE: - state = INIT; + state = STOP; data = 0; parity = false; RETURN: -- cgit v1.2.3 From 6b588eb7f7893500e18686e673dbf12b511dc975 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 17 May 2015 19:34:34 +0900 Subject: Add keyboard_setup() and matrix_setup() --- tmk_core/protocol/lufa/lufa.c | 9 +++++++-- tmk_core/protocol/pjrc/main.c | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'tmk_core/protocol') 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. -- cgit v1.2.3 From 80fd3b0b240a8840fbca1cc3cc70e76f5b52b888 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 19 May 2015 00:32:58 +0900 Subject: ibm4704_usb: Fix protocol handling --- tmk_core/protocol/ibm4704.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/ibm4704.c b/tmk_core/protocol/ibm4704.c index a2c6700477..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 } /* @@ -132,8 +133,8 @@ Stop bit: Keyboard pulls down Data line to lo after 9th clock. ISR(IBM4704_INT_VECT) { static enum { - STOP, BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7, PARITY - } state = STOP; + BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7, PARITY, STOP + } state = BIT0; // LSB first static uint8_t data = 0; // Odd parity @@ -141,11 +142,7 @@ ISR(IBM4704_INT_VECT) ibm4704_error = 0; - switch (state++) { - case STOP: - // Data:Low - WAIT(data_lo, 10, state); - break; + switch (state) { case BIT0: case BIT1: case BIT2: @@ -166,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; @@ -173,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 = STOP; + state = BIT0; data = 0; parity = false; RETURN: -- cgit v1.2.3