Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msp430: fix i2c comments, and init of i2c EUSCI module #587

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

msp430: fix i2c comments, and init of i2c EUSCI module #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb199b7
msp430: twi: fix comments for i2c USCI module
alfh Mar 28, 2015
9cd03d8
msp430: twi: fix EUSCI init as slave, and fix comments for EUSCI module
alfh Mar 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions hardware/msp430/cores/msp430/twi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ void twi_init(void)
* Configure as I2C Slave.
* UCMODE_3 = I2C mode
* UCSYNC = Synchronous mode
* UCCLK = SMCLK
*/
UCB0CTL0 = UCMODE_3 | UCSYNC;
/*
Expand All @@ -189,16 +188,14 @@ void twi_init(void)
UCB0BR0 = (unsigned char)((F_CPU / TWI_FREQ) & 0xFF);
UCB0BR1 = (unsigned char)((F_CPU / TWI_FREQ) >> 8);

// Enable the USCI module
UCB0CTL1 &= ~(UCSWRST);

#if defined(__MSP430_HAS_USCI__)
/* Set I2C state change interrupt mask */
UCB0I2CIE |= (UCALIE|UCNACKIE|UCSTTIE|UCSTPIE);
/* Enable state change and TX/RX interrupts */
UC0IE |= UCB0RXIE | UCB0TXIE;
UCB0I2CIE |= (UCALIE|UCNACKIE|UCSTTIE|UCSTPIE); // Set I2C state change interrupt mask
UC0IE |= (UCB0RXIE | UCB0TXIE); // Enable TX/RX interrupts
#else
/* Set I2C state change interrupt mask and TX/RX interrupts */
UCB0IE |= (UCALIE|UCNACKIE|UCSTTIE|UCSTPIE|UCRXIE|UCTXIE);
UCB0IE |= (UCALIE|UCNACKIE|UCSTTIE|UCSTPIE|UCRXIE|UCTXIE); // Enable I2C interrupts
#endif

#endif
Expand All @@ -211,18 +208,13 @@ void twi_init(void)

//Configure Automatic STOP condition generation
UCB0CTLW1 &= ~UCASTP_3;
//UCB0CTLW1 |= autoSTOPGeneration;

//Byte Count Threshold
//UCB0TBCNT = byteCounterThreshold;
/*
* Configure as I2C master mode.
* UCMST = Master mode
* Configure as I2C slave
* UCMODE_3 = I2C mode
* UCSYNC = Synchronous mode
* UCCLK = SMCLK
*/
UCB0CTLW0 = UCMODE_3 | UCSSEL__SMCLK | UCSYNC | UCSWRST;
UCB0CTLW0 |= (UCMODE_3 | UCSYNC);

/*
* Compute the clock divider that achieves the fastest speed less than or
Expand All @@ -231,6 +223,8 @@ void twi_init(void)
* to the desired clock, never greater.
*/
UCB0BRW = (unsigned short)(F_CPU / 400000);

// Enable the USCI module
UCB0CTLW0 &= ~(UCSWRST);
UCB0IE |= (UCRXIE0|UCTXIE0|UCSTTIE|UCSTPIE); // Enable I2C interrupts
#endif
Expand Down Expand Up @@ -278,16 +272,16 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
#endif
#if defined(__MSP430_HAS_USCI__) || defined(__MSP430_HAS_USCI_B0__) || defined(__MSP430_HAS_USCI_B1__)
UCB0CTL1 = UCSWRST; // Enable SW reset
UCB0CTL1 |= (UCSSEL_2); // I2C Master, synchronous mode
UCB0CTL1 |= (UCSSEL_2); // SMCLK
UCB0CTL0 |= (UCMST | UCMODE_3 | UCSYNC); // I2C Master, synchronous mode
UCB0CTL1 &= ~(UCTR); // Configure in receive mode
UCB0I2CSA = address; // Set Slave Address
UCB0CTL1 &= ~UCSWRST; // Clear SW reset, resume operation
#ifdef __MSP430_HAS_USCI__
UCB0I2CIE |= (UCALIE|UCNACKIE|UCSTPIE); // Enable I2C interrupts
UC0IE |= (UCB0RXIE | UCB0TXIE); // Enable I2C interrupts
UCB0I2CIE |= (UCALIE|UCNACKIE|UCSTPIE); // Set I2C state change interrupt mask
UC0IE |= (UCB0RXIE | UCB0TXIE); // Enable TX/RX interrupts
#else
UCB0IE |= (UCALIE|UCNACKIE|UCSTPIE|UCRXIE|UCTXIE); // Enable I2C interrupts
UCB0IE |= (UCALIE|UCNACKIE|UCSTPIE|UCRXIE|UCTXIE); // Enable I2C interrupts
#endif
#endif
#ifdef __MSP430_HAS_EUSCI_B0__
Expand Down Expand Up @@ -390,10 +384,10 @@ uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait
UCB0I2CSA = address; // Set Slave Address
UCB0CTL1 &= ~UCSWRST; // Clear SW reset, resume operation
#ifdef __MSP430_HAS_USCI__
UCB0I2CIE |= (UCALIE|UCNACKIE|UCSTPIE); // Enable I2C interrupts
UC0IE |= UCB0TXIE; // Enable I2C interrupts
UCB0I2CIE |= (UCALIE|UCNACKIE|UCSTPIE); // Set I2C state change interrupt mask
UC0IE |= UCB0TXIE; // Enable TX interrupts
#else
UCB0IE |= (UCALIE|UCNACKIE|UCSTPIE|UCTXIE); // Enable I2C interrupts
UCB0IE |= (UCALIE|UCNACKIE|UCSTPIE|UCTXIE); // Enable I2C interrupts
#endif
#endif
#ifdef __MSP430_HAS_EUSCI_B0__
Expand Down