Fix library inludes in demo code

source/test/LaunchPad_trx_demo.c

@@ -41,15 +41,15 @@
  *
  *******************************************************************************/
 
-#include <cc1x_utils.h>
+#include <lib/radio_drv/cc1x_utils.h>
 #include "stdio.h"
 #include "stdlib.h"
 #include "msp430.h"
-#include "hal_timer.h"
+#include "lib/hal_mcu/hal_timer.h"
 #include "LaunchPad_trx_demo.h"
-#include "uart_drv.h"
-#include "hal_spi_rf.h"
-#include "radio_drv.h"
+#include "lib/uart_drv/uart_drv.h"
+#include "lib/radio_drv/hal_spi_rf.h"
+#include "lib/radio_drv/radio_drv.h"
 
 /******************************************************************************
  * DEFINES - define the system ID and channel hopping scheme
@@ -680,7 +680,7 @@ void rx_ber_fhss(unsigned char *txBuffer, trx_cfg_struct *trx_cfg)
 
 	uartSendString("\n\r");
 	uartSendString("Perform RF burst receive function with frequency hopping\n\r");
-#endif   
+#endif
 
 	// Generate the frequency hopping sequence table that we will be using
 	generate_hopping_table(chan_hop_seq, MAX_HOP_CHANNELS );
@@ -833,7 +833,7 @@ void rx_ber_fhss(unsigned char *txBuffer, trx_cfg_struct *trx_cfg)
 				curr_pkt_id = (txBuffer[1]<<8) + txBuffer[2];
 				ee_printf("N: %d %d %i %d %d\n\r", channel_index, chan_hop_seq[channel_index],
 						curr_pkt_id, rssi, freq_error);
-#endif          
+#endif
 			}
 			else
 			{
@@ -851,7 +851,7 @@ void rx_ber_fhss(unsigned char *txBuffer, trx_cfg_struct *trx_cfg)
 				}
 #if ENABLE_DEBUG_UART == TRUE
 				ee_printf("M:%d %d\n\r", channel_index, chan_hop_seq[channel_index]);
-#endif         
+#endif
 			}
 		}
 		// Check to see if the user button has been pressed, exit the rx_ber()
@@ -1383,4 +1383,3 @@ unsigned char str_to_data(char *str, unsigned int *data, unsigned char length)
 	}
 	return cc;
 }
-

source/test/LaunchPad_trx_main.c

@@ -43,10 +43,10 @@
  */
 #include "msp430.h"
 #include "stdio.h"
-#include "radio_drv.h"
-#include "cc1x_utils.h"
-#include "hal_spi_rf.h"
-#include "uart_drv.h"
+#include "lib/radio_drv/radio_drv.h"
+#include "lib/radio_drv/cc1x_utils.h"
+#include "lib/radio_drv/hal_spi_rf.h"
+#include "lib/uart_drv/uart_drv.h"
 #include "LaunchPad_trx_demo.h"
 
 /******************************************************************************
@@ -105,10 +105,10 @@ void main (void)
 	msp_setup();
 
 	/* Initialize the UART port */
-	hal_uart_init();
+	//hal_uart_init();
 
 	/* enable uart echo function */
-	uart_drv_toggle_echo();
+	//uart_drv_toggle_echo();
 
 	/* initialize the radio subsystem */
 	trx_cfg.bit_rate = radio_init(1);
@@ -277,7 +277,7 @@ void main (void)
 			break;
 		}
 	}
-}  
+}
 
 
 /******************************************************************************