diff options
| author | tmk <nobody@nowhere> | 2014-08-26 17:48:34 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-08-26 17:48:34 +0900 |
| commit | b9e265368fde73daff069788dcb58c8230d01b32 (patch) | |
| tree | ce081df2bc887c948ab9e0d5fc1242f8cc70aeb0 /protocol/serial_soft.c | |
| parent | 10eb70acb4c8a03fc5bda32d9c23fc41266aef7a (diff) | |
| parent | 4799c99b4d1f065d1c23f3f27df079072d0ce8e9 (diff) | |
| download | qmk_firmware-b9e265368fde73daff069788dcb58c8230d01b32.tar.gz qmk_firmware-b9e265368fde73daff069788dcb58c8230d01b32.zip | |
Merge branch 'rhaberkorn-serial-mouse'
Diffstat (limited to 'protocol/serial_soft.c')
| -rw-r--r-- | protocol/serial_soft.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c index e8870bcd79..44822b7e43 100644 --- a/protocol/serial_soft.c +++ b/protocol/serial_soft.c @@ -122,7 +122,11 @@ void serial_send(uint8_t data) /* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */ #ifdef SERIAL_SOFT_BIT_ORDER_MSB + #ifdef SERIAL_SOFT_DATA_7BIT + uint8_t mask = 0x40; + #else uint8_t mask = 0x80; + #endif #else uint8_t mask = 0x01; #endif @@ -133,7 +137,11 @@ void serial_send(uint8_t data) SERIAL_SOFT_TXD_OFF(); _delay_us(WAIT_US); - while (mask) { +#ifdef SERIAL_SOFT_DATA_7BIT + while (mask&0x7F) { +#else + while (mask&0xFF) { +#endif if (data&mask) { SERIAL_SOFT_TXD_ON(); parity ^= 1; @@ -173,7 +181,11 @@ ISR(SERIAL_SOFT_RXD_VECT) uint8_t data = 0; #ifdef SERIAL_SOFT_BIT_ORDER_MSB + #ifdef SERIAL_SOFT_DATA_7BIT + uint8_t mask = 0x40; + #else uint8_t mask = 0x80; + #endif #else uint8_t mask = 0x01; #endif @@ -197,7 +209,11 @@ ISR(SERIAL_SOFT_RXD_VECT) #else mask <<= 1; #endif - } while (mask); +#ifdef SERIAL_SOFT_DATA_7BIT + } while (mask&0x7F); +#else + } while (mask&0xFF); +#endif #if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD) /* to center of parity bit */ |