g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix debug code of serial_soft.c

daktil_thumb_popravljen
tmk 2013-02-23 14:32:34 +09:00
parent 84a3d4d2a1
commit 6215727b0b
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
protocol/serial_soft.c
View File

@ -48,8 +48,20 @@ POSSIBILITY OF SUCH DAMAGE.
#define WAIT_US (1000000/SERIAL_BAUD) #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) void serial_init(void)
{ {
SERIAL_SOFT_DEBUG_INIT();
SERIAL_RXD_INIT(); SERIAL_RXD_INIT();
SERIAL_TXD_INIT(); SERIAL_TXD_INIT();
} }
@ -116,7 +128,7 @@ void serial_send(uint8_t data)
/* detect edge of start bit */ /* detect edge of start bit */
ISR(SERIAL_RXD_VECT) ISR(SERIAL_RXD_VECT)
{ {
PORTD ^= 1<<7; SERIAL_SOFT_DEBUG_TGL()
SERIAL_RXD_INT_ENTER() SERIAL_RXD_INT_ENTER()
uint8_t data = 0; uint8_t data = 0;
@ -129,21 +141,23 @@ PORTD ^= 1<<7;
#ifdef SERIAL_PARITY_ODD #ifdef SERIAL_PARITY_ODD
uint8_t parity = 0; uint8_t parity = 0;
#else #elif defined(SERIAL_PARITY_EVEN)
uint8_t parity = 1; uint8_t parity = 1;
#endif #endif
/* to center of start bit */ /* to center of start bit */
_delay_us(WAIT_US/2); _delay_us(WAIT_US/2);
PORTD ^= 1<<7; SERIAL_SOFT_DEBUG_TGL()
do { do {
/* to center of next bit */ /* to center of next bit */
_delay_us(WAIT_US); _delay_us(WAIT_US);
PORTD ^= 1<<7; SERIAL_SOFT_DEBUG_TGL()
if (SERIAL_RXD_READ()) { if (SERIAL_RXD_READ()) {
data |= mask; data |= mask;
#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
parity ^= 1; parity ^= 1;
#endif
} }
#ifdef SERIAL_BIT_ORDER_MSB #ifdef SERIAL_BIT_ORDER_MSB
mask >>= 1; mask >>= 1;
@ -152,20 +166,26 @@ PORTD ^= 1<<7;
#endif #endif
} while (mask); } while (mask);
#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
/* to center of parity bit */ /* to center of parity bit */
_delay_us(WAIT_US); _delay_us(WAIT_US);
if (SERIAL_RXD_READ()) { parity ^= 1; } if (SERIAL_RXD_READ()) { parity ^= 1; }
PORTD ^= 1<<7; SERIAL_SOFT_DEBUG_TGL()
#endif
/* to center of stop bit */ /* to center of stop bit */
_delay_us(WAIT_US); _delay_us(WAIT_US);
uint8_t next = (rbuf_head + 1) % RBUF_SIZE; uint8_t next = (rbuf_head + 1) % RBUF_SIZE;
#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
if (parity && next != rbuf_tail) { if (parity && next != rbuf_tail) {
#else
if (next != rbuf_tail) {
#endif
rbuf[rbuf_head] = data; rbuf[rbuf_head] = data;
rbuf_head = next; rbuf_head = next;
} }
SERIAL_RXD_INT_EXIT(); SERIAL_RXD_INT_EXIT();
PORTD ^= 1<<7; SERIAL_SOFT_DEBUG_TGL()
} }