From f68c5bf0d30dc1300c71dabc63d2c2970f7337c9 Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 22 Feb 2013 09:53:46 +0900 Subject: Add initial files for PC98 --- protocol/serial_soft.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'protocol') diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c index beddc353c0..e0661c3aa1 100644 --- a/protocol/serial_soft.c +++ b/protocol/serial_soft.c @@ -106,11 +106,19 @@ ISR(SERIAL_RXD_VECT) SERIAL_RXD_INT_ENTER() uint8_t data = 0; + #ifdef SERIAL_BIT_ORDER_MSB uint8_t mask = 0x80; #else uint8_t mask = 0x01; #endif + +#ifdef SERIAL_PARITY_ODD + uint8_t parity = 0; +#else + uint8_t parity = 1; +#endif + /* to center of start bit */ _delay_us(WAIT_US/2); do { @@ -119,6 +127,7 @@ ISR(SERIAL_RXD_VECT) if (SERIAL_RXD_READ()) { data |= mask; + parity ^= 1; } #ifdef SERIAL_BIT_ORDER_MSB mask >>= 1; @@ -126,11 +135,18 @@ ISR(SERIAL_RXD_VECT) mask <<= 1; #endif } while (mask); + + /* to center of parity bit */ + _delay_us(WAIT_US); + parity ^= SERIAL_RXD_READ(); + /* to center of stop bit */ _delay_us(WAIT_US); + _delay_us(WAIT_US/2); + parity = 1; uint8_t next = (rbuf_head + 1) % RBUF_SIZE; - if (next != rbuf_tail) { + if (parity && next != rbuf_tail) { rbuf[rbuf_head] = data; rbuf_head = next; } -- cgit v1.2.3 From eb776c1b7918f320b717cedfd8957f55e53c5adf Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 22 Feb 2013 15:48:35 +0900 Subject: Quick Fix: read scan code from PC98 --- protocol/serial_soft.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'protocol') diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c index e0661c3aa1..47b1e4571d 100644 --- a/protocol/serial_soft.c +++ b/protocol/serial_soft.c @@ -48,6 +48,23 @@ POSSIBILITY OF SUCH DAMAGE. #define WAIT_US (1000000/SERIAL_BAUD) +#if 1 +#define WAIT_TICK (1000000/SERIAL_BAUD) +#define WAIT4(tick) _delay_us(tick) +#else +#define WAIT_TICK ((16000000/SERIAL_BAUD)/4 - 5) +static inline void WAIT4(uint8_t tick) +{ + __asm__ __volatile__ ( + "1: dec %0" "\n\t" + "nop" "\n\t" + "brne 1b" + : + : "r" (tick) + ); +} +#endif + void serial_init(void) { SERIAL_RXD_INIT(); @@ -60,6 +77,7 @@ static uint8_t rbuf[RBUF_SIZE]; static uint8_t rbuf_head = 0; static uint8_t rbuf_tail = 0; + uint8_t serial_recv(void) { uint8_t data = 0; @@ -103,6 +121,7 @@ void serial_send(uint8_t data) /* detect edge of start bit */ ISR(SERIAL_RXD_VECT) { +PORTD ^= 1<<7; SERIAL_RXD_INT_ENTER() uint8_t data = 0; @@ -120,11 +139,15 @@ ISR(SERIAL_RXD_VECT) #endif /* to center of start bit */ - _delay_us(WAIT_US/2); + //_delay_us(WAIT_US/2); + WAIT4(WAIT_TICK/2); +PORTD ^= 1<<7; do { /* to center of next bit */ - _delay_us(WAIT_US); + //_delay_us(WAIT_US); + WAIT4(WAIT_TICK); +PORTD ^= 1<<7; if (SERIAL_RXD_READ()) { data |= mask; parity ^= 1; @@ -137,19 +160,22 @@ ISR(SERIAL_RXD_VECT) } while (mask); /* to center of parity bit */ - _delay_us(WAIT_US); - parity ^= SERIAL_RXD_READ(); + //_delay_us(WAIT_US); + WAIT4(WAIT_TICK); + if (SERIAL_RXD_READ()) { parity ^= 1; } +PORTD ^= 1<<7; /* to center of stop bit */ - _delay_us(WAIT_US); - _delay_us(WAIT_US/2); + //_delay_us(WAIT_US); + WAIT4(WAIT_TICK); - parity = 1; uint8_t next = (rbuf_head + 1) % RBUF_SIZE; - if (parity && next != rbuf_tail) { + //if (parity && next != rbuf_tail) { + if (next != rbuf_tail) { rbuf[rbuf_head] = data; rbuf_head = next; } SERIAL_RXD_INT_EXIT(); +PORTD ^= 1<<7; } -- cgit v1.2.3 From 4ec8fd28230753452df7bc4111b60dc104f30267 Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 22 Feb 2013 19:38:06 +0900 Subject: Fix softwere serial --- protocol/serial.h | 1 + protocol/serial_soft.c | 44 +++++++++++++++++--------------------------- 2 files changed, 18 insertions(+), 27 deletions(-) (limited to 'protocol') diff --git a/protocol/serial.h b/protocol/serial.h index bd071bec92..96913c8675 100644 --- a/protocol/serial.h +++ b/protocol/serial.h @@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. /* host role */ void serial_init(void); uint8_t serial_recv(void); +int16_t serial_recv2(void); void serial_send(uint8_t data); #endif diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c index 47b1e4571d..af5110b4f6 100644 --- a/protocol/serial_soft.c +++ b/protocol/serial_soft.c @@ -48,23 +48,6 @@ POSSIBILITY OF SUCH DAMAGE. #define WAIT_US (1000000/SERIAL_BAUD) -#if 1 -#define WAIT_TICK (1000000/SERIAL_BAUD) -#define WAIT4(tick) _delay_us(tick) -#else -#define WAIT_TICK ((16000000/SERIAL_BAUD)/4 - 5) -static inline void WAIT4(uint8_t tick) -{ - __asm__ __volatile__ ( - "1: dec %0" "\n\t" - "nop" "\n\t" - "brne 1b" - : - : "r" (tick) - ); -} -#endif - void serial_init(void) { SERIAL_RXD_INIT(); @@ -90,6 +73,18 @@ uint8_t serial_recv(void) return data; } +int16_t serial_recv2(void) +{ + uint8_t data = 0; + if (rbuf_head == rbuf_tail) { + return -1; + } + + data = rbuf[rbuf_tail]; + rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE; + return data; +} + void serial_send(uint8_t data) { /* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */ @@ -139,13 +134,11 @@ PORTD ^= 1<<7; #endif /* to center of start bit */ - //_delay_us(WAIT_US/2); - WAIT4(WAIT_TICK/2); + _delay_us(WAIT_US/2); PORTD ^= 1<<7; do { /* to center of next bit */ - //_delay_us(WAIT_US); - WAIT4(WAIT_TICK); + _delay_us(WAIT_US); PORTD ^= 1<<7; if (SERIAL_RXD_READ()) { @@ -160,18 +153,15 @@ PORTD ^= 1<<7; } while (mask); /* to center of parity bit */ - //_delay_us(WAIT_US); - WAIT4(WAIT_TICK); + _delay_us(WAIT_US); if (SERIAL_RXD_READ()) { parity ^= 1; } PORTD ^= 1<<7; /* to center of stop bit */ - //_delay_us(WAIT_US); - WAIT4(WAIT_TICK); + _delay_us(WAIT_US); uint8_t next = (rbuf_head + 1) % RBUF_SIZE; - //if (parity && next != rbuf_tail) { - if (next != rbuf_tail) { + if (parity && next != rbuf_tail) { rbuf[rbuf_head] = data; rbuf_head = next; } -- cgit v1.2.3 From 6215727b0bd827a18456b21a26d6175abe365ada Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 23 Feb 2013 14:32:34 +0900 Subject: Fix debug code of serial_soft.c --- protocol/serial_soft.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'protocol') diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c index af5110b4f6..3c9c914ed6 100644 --- a/protocol/serial_soft.c +++ b/protocol/serial_soft.c @@ -48,8 +48,20 @@ POSSIBILITY OF SUCH DAMAGE. #define WAIT_US (1000000/SERIAL_BAUD) +/* debug for signal timing, see debug pin with oscilloscope */ +#ifdef SERIAL_SOFT_DEBUG + #define SERIAL_SOFT_DEBUG_INIT() (DDRD |= 1<<7) + #define SERIAL_SOFT_DEBUG_TGL() (PORTD ^= 1<<7) +#else + #define SERIAL_SOFT_DEBUG_INIT() + #define SERIAL_SOFT_DEBUG_TGL() +#endif + + void serial_init(void) { + SERIAL_SOFT_DEBUG_INIT(); + SERIAL_RXD_INIT(); SERIAL_TXD_INIT(); } @@ -116,7 +128,7 @@ void serial_send(uint8_t data) /* detect edge of start bit */ ISR(SERIAL_RXD_VECT) { -PORTD ^= 1<<7; + SERIAL_SOFT_DEBUG_TGL() SERIAL_RXD_INT_ENTER() uint8_t data = 0; @@ -129,21 +141,23 @@ PORTD ^= 1<<7; #ifdef SERIAL_PARITY_ODD uint8_t parity = 0; -#else +#elif defined(SERIAL_PARITY_EVEN) uint8_t parity = 1; #endif /* to center of start bit */ _delay_us(WAIT_US/2); -PORTD ^= 1<<7; + SERIAL_SOFT_DEBUG_TGL() do { /* to center of next bit */ _delay_us(WAIT_US); -PORTD ^= 1<<7; + SERIAL_SOFT_DEBUG_TGL() if (SERIAL_RXD_READ()) { data |= mask; +#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) parity ^= 1; +#endif } #ifdef SERIAL_BIT_ORDER_MSB mask >>= 1; @@ -152,20 +166,26 @@ PORTD ^= 1<<7; #endif } while (mask); +#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) /* to center of parity bit */ _delay_us(WAIT_US); if (SERIAL_RXD_READ()) { parity ^= 1; } -PORTD ^= 1<<7; + SERIAL_SOFT_DEBUG_TGL() +#endif /* to center of stop bit */ _delay_us(WAIT_US); uint8_t next = (rbuf_head + 1) % RBUF_SIZE; +#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) if (parity && next != rbuf_tail) { +#else + if (next != rbuf_tail) { +#endif rbuf[rbuf_head] = data; rbuf_head = next; } SERIAL_RXD_INT_EXIT(); -PORTD ^= 1<<7; + SERIAL_SOFT_DEBUG_TGL() } -- cgit v1.2.3 From 90e6ff92f44511c7ef75f62ceaa186458be3dba2 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 25 Feb 2013 01:02:14 +0900 Subject: Add parity option in serial_soft.c --- protocol/serial_soft.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) (limited to 'protocol') diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c index 3c9c914ed6..c906c66472 100644 --- a/protocol/serial_soft.c +++ b/protocol/serial_soft.c @@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE. * is still useful for negative logic signal like Sun protocol not supported by hardware USART. */ -#define WAIT_US (1000000/SERIAL_BAUD) +#define WAIT_US (1000000L/SERIAL_BAUD) /* debug for signal timing, see debug pin with oscilloscope */ #ifdef SERIAL_SOFT_DEBUG @@ -100,18 +100,33 @@ int16_t serial_recv2(void) void serial_send(uint8_t data) { /* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */ - /* start bit */ - SERIAL_TXD_OFF(); - _delay_us(WAIT_US); #ifdef SERIAL_BIT_ORDER_MSB uint8_t mask = 0x80; #else uint8_t mask = 0x01; #endif + +#ifdef SERIAL_PARITY_ODD + uint8_t parity = 1; +#elif defined(SERIAL_PARITY_EVEN) + uint8_t parity = 0; +#endif + + /* start bit */ + SERIAL_TXD_OFF(); + _delay_us(WAIT_US-2); + while (mask) { - if (data&mask) { SERIAL_TXD_ON(); } else { SERIAL_TXD_OFF(); } - _delay_us(WAIT_US); + if (data&mask) { + SERIAL_TXD_ON(); +#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) + parity ^= 1; +#endif + } else { + SERIAL_TXD_OFF(); + } + _delay_us(WAIT_US-2); #ifdef SERIAL_BIT_ORDER_MSB mask >>= 1; @@ -120,9 +135,19 @@ void serial_send(uint8_t data) #endif } +#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) + /* to center of parity bit */ + if (parity) { + SERIAL_TXD_ON(); + } else { + SERIAL_TXD_OFF(); + } + _delay_us(WAIT_US-2); +#endif + /* stop bit */ SERIAL_TXD_ON(); - _delay_us(WAIT_US); + _delay_us(WAIT_US-2); } /* detect edge of start bit */ -- cgit v1.2.3 From ea1ede83c36272ccaeb5e4d80efc3885edbb9209 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 25 Feb 2013 03:09:10 +0900 Subject: Add serial_uart.c and use it for PC98 --- protocol/serial_uart.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 protocol/serial_uart.c (limited to 'protocol') diff --git a/protocol/serial_uart.c b/protocol/serial_uart.c new file mode 100644 index 0000000000..6c0af88175 --- /dev/null +++ b/protocol/serial_uart.c @@ -0,0 +1,93 @@ +/* +Copyright 2013 Jun WAKO + +This software is licensed with a Modified BSD License. +All of this is supposed to be Free Software, Open Source, DFSG-free, +GPL-compatible, and OK to use in both free and proprietary applications. +Additions and corrections to this file are welcome. + + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +* Neither the name of the copyright holders nor the names of + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include +#include "serial.h" + + +void serial_init(void) +{ + SERIAL_UART_INIT(); +} + +// RX ring buffer +#define RBUF_SIZE 8 +static uint8_t rbuf[RBUF_SIZE]; +static uint8_t rbuf_head = 0; +static uint8_t rbuf_tail = 0; + +uint8_t serial_recv(void) +{ + uint8_t data = 0; + if (rbuf_head == rbuf_tail) { + return 0; + } + + data = rbuf[rbuf_tail]; + rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE; + return data; +} + +int16_t serial_recv2(void) +{ + uint8_t data = 0; + if (rbuf_head == rbuf_tail) { + return -1; + } + + data = rbuf[rbuf_tail]; + rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE; + return data; +} + +void serial_send(uint8_t data) +{ + while (!SERIAL_UART_TXD_READY) ; + SERIAL_UART_DATA = data; +} + +// USART RX complete interrupt +ISR(SERIAL_UART_RXD_VECT) +{ + uint8_t next = (rbuf_head + 1) % RBUF_SIZE; + if (next != rbuf_tail) { + rbuf[rbuf_head] = SERIAL_UART_DATA; + rbuf_head = next; + } +} -- cgit v1.2.3 From 308abf598d4cc19be3c5b137bbd13d18510a083a Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 25 Feb 2013 08:40:15 +0900 Subject: Fix software serial configure --- protocol/serial_soft.c | 98 +++++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 45 deletions(-) (limited to 'protocol') diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c index c906c66472..e8870bcd79 100644 --- a/protocol/serial_soft.c +++ b/protocol/serial_soft.c @@ -43,12 +43,32 @@ POSSIBILITY OF SUCH DAMAGE. /* * Stupid Inefficient Busy-wait Software Serial - * is still useful for negative logic signal like Sun protocol not supported by hardware USART. + * which is still useful for negative logic signal like Sun protocol + * if it is not supported by hardware UART. + * + * TODO: delay is not accurate enough. Instruction cycle should be counted and inline assemby is needed. */ -#define WAIT_US (1000000L/SERIAL_BAUD) +#define WAIT_US (1000000L/SERIAL_SOFT_BAUD) + +#ifdef SERIAL_SOFT_LOGIC_NEGATIVE + #define SERIAL_SOFT_RXD_IN() !(SERIAL_SOFT_RXD_READ()) + #define SERIAL_SOFT_TXD_ON() SERIAL_SOFT_TXD_LO() + #define SERIAL_SOFT_TXD_OFF() SERIAL_SOFT_TXD_HI() +#else + #define SERIAL_SOFT_RXD_IN() !!(SERIAL_SOFT_RXD_READ()) + #define SERIAL_SOFT_TXD_ON() SERIAL_SOFT_TXD_HI() + #define SERIAL_SOFT_TXD_OFF() SERIAL_SOFT_TXD_LO() +#endif + +#ifdef SERIAL_SOFT_PARITY_EVEN + #define SERIAL_SOFT_PARITY_VAL 0 +#elif defined(SERIAL_SOFT_PARITY_ODD) + #define SERIAL_SOFT_PARITY_VAL 1 +#endif /* debug for signal timing, see debug pin with oscilloscope */ +#define SERIAL_SOFT_DEBUG #ifdef SERIAL_SOFT_DEBUG #define SERIAL_SOFT_DEBUG_INIT() (DDRD |= 1<<7) #define SERIAL_SOFT_DEBUG_TGL() (PORTD ^= 1<<7) @@ -62,8 +82,8 @@ void serial_init(void) { SERIAL_SOFT_DEBUG_INIT(); - SERIAL_RXD_INIT(); - SERIAL_TXD_INIT(); + SERIAL_SOFT_RXD_INIT(); + SERIAL_SOFT_TXD_INIT(); } /* RX ring buffer */ @@ -101,109 +121,97 @@ void serial_send(uint8_t data) { /* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */ -#ifdef SERIAL_BIT_ORDER_MSB +#ifdef SERIAL_SOFT_BIT_ORDER_MSB uint8_t mask = 0x80; #else uint8_t mask = 0x01; #endif -#ifdef SERIAL_PARITY_ODD - uint8_t parity = 1; -#elif defined(SERIAL_PARITY_EVEN) uint8_t parity = 0; -#endif /* start bit */ - SERIAL_TXD_OFF(); - _delay_us(WAIT_US-2); + SERIAL_SOFT_TXD_OFF(); + _delay_us(WAIT_US); while (mask) { if (data&mask) { - SERIAL_TXD_ON(); -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) + SERIAL_SOFT_TXD_ON(); parity ^= 1; -#endif } else { - SERIAL_TXD_OFF(); + SERIAL_SOFT_TXD_OFF(); } - _delay_us(WAIT_US-2); + _delay_us(WAIT_US); -#ifdef SERIAL_BIT_ORDER_MSB +#ifdef SERIAL_SOFT_BIT_ORDER_MSB mask >>= 1; #else mask <<= 1; #endif } -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) +#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD) /* to center of parity bit */ - if (parity) { - SERIAL_TXD_ON(); + if (parity != SERIAL_SOFT_PARITY_VAL) { + SERIAL_SOFT_TXD_ON(); } else { - SERIAL_TXD_OFF(); + SERIAL_SOFT_TXD_OFF(); } - _delay_us(WAIT_US-2); + _delay_us(WAIT_US); #endif /* stop bit */ - SERIAL_TXD_ON(); - _delay_us(WAIT_US-2); + SERIAL_SOFT_TXD_ON(); + _delay_us(WAIT_US); } /* detect edge of start bit */ -ISR(SERIAL_RXD_VECT) +ISR(SERIAL_SOFT_RXD_VECT) { - SERIAL_SOFT_DEBUG_TGL() - SERIAL_RXD_INT_ENTER() + SERIAL_SOFT_DEBUG_TGL(); + SERIAL_SOFT_RXD_INT_ENTER() uint8_t data = 0; -#ifdef SERIAL_BIT_ORDER_MSB +#ifdef SERIAL_SOFT_BIT_ORDER_MSB uint8_t mask = 0x80; #else uint8_t mask = 0x01; #endif -#ifdef SERIAL_PARITY_ODD uint8_t parity = 0; -#elif defined(SERIAL_PARITY_EVEN) - uint8_t parity = 1; -#endif /* to center of start bit */ _delay_us(WAIT_US/2); - SERIAL_SOFT_DEBUG_TGL() + SERIAL_SOFT_DEBUG_TGL(); do { /* to center of next bit */ _delay_us(WAIT_US); - SERIAL_SOFT_DEBUG_TGL() - if (SERIAL_RXD_READ()) { + SERIAL_SOFT_DEBUG_TGL(); + if (SERIAL_SOFT_RXD_IN()) { data |= mask; -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) parity ^= 1; -#endif } -#ifdef SERIAL_BIT_ORDER_MSB +#ifdef SERIAL_SOFT_BIT_ORDER_MSB mask >>= 1; #else mask <<= 1; #endif } while (mask); -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) +#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD) /* to center of parity bit */ _delay_us(WAIT_US); - if (SERIAL_RXD_READ()) { parity ^= 1; } - SERIAL_SOFT_DEBUG_TGL() + if (SERIAL_SOFT_RXD_IN()) { parity ^= 1; } + SERIAL_SOFT_DEBUG_TGL(); #endif /* to center of stop bit */ _delay_us(WAIT_US); uint8_t next = (rbuf_head + 1) % RBUF_SIZE; -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) - if (parity && next != rbuf_tail) { +#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD) + if ((parity == SERIAL_SOFT_PARITY_VAL) && next != rbuf_tail) { #else if (next != rbuf_tail) { #endif @@ -211,6 +219,6 @@ ISR(SERIAL_RXD_VECT) rbuf_head = next; } - SERIAL_RXD_INT_EXIT(); - SERIAL_SOFT_DEBUG_TGL() + SERIAL_SOFT_RXD_INT_EXIT(); + SERIAL_SOFT_DEBUG_TGL(); } -- cgit v1.2.3 From 5808317b694004c43a6e0f76e9715415cce19a25 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 5 Mar 2013 15:41:21 +0900 Subject: Fix keymap for new framework --- protocol/vusb/vusb.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'protocol') diff --git a/protocol/vusb/vusb.c b/protocol/vusb/vusb.c index 1d5f4a8528..328885a9b5 100644 --- a/protocol/vusb/vusb.c +++ b/protocol/vusb/vusb.c @@ -88,6 +88,10 @@ static void send_keyboard(report_keyboard_t *report) } else { debug("kbuf: full\n"); } + + // NOTE: send key strokes of Macro + usbPoll(); + vusb_transfer_keyboard(); } -- cgit v1.2.3