andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix software serial configure

master
tmk 2013-02-25 08:40:15 +09:00
parent ea1ede83c3
commit 308abf598d
3 changed files with 93 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
converter/pc98_usb/config.h
View File

@ -69,11 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SERIAL_SOFT_RXD_PORT PORTD #define SERIAL_SOFT_RXD_PORT PORTD
#define SERIAL_SOFT_RXD_PIN PIND #define SERIAL_SOFT_RXD_PIN PIND
#define SERIAL_SOFT_RXD_BIT 2 #define SERIAL_SOFT_RXD_BIT 2
#ifdef SERIAL_SOFT_LOGIC_NEGATIVE #define SERIAL_SOFT_RXD_READ() (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
#define SERIAL_SOFT_RXD_READ() ~(SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
#else
#define SERIAL_SOFT_RXD_READ() (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
#endif
/* RXD Interupt */ /* RXD Interupt */
#define SERIAL_SOFT_RXD_VECT INT2_vect #define SERIAL_SOFT_RXD_VECT INT2_vect
#define SERIAL_SOFT_RXD_INIT() do { \ #define SERIAL_SOFT_RXD_INIT() do { \
@ -95,21 +91,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define SERIAL_SOFT_TXD_PORT PORTD #define SERIAL_SOFT_TXD_PORT PORTD
#define SERIAL_SOFT_TXD_PIN PIND #define SERIAL_SOFT_TXD_PIN PIND
#define SERIAL_SOFT_TXD_BIT 3 #define SERIAL_SOFT_TXD_BIT 3
#ifdef SERIAL_SOFT_LOGIC_NEGATIVE #define SERIAL_SOFT_TXD_HI() do { SERIAL_SOFT_TXD_PORT |= (1<<SERIAL_SOFT_TXD_BIT); } while (0)
#define SERIAL_SOFT_TXD_ON() do { \ #define SERIAL_SOFT_TXD_LO() do { SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); } while (0)
SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); \
} while (0)
#define SERIAL_SOFT_TXD_OFF() do { \
SERIAL_SOFT_TXD_PORT |= (1<<SERIAL_SOFT_TXD_BIT); \
} while (0)
#else
#define SERIAL_SOFT_TXD_ON() do { \
SERIAL_SOFT_TXD_PORT |= (1<<SERIAL_SOFT_TXD_BIT); \
} while (0)
#define SERIAL_SOFT_TXD_OFF() do { \
SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); \
} while (0)
#endif
#define SERIAL_SOFT_TXD_INIT() do { \ #define SERIAL_SOFT_TXD_INIT() do { \
/* pin configuration: output */ \ /* pin configuration: output */ \
SERIAL_SOFT_TXD_DDR |= (1<<SERIAL_SOFT_TXD_BIT); \ SERIAL_SOFT_TXD_DDR |= (1<<SERIAL_SOFT_TXD_BIT); \

68
converter/sun_usb/config.h
View File

