di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

Add option 7bit data to serial_soft.c

Browse Source
This commit is contained in:
tmk 2014-08-26 17:39:04 +09:00
parent c4530ab0a8
commit c672cbc31c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
protocol/serial_soft.c
View File

@ -122,7 +122,11 @@ void serial_send(uint8_t data)
/* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */ /* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */
#ifdef SERIAL_SOFT_BIT_ORDER_MSB #ifdef SERIAL_SOFT_BIT_ORDER_MSB
#ifdef SERIAL_SOFT_DATA_7BIT
uint8_t mask = 0x40;
#else
uint8_t mask = 0x80; uint8_t mask = 0x80;
#endif
#else #else
uint8_t mask = 0x01; uint8_t mask = 0x01;
#endif #endif
@ -133,7 +137,11 @@ void serial_send(uint8_t data)
SERIAL_SOFT_TXD_OFF(); SERIAL_SOFT_TXD_OFF();
_delay_us(WAIT_US); _delay_us(WAIT_US);
while (mask) { #ifdef SERIAL_SOFT_DATA_7BIT
while (mask&0x7F) {
#else
while (mask&0xFF) {
#endif
if (data&mask) { if (data&mask) {
SERIAL_SOFT_TXD_ON(); SERIAL_SOFT_TXD_ON();
parity ^= 1; parity ^= 1;
@ -173,7 +181,11 @@ ISR(SERIAL_SOFT_RXD_VECT)
uint8_t data = 0; uint8_t data = 0;
#ifdef SERIAL_SOFT_BIT_ORDER_MSB #ifdef SERIAL_SOFT_BIT_ORDER_MSB
#ifdef SERIAL_SOFT_DATA_7BIT
uint8_t mask = 0x40;
#else
uint8_t mask = 0x80; uint8_t mask = 0x80;
#endif
#else #else
uint8_t mask = 0x01; uint8_t mask = 0x01;
#endif #endif
@ -197,7 +209,11 @@ ISR(SERIAL_SOFT_RXD_VECT)
#else #else
mask <<= 1; mask <<= 1;
#endif #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) #if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD)
/* to center of parity bit */ /* to center of parity bit */