diff options
| -rw-r--r-- | converter/ibm4704_usb/config.h | 21 | ||||
| -rw-r--r-- | converter/ibm4704_usb/matrix.c | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/ibm4704.c | 2 |
3 files changed, 7 insertions, 18 deletions
diff --git a/converter/ibm4704_usb/config.h b/converter/ibm4704_usb/config.h index 812d95c670..4f267b3b7a 100644 --- a/converter/ibm4704_usb/config.h +++ b/converter/ibm4704_usb/config.h @@ -41,9 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. -/* - * Busywait - */ +/* Pin configuration */ #define IBM4704_CLOCK_PORT PORTD #define IBM4704_CLOCK_PIN PIND #define IBM4704_CLOCK_DDR DDRD @@ -53,19 +51,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define IBM4704_DATA_DDR DDRD #define IBM4704_DATA_BIT 0 -/* - * Pin interrupt - */ -#define IBM4704_INT_INIT() do { \ - EICRA |= ((1<<ISC11) | \ - (0<<ISC10)); \ -} while (0) -#define IBM4704_INT_ON() do { \ - EIMSK |= (1<<INT1); \ -} while (0) -#define IBM4704_INT_OFF() do { \ - EIMSK &= ~(1<<INT1); \ -} while (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) +#define IBM4704_INT_OFF() do { EIMSK &= ~(1<<INT1); } while (0) #define IBM4704_INT_VECT INT1_vect diff --git a/converter/ibm4704_usb/matrix.c b/converter/ibm4704_usb/matrix.c index 857dea0f91..5f928d716f 100644 --- a/converter/ibm4704_usb/matrix.c +++ b/converter/ibm4704_usb/matrix.c @@ -86,7 +86,7 @@ static void enable_break(void) void matrix_init(void) { - debug_enable = false; + debug_enable = true; ibm4704_init(); matrix_clear(); diff --git a/tmk_core/protocol/ibm4704.c b/tmk_core/protocol/ibm4704.c index 152d7e61b6..a10a5e74d9 100644 --- a/tmk_core/protocol/ibm4704.c +++ b/tmk_core/protocol/ibm4704.c @@ -180,7 +180,7 @@ ISR(IBM4704_INT_VECT) ERROR: ibm4704_error = state; while (ibm4704_send(0xFE)) _delay_ms(1); // resend - xprintf("R:%02X\n", data); + xprintf("R:%02X%02X\n", state, data); DONE: state = INIT; data = 0; |