ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfixes with the protocol.

Browse source 
- Bitmasks need to be equal, not just result in non-zero
 - Only read status once in case it changes under us
 - Logical and not binary and when checking for acks on sending
 - We need to stop the bus when receiving the last byte
 - Force the bus into idle mode when we are Initing
This commit is contained in:
Michael Janssen 2013-08-06 23:33:06 -05:00
parent d557744503
commit 6dd0447c12
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h
View file

@ -184,8 +184,11 @@
static inline void TWI_Init(TWI_t *twi, const uint8_t Baud) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
static inline void TWI_Init(TWI_t *twi, const uint8_t Baud)
{
twi->CTRL = 0x00;
twi->MASTER.BAUD = Baud;
twi->MASTER.CTRLA |= TWI_MASTER_ENABLE_bm;
twi->MASTER.CTRLA = TWI_MASTER_ENABLE_bm;
twi->MASTER.CTRLB = 0;
twi->MASTER.STATUS = TWI_MASTER_BUSSTATE_IDLE_gc;
}
/** Turns off the TWI driver hardware. If this is called, any further TWI operations will require a call to
@ -206,7 +209,7 @@
static inline void TWI_StopTransmission(TWI_t *twi) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
static inline void TWI_StopTransmission(TWI_t *twi)
{
twi->MASTER.CTRLC = TWI_MASTER_CMD_STOP_gc;
twi->MASTER.CTRLC = TWI_MASTER_ACKACT_bm | TWI_MASTER_CMD_STOP_gc;
}
/* Function Prototypes: */