len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-06-05 20:09:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Continue work on the MSP430X demo - still a work in progress.

Browse source
This commit is contained in:
Richard Barry 2010-12-31 17:54:29 +00:00
parent ae6380f70b
commit b54a5232c6
4 changed files with 25 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
View file

@ -69,10 +69,10 @@
#define configUSE_PREEMPTION 1 #define configUSE_PREEMPTION 1
#define configUSE_IDLE_HOOK 1 #define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 1 #define configUSE_TICK_HOOK 1
#define configCPU_CLOCK_HZ ( 8000000UL ) #define configCPU_CLOCK_HZ ( 16000000UL )
#define configTICK_RATE_HZ ( ( portTickType ) 1000 ) #define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 ) #define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 60 ) #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 70 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 10 * 1024 ) ) #define configTOTAL_HEAP_SIZE ( ( size_t ) ( 10 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 16 ) #define configMAX_TASK_NAME_LEN ( 16 )
#define configUSE_TRACE_FACILITY 0 #define configUSE_TRACE_FACILITY 0

2
Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
View file

@ -710,7 +710,7 @@
</option> </option>
<option> <option>
<name>SuppressDiags</name> <name>SuppressDiags</name>
<state></state> <state>w6</state>
</option> </option>
<option> <option>
<name>TreatAsWarn</name> <name>TreatAsWarn</name>

3
Demo/MSP430X_MSP430F5438_IAR/main.c
View file

@ -335,7 +335,8 @@ void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName
void vApplicationIdleHook( void ) void vApplicationIdleHook( void )
{ {
__bis_SR_register( LPM3_bits + GIE ); /* Want to leave the SMCLK running so the COMTest tasks don't fail. */
__bis_SR_register( LPM1_bits + GIE );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

77
Demo/MSP430X_MSP430F5438_IAR/serial.c
View file

@ -102,54 +102,31 @@ unsigned portLONG ulBaudRateCount;
xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );
#if 0 USB_PORT_SEL |= USB_PIN_RXD + USB_PIN_TXD;
USB_PORT_DIR |= USB_PIN_TXD;
USB_PORT_DIR &= ~USB_PIN_RXD;
/* Reset UART. */ /* Reset UART. */
UCA0CTL1 |= UCSWRST; UCA1CTL1 |= UCSWRST;
/* Use SMCLK. */ /* Use SMCLK. */
UCA0CTL1 = UCSSEL0 | UCSSEL1; UCA1CTL1 = UCSSEL0 | UCSSEL1;
/* Setup baud rate low byte. */ /* Setup baud rate low byte. */
UCA0BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff ); UCA1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );
/* Setup baud rate high byte. */ /* Setup baud rate high byte. */
ulBaudRateCount >>= 8UL; ulBaudRateCount >>= 8UL;
UCA0BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff ); UCA1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );
/* UCLISTEN sets loopback mode! */ /* UCLISTEN sets loopback mode! */
UCA0STAT = UCLISTEN; UCA1STAT = UCLISTEN;
/* Clear interrupts. */
// UCA0IFG = 0;
/* Enable interrupts. */ /* Enable interrupts. */
UCA0IE |= UCRXIE; UCA1IE |= UCRXIE;
/* Take out of reset. */ /* Take out of reset. */
UCA0CTL1 &= ~UCSWRST; UCA1CTL1 &= ~UCSWRST;
#else
USB_PORT_SEL |= USB_PIN_RXD + USB_PIN_TXD;
USB_PORT_DIR |= USB_PIN_TXD;
USB_PORT_DIR &= ~USB_PIN_RXD;
UCA1CTL1 |= UCSWRST; //Reset State
UCA1CTL0 = UCMODE_0;
UCA1CTL0 &= ~UC7BIT; // 8bit char
UCA1CTL1 |= UCSSEL_2;
// UCA1BR0 = 16; // 8Mhz/57600=138
// UCA1BR1 = 1;
/* Setup baud rate low byte. */
UCA0BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );
/* Setup baud rate high byte. */
ulBaudRateCount >>= 8UL;
UCA0BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );
UCA1MCTL = 0xE;
UCA1CTL1 &= ~UCSWRST;
UCA1IE |= UCRXIE;
#endif
} }
portEXIT_CRITICAL(); portEXIT_CRITICAL();
@ -180,60 +157,46 @@ signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOut
signed portBASE_TYPE xReturn; signed portBASE_TYPE xReturn;
xReturn = xQueueSend( xCharsForTx, &cOutChar, xBlockTime ); xReturn = xQueueSend( xCharsForTx, &cOutChar, xBlockTime );
UCA0IE |= UCTXIE; UCA1IE |= UCTXIE;
return xReturn; return xReturn;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
char cTxedBytes[ 512 ];
char cRxedBytes[ 512 ];
volatile int xIndex = 0;
volatile int xIndex2 = 0;
#pragma vector=USCI_A0_VECTOR #pragma vector=USCI_A1_VECTOR
static __interrupt void prvUSCI_A0_ISR( void ) static __interrupt void prvUSCI_A0_ISR( void )
{ {
signed portCHAR cChar; signed portCHAR cChar;
portBASE_TYPE xTaskWoken = pdFALSE; portBASE_TYPE xTaskWoken = pdFALSE;
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
while( UCA0IFG & UCRXIFG ) while( ( UCA1IFG & UCRXIFG ) != 0 )
{ {
/* Get the character from the UART and post it on the queue of Rxed /* Get the character from the UART and post it on the queue of Rxed
characters. */ characters. */
cChar = UCA0RXBUF; cChar = UCA1RXBUF;
if( xIndex2 < 500 )
{
cRxedBytes[ xIndex2++ ] = cChar;
}
xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken ); xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
} }
if( UCA0IFG & UCTXIFG ) /* If there is a Tx interrupt pending and the tx interrupts are enabled. */
if( ( UCA1IFG & UCTXIFG ) != 0 )
{ {
/* The previous character has been transmitted. See if there are any /* The previous character has been transmitted. See if there are any
further characters waiting transmission. */ further characters waiting transmission. */
if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWoken ) == pdTRUE ) if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWoken ) == pdTRUE )
{ {
if( xIndex < 500 )
{
cTxedBytes[ xIndex++ ] = cChar;
}
/* There was another character queued - transmit it now. */ /* There was another character queued - transmit it now. */
UCA0TXBUF = cChar; UCA1TXBUF = cChar;
} }
else else
{ {
/* There were no other characters to transmit - disable the Tx /* There were no other characters to transmit - disable the Tx
interrupt. */ interrupt. */
UCA0IE &= ~UCTXIE; UCA1IE &= ~UCTXIE;
} }
} }
__bic_SR_register_on_exit( SCG1 + SCG0 + OSCOFF + CPUOFF ); __bic_SR_register_on_exit( SCG1 + SCG0 + OSCOFF + CPUOFF );
portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); portYIELD_FROM_ISR( xHigherPriorityTaskWoken );
} }