@ -43,40 +43,46 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* asynchronous, negative logic, 1200baud, no flow control * asynchronous, negative logic, 1200baud, no flow control
* 1-start bit, 8-data bit, non parity, 1-stop bit * 1-start bit, 8-data bit, non parity, 1-stop bit
*/ */
#define SERIAL_BAUD 1200 #define SERIAL_SOFT_BAUD 1200
#define SERIAL_SOFT_PARITY_NONE
#define SERIAL_RXD_DDR DDRD #define SERIAL_SOFT_BIT_ORDER_LSB
#define SERIAL_RXD_PORT PORTD #define SERIAL_SOFT_LOGIC_NEGATIVE
#define SERIAL_RXD_PIN PIND /* RXD Port */
#define SERIAL_RXD_BIT 2 #define SERIAL_SOFT_RXD_ENABLE
#define SERIAL_RXD_VECT INT2_vect #define SERIAL_SOFT_RXD_DDR DDRD
#define SERIAL_RXD_INIT() do { \ #define SERIAL_SOFT_RXD_PORT PORTD
#define SERIAL_SOFT_RXD_PIN PIND
#define SERIAL_SOFT_RXD_BIT 2
#define SERIAL_SOFT_RXD_VECT INT2_vect
/* RXD Interupt */
#define SERIAL_SOFT_RXD_INIT() do { \
/* pin configuration: input with pull-up */ \ /* pin configuration: input with pull-up */ \
SERIAL_RXD_DDR &= ~(1<<SERIAL_RXD_BIT); \ SERIAL_SOFT_RXD_DDR &= ~(1<<SERIAL_SOFT_RXD_BIT); \
SERIAL_RXD_PORT |= (1<<SERIAL_RXD_BIT); \ SERIAL_SOFT_RXD_PORT |= (1<<SERIAL_SOFT_RXD_BIT); \
/* enable interrupt: INT2(rising edge) */ \ /* enable interrupt: INT2(rising edge) */ \
EICRA |= ((1<<ISC21)|(1<<ISC20)); \ EICRA |= ((1<<ISC21)|(1<<ISC20)); \
EIMSK |= (1<<INT2); \ EIMSK |= (1<<INT2); \
sei(); \
} while (0) } while (0)
#define SERIAL_RXD_INT_ENTER() #define SERIAL_SOFT_RXD_INT_ENTER()
#define SERIAL_RXD_INT_EXIT() do { \ #define SERIAL_SOFT_RXD_INT_EXIT() do { \
/* clear interrupt flag */ \ /* clear interrupt flag */ \
EIFR = (1<<INTF2); \ EIFR = (1<<INTF2); \
} while (0) } while (0)
#define SERIAL_RXD_READ() (~SERIAL_RXD_PIN&(1<<SERIAL_RXD_BIT)) #define SERIAL_SOFT_RXD_READ() (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
/* TXD Port */
#define SERIAL_TXD_DDR DDRD #define SERIAL_SOFT_TXD_ENABLE
#define SERIAL_TXD_PORT PORTD #define SERIAL_SOFT_TXD_DDR DDRD
#define SERIAL_TXD_PIN PIND #define SERIAL_SOFT_TXD_PORT PORTD
#define SERIAL_TXD_BIT 3 #define SERIAL_SOFT_TXD_PIN PIND
/* negative logic */ #define SERIAL_SOFT_TXD_BIT 3
#define SERIAL_TXD_ON() do { SERIAL_TXD_PORT &= ~(1<<SERIAL_TXD_BIT); } while (0) #define SERIAL_SOFT_TXD_HI() do { SERIAL_SOFT_TXD_PORT |= (1<<SERIAL_SOFT_TXD_BIT); } while (0)
#define SERIAL_TXD_OFF() do { SERIAL_TXD_PORT |= (1<<SERIAL_TXD_BIT); } while (0) #define SERIAL_SOFT_TXD_LO() do { SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); } while (0)
#define SERIAL_TXD_INIT() do { \ #define SERIAL_SOFT_TXD_INIT() do { \
/* pin configuration: output */ \ /* pin configuration: output */ \
SERIAL_TXD_DDR |= (1<<SERIAL_TXD_BIT); \ SERIAL_SOFT_TXD_DDR |= (1<<SERIAL_SOFT_TXD_BIT); \
/* idle */ \ /* idle */ \
SERIAL_TXD_ON(); \ SERIAL_SOFT_TXD_ON(); \
} while (0) } while (0)
#endif #endif

98
protocol/serial_soft.c
View File

