Revision 1:1eb1eccc81c2, committed 2015-07-16

Comitter:

andreikovacs

Date:

Thu Jul 16 09:11:18 2015 +0000

Parent:

0:4eb2240dbd22

Child:

2:aaffc5d91884

Commit message:

Fixed build errors

Changed in this revision

--- a/Source/ConnectivityMenus.h	Thu Jul 16 07:29:15 2015 +0000
+++ b/Source/ConnectivityMenus.h	Thu Jul 16 09:11:18 2015 +0000
@@ -68,4 +68,4 @@
 * Interface functions prototypes
 *************************************************************************************
 ************************************************************************************/
-void PrintMenu(char * const pu8Menu[], uint8_t port);
+

--- a/Source/Connectivity_TestApp.cpp	Thu Jul 16 07:29:15 2015 +0000
+++ b/Source/Connectivity_TestApp.cpp	Thu Jul 16 09:11:18 2015 +0000
@@ -54,6 +54,7 @@
 #define gContTxModSelectOnes_c   ( 1 )
 #define gContTxModSelectZeros_c  ( 0 )
 #define SelfNotificationEvent()  mainTask->signal_set(gCTSelf_EVENT_c);
+#define ResetMCU()  NVIC_SystemReset()
 
 #define gUART_RX_EVENT_c         (1<<0)
 #define gMcps_Cnf_EVENT_c        (1<<1)
@@ -208,7 +209,6 @@
 void InitProject(void);
 void InitSmac(void);
 void main_task(void const *argument);
-extern void ResetMCU(void);
 void UartRxCallBack(void * param);
 void PrintMenu(char * const pu8Menu[], uint8_t port);
 
@@ -2315,7 +2315,7 @@
   }                                                                             
   else if(gTestModeContinuousTxModulated_c == mode)
   {
-    if(contTxModBitValue==gContTxModSelectOnes_c)
+    /*if(contTxModBitValue==gContTxModSelectOnes_c)
     {
       aspTestRequestMsg.msgData.aspTelecTest.mode = gTestContinuousTxModOne_c;
     }
@@ -2323,7 +2323,7 @@
     {
       aspTestRequestMsg.msgData.aspTelecTest.mode = gTestContinuousTxModZero_c;
     }
-    else if(contTxModBitValue == gContTxModSelectPN9_c)
+    else */if(contTxModBitValue == gContTxModSelectPN9_c)
     {
 #ifdef gPHY_802_15_4g_d
       aspTestRequestMsg.msgData.aspTelecTest.mode = gTestContinuousTxContPN9_c;
@@ -2387,7 +2387,6 @@
 *****************************************************************************/
 void UartRxCallBack(void * param) 
 {
-  uint16_t readBytes;
   gu8UartData = uart.getc();
   gTaskEventFlags |= gUART_RX_EVENT_c;
 }

--- a/Source/Connectivity_Test_Platform.h	Thu Jul 16 07:29:15 2015 +0000
+++ b/Source/Connectivity_Test_Platform.h	Thu Jul 16 09:11:18 2015 +0000
@@ -176,9 +176,15 @@
 * Public functions declarations
 *************************************************************************************
 ************************************************************************************/
-
+#ifdef __cplusplus
+extern "C" {
+#endif    
 extern void PrintMenu(char * const pu8Menu[], uint8_t port);
 /*common functions declarations which have platform dependent behavior*/
 extern void ShortCutsParser( uint8_t u8UartData );
 extern void InitApp_custom();
 extern void InitProject_custom();
+
+#ifdef __cplusplus
+} //extern "C" 
+#endif
\ No newline at end of file