~ruther/qmk_firmware

6215727b0bd827a18456b21a26d6175abe365ada — tmk 12 years ago 84a3d4d
Fix debug code of serial_soft.c
1 files changed, 26 insertions(+), 6 deletions(-)

M protocol/serial_soft.c
M protocol/serial_soft.c => protocol/serial_soft.c +26 -6
@@ 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()
}