@ -43,12 +43,32 @@ POSSIBILITY OF SUCH DAMAGE.
/* /*
* Stupid Inefficient Busy-wait Software Serial * 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 */ /* debug for signal timing, see debug pin with oscilloscope */
#define SERIAL_SOFT_DEBUG
#ifdef SERIAL_SOFT_DEBUG #ifdef SERIAL_SOFT_DEBUG
#define SERIAL_SOFT_DEBUG_INIT() (DDRD |= 1<<7) #define SERIAL_SOFT_DEBUG_INIT() (DDRD |= 1<<7)
#define SERIAL_SOFT_DEBUG_TGL() (PORTD ^= 1<<7) #define SERIAL_SOFT_DEBUG_TGL() (PORTD ^= 1<<7)
@ -62,8 +82,8 @@ void serial_init(void)
{ {
SERIAL_SOFT_DEBUG_INIT(); SERIAL_SOFT_DEBUG_INIT();
SERIAL_RXD_INIT(); SERIAL_SOFT_RXD_INIT();
SERIAL_TXD_INIT(); SERIAL_SOFT_TXD_INIT();
} }
/* RX ring buffer */ /* 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 */ /* 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; uint8_t mask = 0x80;
#else #else
uint8_t mask = 0x01; uint8_t mask = 0x01;
#endif #endif
#ifdef SERIAL_PARITY_ODD
uint8_t parity = 1;
#elif defined(SERIAL_PARITY_EVEN)
uint8_t parity = 0; uint8_t parity = 0;
#endif
/* start bit */ /* start bit */
SERIAL_TXD_OFF(); SERIAL_SOFT_TXD_OFF();
_delay_us(WAIT_US-2); _delay_us(WAIT_US);
while (mask) { while (mask) {
if (data&mask) { if (data&mask) {
SERIAL_TXD_ON(); SERIAL_SOFT_TXD_ON();
#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
parity ^= 1; parity ^= 1;
#endif
} else { } 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; mask >>= 1;
#else #else
mask <<= 1; mask <<= 1;
#endif #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 */ /* to center of parity bit */
if (parity) { if (parity != SERIAL_SOFT_PARITY_VAL) {
SERIAL_TXD_ON(); SERIAL_SOFT_TXD_ON();
} else { } else {
SERIAL_TXD_OFF(); SERIAL_SOFT_TXD_OFF();
} }
_delay_us(WAIT_US-2); _delay_us(WAIT_US);
#endif #endif
/* stop bit */ /* stop bit */
SERIAL_TXD_ON(); SERIAL_SOFT_TXD_ON();
_delay_us(WAIT_US-2); _delay_us(WAIT_US);
} }
/* detect edge of start bit */ /* detect edge of start bit */
ISR(SERIAL_RXD_VECT) ISR(SERIAL_SOFT_RXD_VECT)
{ {
SERIAL_SOFT_DEBUG_TGL() SERIAL_SOFT_DEBUG_TGL();
SERIAL_RXD_INT_ENTER() SERIAL_SOFT_RXD_INT_ENTER()
uint8_t data = 0; uint8_t data = 0;
#ifdef SERIAL_BIT_ORDER_MSB #ifdef SERIAL_SOFT_BIT_ORDER_MSB
uint8_t mask = 0x80; uint8_t mask = 0x80;
#else #else
uint8_t mask = 0x01; uint8_t mask = 0x01;
#endif #endif
#ifdef SERIAL_PARITY_ODD
uint8_t parity = 0; uint8_t parity = 0;
#elif defined(SERIAL_PARITY_EVEN)
uint8_t parity = 1;
#endif
/* to center of start bit */ /* to center of start bit */
_delay_us(WAIT_US/2); _delay_us(WAIT_US/2);
SERIAL_SOFT_DEBUG_TGL() SERIAL_SOFT_DEBUG_TGL();
do { do {
/* to center of next bit */ /* to center of next bit */
_delay_us(WAIT_US); _delay_us(WAIT_US);
SERIAL_SOFT_DEBUG_TGL() SERIAL_SOFT_DEBUG_TGL();
if (SERIAL_RXD_READ()) { if (SERIAL_SOFT_RXD_IN()) {
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_SOFT_BIT_ORDER_MSB
mask >>= 1; mask >>= 1;
#else #else
mask <<= 1; mask <<= 1;
#endif #endif
} while (mask); } 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 */ /* to center of parity bit */
_delay_us(WAIT_US); _delay_us(WAIT_US);
if (SERIAL_RXD_READ()) { parity ^= 1; } if (SERIAL_SOFT_RXD_IN()) { parity ^= 1; }
SERIAL_SOFT_DEBUG_TGL() SERIAL_SOFT_DEBUG_TGL();
#endif #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 defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD)
if (parity && next != rbuf_tail) { if ((parity == SERIAL_SOFT_PARITY_VAL) && next != rbuf_tail) {
#else #else
if (next != rbuf_tail) { if (next != rbuf_tail) {
#endif #endif
@ -211,6 +219,6 @@ ISR(SERIAL_RXD_VECT)
rbuf_head = next; rbuf_head = next;
} }
SERIAL_RXD_INT_EXIT(); SERIAL_SOFT_RXD_INT_EXIT();
SERIAL_SOFT_DEBUG_TGL() SERIAL_SOFT_DEBUG_TGL();
} }