Change button port to avoid ISR Clash and use custom linking script

common.cmake

@@ -19,7 +19,7 @@ add_compile_options(
 
 # Linker scripts
 set(CMAKE_EXE_LINKER_FLAGS
-  "${CMAKE_EXE_LINKER_FLAGS} -T $ENV{MSP_GCC_ROOT}/include/msp430fr5994.ld ")
+  "${CMAKE_EXE_LINKER_FLAGS} -T ${CMAKE_SOURCE_DIR}/../msp430fr5994.ld ")
 
 # Add to search path for linker scripts (xx_symbols.ld, included by main linker script)
 link_directories(

source/lib/hal_mcu/hal_fr5_timer.c

@@ -283,7 +283,7 @@ unsigned int hal_timer_wait(unsigned int time) {
  * @return      void
  *
  */
-HAL_ISR_FUNC_DECLARATION(TIMER_A1,timer_a1_isr){
+HAL_ISR_FUNC_DECLARATION(timer_a1_isr,TIMER_A1){
 //#pragma vector=TIMERB1_VECTOR
 //__interrupt void TIMERB1_ISR(void) {
 

source/lib/radio_drv/cc1101_drv/cc1101_drv.c

@@ -845,8 +845,7 @@ int radio_freq_error(void) {
  * @return      void
  *
  */
-#pragma vector=RF_PORT_VECTOR
-__interrupt void radio_isr(void) {
+HAL_ISR_FUNC_DECLARATION(radio_isr,RF_PORT){
 
 	if(RF_GDO_PxIFG & RF_GDO_PIN) {
 

source/lib/radio_drv/hal_spi_rf_exp430fr5994.h

@@ -109,16 +109,16 @@ extern "C" {
 #define     RF_GDO_PIN             BIT7
 
 /* Optional button interrupt configuration */
-#define     BUTTON_VECTOR          PORT5_VECTOR
-#define     BUTTON_OUT             P5DIR
-#define     BUTTON_DIR             P5DIR
-#define     BUTTON_IN              P5IN
-#define     BUTTON_SEL             P5SEL
-#define     BUTTON_PxIES           P5IES
-#define     BUTTON_PxIFG           P5IFG
-#define     BUTTON_PxIE            P5IE
-#define     BUTTON_PIN             BIT5
-#define     BUTTON_REN             P5REN
+#define     BUTTON_VECTOR          PORT8_VECTOR
+#define     BUTTON_OUT             P8DIR
+#define     BUTTON_DIR             P8DIR
+#define     BUTTON_IN              P8IN
+#define     BUTTON_SEL             P8SEL
+#define     BUTTON_PxIES           P8IES
+#define     BUTTON_PxIFG           P8IFG
+#define     BUTTON_PxIE            P8IE
+#define     BUTTON_PIN             BIT1
+#define     BUTTON_REN             P1REN
 
 /* Macro to enable LEDs */
 #define     LED1_PxOUT      P1OUT

source/test/LaunchPad_trx_main.c

@@ -136,11 +136,12 @@ void main (void)
 	/* indicator that button has been pressed */
 	user_button_pushed = 0;
 
-	/* Infinite loop with a 1 second timer */
+	/* Infinite loop with a 0.5 second timer */
 	while(1)
 	{
 
 		/* Put MCU in low power mode, wait for UART and blink LED */
+		/* Or wait for WDT or button press */
 		HAL_LED2_OFF();
 		_BIS_SR(LPM0_bits + GIE);
 		HAL_LED2_ON();
@@ -155,7 +156,7 @@ void main (void)
 		}
 
 		/*
-		 * For each idle loop (1 second) a counter is incremented, if check to see
+		 * For each idle loop (0.5 second) a counter is incremented, if check to see
 		 * if we have had 60 idle loops, if so we enter a default action. This enables
 		 * the board to automatically start doing something (used for becoming a
 		 * reciever in a TX/RX BER system
@@ -294,10 +295,9 @@ void main (void)
  * @return      void
  *
  */
-#pragma vector=WDT_VECTOR
-__interrupt void wdt_isr (void)
+HAL_ISR_FUNC_DECLARATION(wdt_isr,WDT)
 {
-	/* global "1-second" counter used for printing time stamped packet sniffer data */
+	/* global "0.5 second" counter used for printing time stamped packet sniffer data */
 	time_counter++;
 
 	/* check to see if wake on wdt is enabled */
@@ -324,8 +324,7 @@ __interrupt void wdt_isr (void)
  * @return      void
  *
  */
-#pragma vector=BUTTON_VECTOR
-__interrupt void button_isr(void)
+HAL_ISR_FUNC_DECLARATION(button_isr,BUTTON)
 {
 	 /* reset the RF_GDO_PIN */
 	BUTTON_PxIFG &= ~BUTTON_PIN;