From 220e6cd50b70c1b3a591601e6eccac9bb99e0e90 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sat, 1 Jan 2011 09:32:55 +0000 Subject: [PATCH] Add the debugger settings to the MSP430X IAR demo directory. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1201 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h | 18 ++--- .../MSP-EXP430F5438_HAL/hal_board.c | 54 +++++++-------- Demo/MSP430X_MSP430F5438_IAR/serial.c | 7 -- .../settings/RTOSDemo.dbgdt | 63 +++++++++++++++++ .../settings/RTOSDemo.dni | 69 +++++++++++++++++++ .../settings/RTOSDemo.wsdt | 67 ++++++++++++++++++ 6 files changed, 232 insertions(+), 46 deletions(-) create mode 100644 Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt create mode 100644 Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni create mode 100644 Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt diff --git a/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h b/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h index 7fa5fde0c..c1baa94ff 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h +++ b/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_MSP-EXP430F5438.h @@ -2,26 +2,26 @@ Filename: hal_MSP-EXP430F5438.h Copyright 2010 Texas Instruments, Inc. - + This is the master header file and also the only necessary file to be included -in order to use MSP-EXP430F5438 HAL. +in order to use MSP-EXP430F5438 HAL. ***************************************************************************/ #ifndef HAL_MSP_EXP430F5438_H #define HAL_MSP_EXP430F5438_H -#include "msp430.h" +#include "msp430.h" -#include "hal_PMM.h" +//#include "hal_PMM.h" #include "hal_UCS.h" #include "hal_lcd.h" #include "hal_buttons.h" -#include "hal_adc.h" +//#include "hal_adc.h" #include "hal_board.h" -#include "hal_usb.h" +//#include "hal_usb.h" #include "hal_buttons.h" -#include "hal_rf.h" -#include "hal_rtc.h" -#include "hal_tlv.h" +//#include "hal_rf.h" +//#include "hal_rtc.h" +//#include "hal_tlv.h" #endif /* HAL_MSP_EXP430F5438_H */ diff --git a/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_board.c b/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_board.c index ff4c94084..f44d7409a 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_board.c +++ b/Demo/MSP430X_MSP430F5438_IAR/MSP-EXP430F5438_HAL/hal_board.c @@ -1,74 +1,68 @@ -/** +/** * @file hal_board.c - * + * * Copyright 2010 Texas Instruments, Inc. ******************************************************************************/ #include "msp430.h" #include "hal_MSP-EXP430F5438.h" /**********************************************************************//** - * @brief Initializes ACLK, MCLK, SMCLK outputs on P11.0, P11.1, + * @brief Initializes ACLK, MCLK, SMCLK outputs on P11.0, P11.1, * and P11.2, respectively. - * + * * @param none - * + * * @return none *************************************************************************/ void halBoardOutputSystemClock(void) //outputs clock to testpoints { CLK_PORT_DIR |= 0x07; - CLK_PORT_SEL |= 0x07; + CLK_PORT_SEL |= 0x07; } /**********************************************************************//** * @brief Stops the output of ACLK, MCLK, SMCLK on P11.0, P11.1, and P11.2. - * + * * @param none - * + * * @return none *************************************************************************/ void halBoardStopOutputSystemClock(void) -{ +{ CLK_PORT_OUT &= ~0x07; CLK_PORT_DIR |= 0x07; - CLK_PORT_SEL &= ~0x07; + CLK_PORT_SEL &= ~0x07; } /**********************************************************************//** - * @brief Initializes all GPIO configurations. - * + * @brief Initializes all GPIO configurations. + * * @param none - * + * * @return none *************************************************************************/ void halBoardInit(void) -{ +{ //Tie unused ports PAOUT = 0; - PADIR = 0xFFFF; + PADIR = 0xFFFF; PASEL = 0; - PBOUT = 0; + PBOUT = 0; PBDIR = 0xFFFF; PBSEL = 0; - PCOUT = 0; + PCOUT = 0; PCDIR = 0xFFFF; - PCSEL = 0; - PDOUT = 0; + PCSEL = 0; + PDOUT = 0; PDDIR = 0xFFFF; - PDSEL = 0x0003; - PEOUT = 0; - PEDIR = 0xFEFF; // P10.0 to USB RST pin, + PDSEL = 0x0003; + PEOUT = 0; + PEDIR = 0xFEFF; // P10.0 to USB RST pin, // ...if enabled with J5 - PESEL = 0; + PESEL = 0; P11OUT = 0; P11DIR = 0xFF; - PJOUT = 0; + PJOUT = 0; PJDIR = 0xFF; P11SEL = 0; - - AUDIO_PORT_OUT = AUDIO_OUT_PWR_PIN ; - USB_PORT_DIR &= ~USB_PIN_RXD; // USB RX Pin, Input with - // ...pulled down Resistor - USB_PORT_OUT &= ~USB_PIN_RXD; - USB_PORT_REN |= USB_PIN_RXD; } diff --git a/Demo/MSP430X_MSP430F5438_IAR/serial.c b/Demo/MSP430X_MSP430F5438_IAR/serial.c index f5084bb6c..3e861f2f2 100644 --- a/Demo/MSP430X_MSP430F5438_IAR/serial.c +++ b/Demo/MSP430X_MSP430F5438_IAR/serial.c @@ -70,9 +70,6 @@ /* Demo application includes. */ #include "serial.h" -/* HAL includes. */ -#include "hal_usb.h" - /* Constants required to setup the hardware. */ #define serTX_AND_RX ( ( unsigned portCHAR ) 0x03 ) @@ -102,10 +99,6 @@ unsigned portLONG ulBaudRateCount; xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) ); - USB_PORT_SEL |= USB_PIN_RXD + USB_PIN_TXD; - USB_PORT_DIR |= USB_PIN_TXD; - USB_PORT_DIR &= ~USB_PIN_RXD; - /* Reset UART. */ UCA1CTL1 |= UCSWRST; diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt new file mode 100644 index 000000000..f81cb106b --- /dev/null +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt @@ -0,0 +1,63 @@ + + + + + + + + + 300201622 + + + + + + 20121632481300Debug-Log + + + + + + + 247272727 + + + + + + 200111 + 20030010{W}Watch-0:TA1CTL4{W}Watch-0:ulSP_PC_Combined4300134139124100300Debug-Log300200100100100100100100150110$PROJ_DIR$\TermIOInput.txt1030015015030030000 + + + + + + + + TabID-11539-27703 + Workspace + Workspace + + + RTOSDemo + + + + 0TabID-12395-27916Terminal I/OTerminalIO0TabID-25408-8444TasksTASKVIEW0 + + + + + + TextEditor$WS_DIR$\MSP-EXP430F5438_HAL\hal_lcd.c08092798127996TextEditor$WS_DIR$\main.c03531383413834TextEditor$WS_DIR$\..\..\Source\queue.c04511934519345TextEditor$WS_DIR$\FreeRTOSConfig.h05439213921TextEditor$WS_DIR$\lnk430F5438A_mod.xcl017750815081TextEditor$WS_DIR$\..\..\Source\tasks.c015905021850218TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c01637271727160100000010000001 + + + + + + + iaridepm.enu1430fet1debuggergui.enu1-2-2532321-2-212115072024152749192262543788-2-2532399-2-212115072024152749238690543788-2-23821682-2-216843841002381391039119048203666 + + + + diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni new file mode 100644 index 000000000..a2dda48c2 --- /dev/null +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni @@ -0,0 +1,69 @@ +[DebugChecksum] +Checksum=-802929519 +[DisAssemblyWindow] +NumStates=_ 1 +State 1=_ 1 +[InstructionProfiling] +Enabled=_ 0 +[CodeCoverage] +Enabled=_ 0 +[State Storage] +Control Register=0 +[Sequencer] +Control Register=0 +NextState0=0 +NextState1=0 +[Action Register] +Break=1 +State Storage=0 +[Profiling] +Enabled=0 +[StackPlugin] +Enabled=0 +OverflowWarningsEnabled=1 +WarningThreshold=90 +SpWarningsEnabled=0 +WarnHow=0 +UseTrigger=1 +TriggerName=main +LimitSize=0 +ByteLimit=50 +[TermIOLog] +LoggingEnabled=_ 0 +LogFile=_ "" +[CallStackLog] +Enabled=0 +[DriverProfiling] +Enabled=0 +Mode=303237632 +Graph=0 +Symbiont=0 +[Log file] +LoggingEnabled=_ 0 +LogFile=_ "" +Category=_ 0 +[Breakpoints] +Count=0 +[FET] +Clock mode=14 +Extended Clock mode=4047 +Secure Password= +Extended Clock Control Enable=1 +Advanced Extended Clock Control=0 +Emulation mode=0 +Free running=0 +Shutting Down=1 +[Memory Dump] +Start address= +Lenghth= +Address info=0 +Format=0 +Dump registers=0 +PC=0 +SP=0 +SR=0 +all registers=0 +File name= +[Aliases] +Count=0 +SuppressDialog=0 diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt new file mode 100644 index 000000000..1d55954a9 --- /dev/null +++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt @@ -0,0 +1,67 @@ + + + + + + RTOSDemo/Release + + + + + + + + + 401272727 + + + + + + + 20121632481 + + 18162458082994 + + + + + + + TabID-18858-27566 + Workspace + Workspace + + + RTOSDemoRTOSDemo/F5XX_6XX_Core_LibRTOSDemo/MSP-EXP430F5438_HALRTOSDemo/OutputRTOSDemo/UserExperienceDemo + + + + 0 + + + TabID-25947-27638 + Build + Build + + + TabID-5978-12679Debug LogDebug-LogTabID-22019-23227Find in FilesFind-in-Files + + 0 + + + + + + TextEditor$WS_DIR$\MSP-EXP430F5438_HAL\hal_lcd.c08092798127996TextEditor$WS_DIR$\main.c03531383413834TextEditor$WS_DIR$\..\..\Source\queue.c04511934519345TextEditor$WS_DIR$\FreeRTOSConfig.h05439213921TextEditor$WS_DIR$\lnk430F5438A_mod.xcl017750815081TextEditor$WS_DIR$\..\..\Source\tasks.c015905021850218TextEditor$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c016372717271TextEditor$WS_DIR$\MSP-EXP430F5438_HAL\hal_MSP-EXP430F5438.h00669669TextEditor$WS_DIR$\MSP-EXP430F5438_HAL\hal_board.c04417251725TextEditor$WS_DIR$\serial.c0834515451590100000010000001 + + + + + + + iaridepm.enu1-2-2645475-2-2331267197024271894283929658859-2-22931682-2-216842951002381300407197024271894 + + + + -- 2.39.5