Fix debug print

This commit is contained in:
tmk 2014-10-28 14:41:45 +09:00 committed by Jun Wako
parent d42aa47809
commit d5482f29f4
3 changed files with 7 additions and 18 deletions

View File

@ -41,9 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* /* Pin configuration */
* Busywait
*/
#define IBM4704_CLOCK_PORT PORTD #define IBM4704_CLOCK_PORT PORTD
#define IBM4704_CLOCK_PIN PIND #define IBM4704_CLOCK_PIN PIND
#define IBM4704_CLOCK_DDR DDRD #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_DDR DDRD
#define IBM4704_DATA_BIT 0 #define IBM4704_DATA_BIT 0
/* /* Pin interrupt on rising edge */
* 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_INIT() do { \ #define IBM4704_INT_OFF() do { EIMSK &= ~(1<<INT1); } while (0)
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 #define IBM4704_INT_VECT INT1_vect

View File

@ -86,7 +86,7 @@ static void enable_break(void)
void matrix_init(void) void matrix_init(void)
{ {
debug_enable = false; debug_enable = true;
ibm4704_init(); ibm4704_init();
matrix_clear(); matrix_clear();

View File

@ -180,7 +180,7 @@ ISR(IBM4704_INT_VECT)
ERROR: ERROR:
ibm4704_error = state; ibm4704_error = state;
while (ibm4704_send(0xFE)) _delay_ms(1); // resend while (ibm4704_send(0xFE)) _delay_ms(1); // resend
xprintf("R:%02X\n", data); xprintf("R:%02X%02X\n", state, data);
DONE: DONE:
state = INIT; state = INIT;
data = 0; data = 0;