1
0
supperthomas 4 жил өмнө
parent
commit
3d72a6a1f5

+ 3 - 3
bsp/nrf51822/Libraries/CMSIS/Include/core_cm0.h

@@ -138,15 +138,15 @@
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 
-#elif defined ( __CSMC__ )		/* Cosmic */
-  #if ( __CSMC__ & 0x400)		// FPU present for parser
+#elif defined ( __CSMC__ )      /* Cosmic */
+  #if ( __CSMC__ & 0x400)       // FPU present for parser
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 #endif
 
 #include <stdint.h>                      /* standard types definitions                      */
 #include <core_cmInstr.h>                /* Core Instruction Access                         */
-#include <core_cmFunc.h>                 /* Core Function Access                            */ 
+#include <core_cmFunc.h>                 /* Core Function Access                            */
 
 #ifdef __cplusplus
 }

+ 1 - 1
bsp/nrf51822/Libraries/CMSIS/Include/core_cmInstr.h

@@ -523,7 +523,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE int32_t __REVSH(int32_t value
  */
 __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
 {
-  return (op1 >> op2) | (op1 << (32 - op2)); 
+  return (op1 >> op2) | (op1 << (32 - op2));
 }
 
 

+ 4 - 4
bsp/nrf51822/Libraries/nrf51822/Include/compiler_abstraction.h

@@ -74,7 +74,7 @@ POSSIBILITY OF SUCH DAMAGE.
         #define NRF_STATIC_ASSERT(cond, msg) \
             ;enum { NRF_STRING_CONCATENATE(static_assert_on_line_, __LINE__) = 1 / (!!(cond)) }
     #endif
-    
+
 #elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
 
     #ifndef __ASM
@@ -148,7 +148,7 @@ POSSIBILITY OF SUCH DAMAGE.
     #ifndef __UNUSED
         #define __UNUSED
     #endif
-    
+
     #define GET_SP()                __get_SP()
 
     #ifndef NRF_STATIC_ASSERT
@@ -174,7 +174,7 @@ POSSIBILITY OF SUCH DAMAGE.
     #endif
 
     #ifndef __PACKED
-        #define __PACKED           __attribute__((packed)) 
+        #define __PACKED           __attribute__((packed))
     #endif
 
     #ifndef __UNUSED
@@ -216,7 +216,7 @@ POSSIBILITY OF SUCH DAMAGE.
     #ifndef __ALIGN
         #define __ALIGN(n)          __align(n)
     #endif
-    
+
     /* Not defined for TASKING. */
     #ifndef __PACKED
         #define __PACKED

+ 5 - 5
bsp/nrf51822/Libraries/nrf51822/Include/nrf.h

@@ -34,11 +34,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #define NRF_H
 
 /* MDK version */
-#define MDK_MAJOR_VERSION   8 
-#define MDK_MINOR_VERSION   38 
-#define MDK_MICRO_VERSION   0 
+#define MDK_MAJOR_VERSION   8
+#define MDK_MINOR_VERSION   38
+#define MDK_MICRO_VERSION   0
+
 
-   
 /* Define coprocessor domains */
 #if defined (NRF5340_XXAA_APPLICATION) || defined (NRF5340_XXAA_NETWORK)
     #ifndef NRF5340_XXAA
@@ -112,7 +112,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* Define NRF91_SERIES for common use in nRF91 series devices. */
 #if defined (NRF9160_XXAA)
-    #ifndef NRF91_SERIES    
+    #ifndef NRF91_SERIES
         #define NRF91_SERIES
     #endif
 #endif

+ 8 - 8
bsp/nrf51822/Libraries/nrf51822/Include/nrf51.h

@@ -8,26 +8,26 @@
  * @version  V522
  * @date     26. August 2014
  *
- * @note     Generated with SVDConv V2.81d 
+ * @note     Generated with SVDConv V2.81d
  *           from CMSIS SVD File 'nRF51.xml' Version 522,
  *
  * @par      Copyright (c) 2013, Nordic Semiconductor ASA
  *           All rights reserved.
- *           
+ *
  *           Redistribution and use in source and binary forms, with or without
  *           modification, are permitted provided that the following conditions are met:
- *           
+ *
  *           * Redistributions of source code must retain the above copyright notice, this
  *           list of conditions and the following disclaimer.
- *           
+ *
  *           * Redistributions in binary form must reproduce the above copyright notice,
  *           this list of conditions and the following disclaimer in the documentation
  *           and/or other materials provided with the distribution.
- *           
+ *
  *           * Neither the name of Nordic Semiconductor ASA nor the names of its
  *           contributors may be used to endorse or promote products derived from
  *           this software without specific prior written permission.
- *           
+ *
  *           THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  *           AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *           IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -38,7 +38,7 @@
  *           CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  *           OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *           OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *           
+ *
  *
  *******************************************************************************************************/
 
@@ -1055,7 +1055,7 @@ typedef struct {                                    /*!< FICR Structure
   __I  uint32_t  PPFC;                              /*!< Pre-programmed factory code present.                                  */
   __I  uint32_t  RESERVED2;
   __I  uint32_t  NUMRAMBLOCK;                       /*!< Number of individualy controllable RAM blocks.                        */
-  
+
   union {
     __I  uint32_t  SIZERAMBLOCK[4];                 /*!< Deprecated array of size of RAM block in bytes. This name is
                                                          kept for backward compatinility purposes. Use SIZERAMBLOCKS

+ 351 - 351
bsp/nrf51822/Libraries/nrf51822/Include/nrf51_deprecated.h

@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /*lint ++flb "Enter library region */
 
-/* This file is given to prevent your SW from not compiling with the updates made to nrf51.h and 
+/* This file is given to prevent your SW from not compiling with the updates made to nrf51.h and
  * nrf51_bitfields.h. The macros defined in this file were available previously. Do not use these
  * macros on purpose. Use the ones defined in nrf51.h and nrf51_bitfields.h instead.
  */
@@ -44,399 +44,399 @@ POSSIBILITY OF SUCH DAMAGE.
 /* The register ERASEPROTECTEDPAGE is called ERASEPCR0 in the documentation. */
 #define ERASEPROTECTEDPAGE   ERASEPCR0
 
- 
+
 /* LPCOMP */
 /* The interrupt ISR was renamed. Adding old name to the macros. */
 #define LPCOMP_COMP_IRQHandler          LPCOMP_IRQHandler
 #define LPCOMP_COMP_IRQn                LPCOMP_IRQn
 /* Corrected typo in RESULT register. */
 #define LPCOMP_RESULT_RESULT_Bellow     LPCOMP_RESULT_RESULT_Below
- 
- 
+
+
 /* MPU */
 /* The field MPU.PERR0.LPCOMP_COMP was renamed. Added into deprecated in case somebody was using the macros defined for it. */
 #define MPU_PERR0_LPCOMP_COMP_Pos           MPU_PERR0_LPCOMP_Pos
 #define MPU_PERR0_LPCOMP_COMP_Msk           MPU_PERR0_LPCOMP_Msk
 #define MPU_PERR0_LPCOMP_COMP_InRegion1     MPU_PERR0_LPCOMP_InRegion1
 #define MPU_PERR0_LPCOMP_COMP_InRegion0     MPU_PERR0_LPCOMP_InRegion0
- 
- 
+
+
 /* POWER */
 /* The field POWER.RAMON.OFFRAM3 was eliminated. Added into deprecated in case somebody was using the macros defined for it. */
-#define POWER_RAMON_OFFRAM3_Pos         (19UL)                                  
-#define POWER_RAMON_OFFRAM3_Msk         (0x1UL << POWER_RAMON_OFFRAM3_Pos)      
-#define POWER_RAMON_OFFRAM3_RAM3Off     (0UL)                                   
-#define POWER_RAMON_OFFRAM3_RAM3On      (1UL)                                   
+#define POWER_RAMON_OFFRAM3_Pos         (19UL)
+#define POWER_RAMON_OFFRAM3_Msk         (0x1UL << POWER_RAMON_OFFRAM3_Pos)
+#define POWER_RAMON_OFFRAM3_RAM3Off     (0UL)
+#define POWER_RAMON_OFFRAM3_RAM3On      (1UL)
 /* The field POWER.RAMON.OFFRAM2 was eliminated. Added into deprecated in case somebody was using the macros defined for it. */
-#define POWER_RAMON_OFFRAM2_Pos         (18UL)                                  
-#define POWER_RAMON_OFFRAM2_Msk         (0x1UL << POWER_RAMON_OFFRAM2_Pos)      
-#define POWER_RAMON_OFFRAM2_RAM2Off     (0UL)                                   
-#define POWER_RAMON_OFFRAM2_RAM2On      (1UL)                                  
+#define POWER_RAMON_OFFRAM2_Pos         (18UL)
+#define POWER_RAMON_OFFRAM2_Msk         (0x1UL << POWER_RAMON_OFFRAM2_Pos)
+#define POWER_RAMON_OFFRAM2_RAM2Off     (0UL)
+#define POWER_RAMON_OFFRAM2_RAM2On      (1UL)
 /* The field POWER.RAMON.ONRAM3 was eliminated. Added into deprecated in case somebody was using the macros defined for it. */
-#define POWER_RAMON_ONRAM3_Pos          (3UL)                                  
-#define POWER_RAMON_ONRAM3_Msk          (0x1UL << POWER_RAMON_ONRAM3_Pos)      
-#define POWER_RAMON_ONRAM3_RAM3Off      (0UL)                                  
-#define POWER_RAMON_ONRAM3_RAM3On       (1UL)                                  
+#define POWER_RAMON_ONRAM3_Pos          (3UL)
+#define POWER_RAMON_ONRAM3_Msk          (0x1UL << POWER_RAMON_ONRAM3_Pos)
+#define POWER_RAMON_ONRAM3_RAM3Off      (0UL)
+#define POWER_RAMON_ONRAM3_RAM3On       (1UL)
 /* The field POWER.RAMON.ONRAM2 was eliminated. Added into deprecated in case somebody was using the macros defined for it. */
-#define POWER_RAMON_ONRAM2_Pos          (2UL)                                  
-#define POWER_RAMON_ONRAM2_Msk          (0x1UL << POWER_RAMON_ONRAM2_Pos)       
-#define POWER_RAMON_ONRAM2_RAM2Off      (0UL)                                  
-#define POWER_RAMON_ONRAM2_RAM2On       (1UL)                                 
+#define POWER_RAMON_ONRAM2_Pos          (2UL)
+#define POWER_RAMON_ONRAM2_Msk          (0x1UL << POWER_RAMON_ONRAM2_Pos)
+#define POWER_RAMON_ONRAM2_RAM2Off      (0UL)
+#define POWER_RAMON_ONRAM2_RAM2On       (1UL)
+
 
- 
 /* RADIO */
 /* The enumerated value RADIO.TXPOWER.TXPOWER.Neg40dBm was renamed. Added into deprecated with the new macro name. */
-#define RADIO_TXPOWER_TXPOWER_Neg40dBm  RADIO_TXPOWER_TXPOWER_Neg30dBm      
+#define RADIO_TXPOWER_TXPOWER_Neg40dBm  RADIO_TXPOWER_TXPOWER_Neg30dBm
 /* The name of the field SKIPADDR was corrected. Old macros added for compatibility. */
-#define RADIO_CRCCNF_SKIP_ADDR_Pos      RADIO_CRCCNF_SKIPADDR_Pos 
-#define RADIO_CRCCNF_SKIP_ADDR_Msk      RADIO_CRCCNF_SKIPADDR_Msk 
-#define RADIO_CRCCNF_SKIP_ADDR_Include  RADIO_CRCCNF_SKIPADDR_Include 
-#define RADIO_CRCCNF_SKIP_ADDR_Skip     RADIO_CRCCNF_SKIPADDR_Skip 
+#define RADIO_CRCCNF_SKIP_ADDR_Pos      RADIO_CRCCNF_SKIPADDR_Pos
+#define RADIO_CRCCNF_SKIP_ADDR_Msk      RADIO_CRCCNF_SKIPADDR_Msk
+#define RADIO_CRCCNF_SKIP_ADDR_Include  RADIO_CRCCNF_SKIPADDR_Include
+#define RADIO_CRCCNF_SKIP_ADDR_Skip     RADIO_CRCCNF_SKIPADDR_Skip
 /* The name of the field PLLLOCK was corrected. Old macros added for compatibility. */
-#define RADIO_TEST_PLL_LOCK_Pos         RADIO_TEST_PLLLOCK_Pos 
-#define RADIO_TEST_PLL_LOCK_Msk         RADIO_TEST_PLLLOCK_Msk 
-#define RADIO_TEST_PLL_LOCK_Disabled    RADIO_TEST_PLLLOCK_Disabled 
-#define RADIO_TEST_PLL_LOCK_Enabled     RADIO_TEST_PLLLOCK_Enabled 
+#define RADIO_TEST_PLL_LOCK_Pos         RADIO_TEST_PLLLOCK_Pos
+#define RADIO_TEST_PLL_LOCK_Msk         RADIO_TEST_PLLLOCK_Msk
+#define RADIO_TEST_PLL_LOCK_Disabled    RADIO_TEST_PLLLOCK_Disabled
+#define RADIO_TEST_PLL_LOCK_Enabled     RADIO_TEST_PLLLOCK_Enabled
 /* The name of the field CONSTCARRIER was corrected. Old macros added for compatibility. */
-#define RADIO_TEST_CONST_CARRIER_Pos        RADIO_TEST_CONSTCARRIER_Pos 
-#define RADIO_TEST_CONST_CARRIER_Msk        RADIO_TEST_CONSTCARRIER_Msk 
-#define RADIO_TEST_CONST_CARRIER_Disabled   RADIO_TEST_CONSTCARRIER_Disabled 
-#define RADIO_TEST_CONST_CARRIER_Enabled    RADIO_TEST_CONSTCARRIER_Enabled 
+#define RADIO_TEST_CONST_CARRIER_Pos        RADIO_TEST_CONSTCARRIER_Pos
+#define RADIO_TEST_CONST_CARRIER_Msk        RADIO_TEST_CONSTCARRIER_Msk
+#define RADIO_TEST_CONST_CARRIER_Disabled   RADIO_TEST_CONSTCARRIER_Disabled
+#define RADIO_TEST_CONST_CARRIER_Enabled    RADIO_TEST_CONSTCARRIER_Enabled
 
 
 /* FICR */
 /* The registers FICR.SIZERAMBLOCK0, FICR.SIZERAMBLOCK1, FICR.SIZERAMBLOCK2 and FICR.SIZERAMBLOCK3 were renamed into an array. */
-#define SIZERAMBLOCK0   SIZERAMBLOCKS                   
-#define SIZERAMBLOCK1   SIZERAMBLOCKS                   
+#define SIZERAMBLOCK0   SIZERAMBLOCKS
+#define SIZERAMBLOCK1   SIZERAMBLOCKS
 #define SIZERAMBLOCK2   SIZERAMBLOCK[2]                 /*!< Note that this macro will disapear when SIZERAMBLOCK array is eliminated. SIZERAMBLOCK is a deprecated array. */
 #define SIZERAMBLOCK3   SIZERAMBLOCK[3]                 /*!< Note that this macro will disapear when SIZERAMBLOCK array is eliminated. SIZERAMBLOCK is a deprecated array. */
 /* The registers FICR.DEVICEID0 and FICR.DEVICEID1 were renamed into an array. */
-#define DEVICEID0       DEVICEID[0]                     
-#define DEVICEID1       DEVICEID[1]                     
+#define DEVICEID0       DEVICEID[0]
+#define DEVICEID1       DEVICEID[1]
 /* The registers FICR.ER0, FICR.ER1, FICR.ER2 and FICR.ER3 were renamed into an array. */
-#define ER0             ER[0]                           
-#define ER1             ER[1]                          
-#define ER2             ER[2]                       
-#define ER3             ER[3]                      
+#define ER0             ER[0]
+#define ER1             ER[1]
+#define ER2             ER[2]
+#define ER3             ER[3]
 /* The registers FICR.IR0, FICR.IR1, FICR.IR2 and FICR.IR3 were renamed into an array. */
-#define IR0             IR[0]                         
-#define IR1             IR[1]                         
-#define IR2             IR[2]                         
-#define IR3             IR[3]                          
+#define IR0             IR[0]
+#define IR1             IR[1]
+#define IR2             IR[2]
+#define IR3             IR[3]
 /* The registers FICR.DEVICEADDR0 and FICR.DEVICEADDR1 were renamed into an array. */
-#define DEVICEADDR0     DEVICEADDR[0]                  
-#define DEVICEADDR1     DEVICEADDR[1]                  
+#define DEVICEADDR0     DEVICEADDR[0]
+#define DEVICEADDR1     DEVICEADDR[1]
 
 
 /* PPI */
 /* The tasks PPI.TASKS_CHGxEN and PPI.TASKS_CHGxDIS were renamed into an array of structs. */
-#define TASKS_CHG0EN     TASKS_CHG[0].EN                    
-#define TASKS_CHG0DIS    TASKS_CHG[0].DIS                  
-#define TASKS_CHG1EN     TASKS_CHG[1].EN                    
-#define TASKS_CHG1DIS    TASKS_CHG[1].DIS                  
-#define TASKS_CHG2EN     TASKS_CHG[2].EN                   
-#define TASKS_CHG2DIS    TASKS_CHG[2].DIS                  
-#define TASKS_CHG3EN     TASKS_CHG[3].EN                    
-#define TASKS_CHG3DIS    TASKS_CHG[3].DIS                  
+#define TASKS_CHG0EN     TASKS_CHG[0].EN
+#define TASKS_CHG0DIS    TASKS_CHG[0].DIS
+#define TASKS_CHG1EN     TASKS_CHG[1].EN
+#define TASKS_CHG1DIS    TASKS_CHG[1].DIS
+#define TASKS_CHG2EN     TASKS_CHG[2].EN
+#define TASKS_CHG2DIS    TASKS_CHG[2].DIS
+#define TASKS_CHG3EN     TASKS_CHG[3].EN
+#define TASKS_CHG3DIS    TASKS_CHG[3].DIS
 /* The registers PPI.CHx_EEP and PPI.CHx_TEP were renamed into an array of structs. */
-#define CH0_EEP          CH[0].EEP                          
-#define CH0_TEP          CH[0].TEP                          
-#define CH1_EEP          CH[1].EEP                         
-#define CH1_TEP          CH[1].TEP                         
-#define CH2_EEP          CH[2].EEP                          
-#define CH2_TEP          CH[2].TEP                         
-#define CH3_EEP          CH[3].EEP                          
-#define CH3_TEP          CH[3].TEP                         
-#define CH4_EEP          CH[4].EEP                         
-#define CH4_TEP          CH[4].TEP                         
-#define CH5_EEP          CH[5].EEP                          
-#define CH5_TEP          CH[5].TEP                          
-#define CH6_EEP          CH[6].EEP                          
-#define CH6_TEP          CH[6].TEP                         
-#define CH7_EEP          CH[7].EEP                          
-#define CH7_TEP          CH[7].TEP                          
-#define CH8_EEP          CH[8].EEP                         
-#define CH8_TEP          CH[8].TEP                          
-#define CH9_EEP          CH[9].EEP                          
-#define CH9_TEP          CH[9].TEP                          
-#define CH10_EEP         CH[10].EEP                         
-#define CH10_TEP         CH[10].TEP                         
-#define CH11_EEP         CH[11].EEP                         
-#define CH11_TEP         CH[11].TEP                         
-#define CH12_EEP         CH[12].EEP                         
-#define CH12_TEP         CH[12].TEP                         
-#define CH13_EEP         CH[13].EEP                         
-#define CH13_TEP         CH[13].TEP                         
-#define CH14_EEP         CH[14].EEP                         
-#define CH14_TEP         CH[14].TEP                         
-#define CH15_EEP         CH[15].EEP                         
-#define CH15_TEP         CH[15].TEP                        
+#define CH0_EEP          CH[0].EEP
+#define CH0_TEP          CH[0].TEP
+#define CH1_EEP          CH[1].EEP
+#define CH1_TEP          CH[1].TEP
+#define CH2_EEP          CH[2].EEP
+#define CH2_TEP          CH[2].TEP
+#define CH3_EEP          CH[3].EEP
+#define CH3_TEP          CH[3].TEP
+#define CH4_EEP          CH[4].EEP
+#define CH4_TEP          CH[4].TEP
+#define CH5_EEP          CH[5].EEP
+#define CH5_TEP          CH[5].TEP
+#define CH6_EEP          CH[6].EEP
+#define CH6_TEP          CH[6].TEP
+#define CH7_EEP          CH[7].EEP
+#define CH7_TEP          CH[7].TEP
+#define CH8_EEP          CH[8].EEP
+#define CH8_TEP          CH[8].TEP
+#define CH9_EEP          CH[9].EEP
+#define CH9_TEP          CH[9].TEP
+#define CH10_EEP         CH[10].EEP
+#define CH10_TEP         CH[10].TEP
+#define CH11_EEP         CH[11].EEP
+#define CH11_TEP         CH[11].TEP
+#define CH12_EEP         CH[12].EEP
+#define CH12_TEP         CH[12].TEP
+#define CH13_EEP         CH[13].EEP
+#define CH13_TEP         CH[13].TEP
+#define CH14_EEP         CH[14].EEP
+#define CH14_TEP         CH[14].TEP
+#define CH15_EEP         CH[15].EEP
+#define CH15_TEP         CH[15].TEP
 /* The registers PPI.CHG0, PPI.CHG1, PPI.CHG2 and PPI.CHG3 were renamed into an array. */
-#define CHG0             CHG[0]                            
-#define CHG1             CHG[1]                            
-#define CHG2             CHG[2]                             
-#define CHG3             CHG[3]                           
+#define CHG0             CHG[0]
+#define CHG1             CHG[1]
+#define CHG2             CHG[2]
+#define CHG3             CHG[3]
 /* All bitfield macros for the CHGx registers therefore changed name. */
-#define PPI_CHG0_CH15_Pos       PPI_CHG_CH15_Pos            
-#define PPI_CHG0_CH15_Msk       PPI_CHG_CH15_Msk            
-#define PPI_CHG0_CH15_Excluded  PPI_CHG_CH15_Excluded       
-#define PPI_CHG0_CH15_Included  PPI_CHG_CH15_Included       
-#define PPI_CHG0_CH14_Pos       PPI_CHG_CH14_Pos            
-#define PPI_CHG0_CH14_Msk       PPI_CHG_CH14_Msk           
-#define PPI_CHG0_CH14_Excluded  PPI_CHG_CH14_Excluded       
-#define PPI_CHG0_CH14_Included  PPI_CHG_CH14_Included       
-#define PPI_CHG0_CH13_Pos       PPI_CHG_CH13_Pos            
-#define PPI_CHG0_CH13_Msk       PPI_CHG_CH13_Msk            
-#define PPI_CHG0_CH13_Excluded  PPI_CHG_CH13_Excluded      
-#define PPI_CHG0_CH13_Included  PPI_CHG_CH13_Included       
-#define PPI_CHG0_CH12_Pos       PPI_CHG_CH12_Pos            
-#define PPI_CHG0_CH12_Msk       PPI_CHG_CH12_Msk            
-#define PPI_CHG0_CH12_Excluded  PPI_CHG_CH12_Excluded       
-#define PPI_CHG0_CH12_Included  PPI_CHG_CH12_Included       
-#define PPI_CHG0_CH11_Pos       PPI_CHG_CH11_Pos            
-#define PPI_CHG0_CH11_Msk       PPI_CHG_CH11_Msk            
-#define PPI_CHG0_CH11_Excluded  PPI_CHG_CH11_Excluded       
-#define PPI_CHG0_CH11_Included  PPI_CHG_CH11_Included       
-#define PPI_CHG0_CH10_Pos       PPI_CHG_CH10_Pos            
-#define PPI_CHG0_CH10_Msk       PPI_CHG_CH10_Msk            
-#define PPI_CHG0_CH10_Excluded  PPI_CHG_CH10_Excluded       
-#define PPI_CHG0_CH10_Included  PPI_CHG_CH10_Included       
-#define PPI_CHG0_CH9_Pos        PPI_CHG_CH9_Pos             
-#define PPI_CHG0_CH9_Msk        PPI_CHG_CH9_Msk             
-#define PPI_CHG0_CH9_Excluded   PPI_CHG_CH9_Excluded        
-#define PPI_CHG0_CH9_Included   PPI_CHG_CH9_Included        
-#define PPI_CHG0_CH8_Pos        PPI_CHG_CH8_Pos             
-#define PPI_CHG0_CH8_Msk        PPI_CHG_CH8_Msk             
-#define PPI_CHG0_CH8_Excluded   PPI_CHG_CH8_Excluded        
-#define PPI_CHG0_CH8_Included   PPI_CHG_CH8_Included        
-#define PPI_CHG0_CH7_Pos        PPI_CHG_CH7_Pos             
-#define PPI_CHG0_CH7_Msk        PPI_CHG_CH7_Msk             
-#define PPI_CHG0_CH7_Excluded   PPI_CHG_CH7_Excluded        
-#define PPI_CHG0_CH7_Included   PPI_CHG_CH7_Included        
-#define PPI_CHG0_CH6_Pos        PPI_CHG_CH6_Pos             
-#define PPI_CHG0_CH6_Msk        PPI_CHG_CH6_Msk             
-#define PPI_CHG0_CH6_Excluded   PPI_CHG_CH6_Excluded        
-#define PPI_CHG0_CH6_Included   PPI_CHG_CH6_Included        
-#define PPI_CHG0_CH5_Pos        PPI_CHG_CH5_Pos             
-#define PPI_CHG0_CH5_Msk        PPI_CHG_CH5_Msk             
-#define PPI_CHG0_CH5_Excluded   PPI_CHG_CH5_Excluded       
-#define PPI_CHG0_CH5_Included   PPI_CHG_CH5_Included        
-#define PPI_CHG0_CH4_Pos        PPI_CHG_CH4_Pos             
-#define PPI_CHG0_CH4_Msk        PPI_CHG_CH4_Msk             
-#define PPI_CHG0_CH4_Excluded   PPI_CHG_CH4_Excluded       
-#define PPI_CHG0_CH4_Included   PPI_CHG_CH4_Included       
-#define PPI_CHG0_CH3_Pos        PPI_CHG_CH3_Pos             
-#define PPI_CHG0_CH3_Msk        PPI_CHG_CH3_Msk            
-#define PPI_CHG0_CH3_Excluded   PPI_CHG_CH3_Excluded        
-#define PPI_CHG0_CH3_Included   PPI_CHG_CH3_Included       
-#define PPI_CHG0_CH2_Pos        PPI_CHG_CH2_Pos            
-#define PPI_CHG0_CH2_Msk        PPI_CHG_CH2_Msk             
-#define PPI_CHG0_CH2_Excluded   PPI_CHG_CH2_Excluded       
-#define PPI_CHG0_CH2_Included   PPI_CHG_CH2_Included       
-#define PPI_CHG0_CH1_Pos        PPI_CHG_CH1_Pos            
-#define PPI_CHG0_CH1_Msk        PPI_CHG_CH1_Msk            
-#define PPI_CHG0_CH1_Excluded   PPI_CHG_CH1_Excluded        
-#define PPI_CHG0_CH1_Included   PPI_CHG_CH1_Included       
-#define PPI_CHG0_CH0_Pos        PPI_CHG_CH0_Pos            
-#define PPI_CHG0_CH0_Msk        PPI_CHG_CH0_Msk            
-#define PPI_CHG0_CH0_Excluded   PPI_CHG_CH0_Excluded        
-#define PPI_CHG0_CH0_Included   PPI_CHG_CH0_Included       
-#define PPI_CHG1_CH15_Pos       PPI_CHG_CH15_Pos           
-#define PPI_CHG1_CH15_Msk       PPI_CHG_CH15_Msk           
-#define PPI_CHG1_CH15_Excluded  PPI_CHG_CH15_Excluded       
-#define PPI_CHG1_CH15_Included  PPI_CHG_CH15_Included      
-#define PPI_CHG1_CH14_Pos       PPI_CHG_CH14_Pos           
-#define PPI_CHG1_CH14_Msk       PPI_CHG_CH14_Msk            
-#define PPI_CHG1_CH14_Excluded  PPI_CHG_CH14_Excluded      
-#define PPI_CHG1_CH14_Included  PPI_CHG_CH14_Included       
-#define PPI_CHG1_CH13_Pos       PPI_CHG_CH13_Pos           
-#define PPI_CHG1_CH13_Msk       PPI_CHG_CH13_Msk            
-#define PPI_CHG1_CH13_Excluded  PPI_CHG_CH13_Excluded      
-#define PPI_CHG1_CH13_Included  PPI_CHG_CH13_Included      
-#define PPI_CHG1_CH12_Pos       PPI_CHG_CH12_Pos            
-#define PPI_CHG1_CH12_Msk       PPI_CHG_CH12_Msk           
-#define PPI_CHG1_CH12_Excluded  PPI_CHG_CH12_Excluded      
-#define PPI_CHG1_CH12_Included  PPI_CHG_CH12_Included      
-#define PPI_CHG1_CH11_Pos       PPI_CHG_CH11_Pos            
-#define PPI_CHG1_CH11_Msk       PPI_CHG_CH11_Msk           
-#define PPI_CHG1_CH11_Excluded  PPI_CHG_CH11_Excluded      
-#define PPI_CHG1_CH11_Included  PPI_CHG_CH11_Included      
-#define PPI_CHG1_CH10_Pos       PPI_CHG_CH10_Pos           
-#define PPI_CHG1_CH10_Msk       PPI_CHG_CH10_Msk            
-#define PPI_CHG1_CH10_Excluded  PPI_CHG_CH10_Excluded      
-#define PPI_CHG1_CH10_Included  PPI_CHG_CH10_Included      
-#define PPI_CHG1_CH9_Pos        PPI_CHG_CH9_Pos            
-#define PPI_CHG1_CH9_Msk        PPI_CHG_CH9_Msk            
-#define PPI_CHG1_CH9_Excluded   PPI_CHG_CH9_Excluded       
-#define PPI_CHG1_CH9_Included   PPI_CHG_CH9_Included       
-#define PPI_CHG1_CH8_Pos        PPI_CHG_CH8_Pos            
-#define PPI_CHG1_CH8_Msk        PPI_CHG_CH8_Msk            
-#define PPI_CHG1_CH8_Excluded   PPI_CHG_CH8_Excluded       
-#define PPI_CHG1_CH8_Included   PPI_CHG_CH8_Included       
-#define PPI_CHG1_CH7_Pos        PPI_CHG_CH7_Pos             
-#define PPI_CHG1_CH7_Msk        PPI_CHG_CH7_Msk            
-#define PPI_CHG1_CH7_Excluded   PPI_CHG_CH7_Excluded        
-#define PPI_CHG1_CH7_Included   PPI_CHG_CH7_Included       
-#define PPI_CHG1_CH6_Pos        PPI_CHG_CH6_Pos             
-#define PPI_CHG1_CH6_Msk        PPI_CHG_CH6_Msk            
-#define PPI_CHG1_CH6_Excluded   PPI_CHG_CH6_Excluded       
-#define PPI_CHG1_CH6_Included   PPI_CHG_CH6_Included       
-#define PPI_CHG1_CH5_Pos        PPI_CHG_CH5_Pos             
-#define PPI_CHG1_CH5_Msk        PPI_CHG_CH5_Msk             
-#define PPI_CHG1_CH5_Excluded   PPI_CHG_CH5_Excluded       
-#define PPI_CHG1_CH5_Included   PPI_CHG_CH5_Included        
-#define PPI_CHG1_CH4_Pos        PPI_CHG_CH4_Pos             
-#define PPI_CHG1_CH4_Msk        PPI_CHG_CH4_Msk             
-#define PPI_CHG1_CH4_Excluded   PPI_CHG_CH4_Excluded        
-#define PPI_CHG1_CH4_Included   PPI_CHG_CH4_Included        
-#define PPI_CHG1_CH3_Pos        PPI_CHG_CH3_Pos            
-#define PPI_CHG1_CH3_Msk        PPI_CHG_CH3_Msk             
-#define PPI_CHG1_CH3_Excluded   PPI_CHG_CH3_Excluded        
-#define PPI_CHG1_CH3_Included   PPI_CHG_CH3_Included       
-#define PPI_CHG1_CH2_Pos        PPI_CHG_CH2_Pos            
-#define PPI_CHG1_CH2_Msk        PPI_CHG_CH2_Msk             
-#define PPI_CHG1_CH2_Excluded   PPI_CHG_CH2_Excluded        
-#define PPI_CHG1_CH2_Included   PPI_CHG_CH2_Included        
-#define PPI_CHG1_CH1_Pos        PPI_CHG_CH1_Pos             
-#define PPI_CHG1_CH1_Msk        PPI_CHG_CH1_Msk            
-#define PPI_CHG1_CH1_Excluded   PPI_CHG_CH1_Excluded        
-#define PPI_CHG1_CH1_Included   PPI_CHG_CH1_Included       
-#define PPI_CHG1_CH0_Pos        PPI_CHG_CH0_Pos             
-#define PPI_CHG1_CH0_Msk        PPI_CHG_CH0_Msk            
-#define PPI_CHG1_CH0_Excluded   PPI_CHG_CH0_Excluded       
-#define PPI_CHG1_CH0_Included   PPI_CHG_CH0_Included       
-#define PPI_CHG2_CH15_Pos       PPI_CHG_CH15_Pos           
-#define PPI_CHG2_CH15_Msk       PPI_CHG_CH15_Msk            
-#define PPI_CHG2_CH15_Excluded  PPI_CHG_CH15_Excluded      
-#define PPI_CHG2_CH15_Included  PPI_CHG_CH15_Included      
-#define PPI_CHG2_CH14_Pos       PPI_CHG_CH14_Pos           
-#define PPI_CHG2_CH14_Msk       PPI_CHG_CH14_Msk           
-#define PPI_CHG2_CH14_Excluded  PPI_CHG_CH14_Excluded       
-#define PPI_CHG2_CH14_Included  PPI_CHG_CH14_Included      
-#define PPI_CHG2_CH13_Pos       PPI_CHG_CH13_Pos           
-#define PPI_CHG2_CH13_Msk       PPI_CHG_CH13_Msk            
-#define PPI_CHG2_CH13_Excluded  PPI_CHG_CH13_Excluded       
-#define PPI_CHG2_CH13_Included  PPI_CHG_CH13_Included      
-#define PPI_CHG2_CH12_Pos       PPI_CHG_CH12_Pos            
-#define PPI_CHG2_CH12_Msk       PPI_CHG_CH12_Msk            
-#define PPI_CHG2_CH12_Excluded  PPI_CHG_CH12_Excluded      
-#define PPI_CHG2_CH12_Included  PPI_CHG_CH12_Included       
-#define PPI_CHG2_CH11_Pos       PPI_CHG_CH11_Pos           
-#define PPI_CHG2_CH11_Msk       PPI_CHG_CH11_Msk           
-#define PPI_CHG2_CH11_Excluded  PPI_CHG_CH11_Excluded       
-#define PPI_CHG2_CH11_Included  PPI_CHG_CH11_Included       
-#define PPI_CHG2_CH10_Pos       PPI_CHG_CH10_Pos            
-#define PPI_CHG2_CH10_Msk       PPI_CHG_CH10_Msk            
-#define PPI_CHG2_CH10_Excluded  PPI_CHG_CH10_Excluded      
-#define PPI_CHG2_CH10_Included  PPI_CHG_CH10_Included      
-#define PPI_CHG2_CH9_Pos        PPI_CHG_CH9_Pos            
-#define PPI_CHG2_CH9_Msk        PPI_CHG_CH9_Msk            
-#define PPI_CHG2_CH9_Excluded   PPI_CHG_CH9_Excluded        
-#define PPI_CHG2_CH9_Included   PPI_CHG_CH9_Included       
-#define PPI_CHG2_CH8_Pos        PPI_CHG_CH8_Pos            
-#define PPI_CHG2_CH8_Msk        PPI_CHG_CH8_Msk            
-#define PPI_CHG2_CH8_Excluded   PPI_CHG_CH8_Excluded       
-#define PPI_CHG2_CH8_Included   PPI_CHG_CH8_Included        
-#define PPI_CHG2_CH7_Pos        PPI_CHG_CH7_Pos            
-#define PPI_CHG2_CH7_Msk        PPI_CHG_CH7_Msk            
-#define PPI_CHG2_CH7_Excluded   PPI_CHG_CH7_Excluded       
-#define PPI_CHG2_CH7_Included   PPI_CHG_CH7_Included       
-#define PPI_CHG2_CH6_Pos        PPI_CHG_CH6_Pos            
-#define PPI_CHG2_CH6_Msk        PPI_CHG_CH6_Msk            
-#define PPI_CHG2_CH6_Excluded   PPI_CHG_CH6_Excluded       
-#define PPI_CHG2_CH6_Included   PPI_CHG_CH6_Included       
-#define PPI_CHG2_CH5_Pos        PPI_CHG_CH5_Pos            
-#define PPI_CHG2_CH5_Msk        PPI_CHG_CH5_Msk            
-#define PPI_CHG2_CH5_Excluded   PPI_CHG_CH5_Excluded       
-#define PPI_CHG2_CH5_Included   PPI_CHG_CH5_Included        
-#define PPI_CHG2_CH4_Pos        PPI_CHG_CH4_Pos             
-#define PPI_CHG2_CH4_Msk        PPI_CHG_CH4_Msk             
-#define PPI_CHG2_CH4_Excluded   PPI_CHG_CH4_Excluded        
-#define PPI_CHG2_CH4_Included   PPI_CHG_CH4_Included       
-#define PPI_CHG2_CH3_Pos        PPI_CHG_CH3_Pos            
-#define PPI_CHG2_CH3_Msk        PPI_CHG_CH3_Msk            
-#define PPI_CHG2_CH3_Excluded   PPI_CHG_CH3_Excluded       
-#define PPI_CHG2_CH3_Included   PPI_CHG_CH3_Included       
-#define PPI_CHG2_CH2_Pos        PPI_CHG_CH2_Pos            
-#define PPI_CHG2_CH2_Msk        PPI_CHG_CH2_Msk           
-#define PPI_CHG2_CH2_Excluded   PPI_CHG_CH2_Excluded       
-#define PPI_CHG2_CH2_Included   PPI_CHG_CH2_Included       
-#define PPI_CHG2_CH1_Pos        PPI_CHG_CH1_Pos             
-#define PPI_CHG2_CH1_Msk        PPI_CHG_CH1_Msk             
-#define PPI_CHG2_CH1_Excluded   PPI_CHG_CH1_Excluded       
-#define PPI_CHG2_CH1_Included   PPI_CHG_CH1_Included       
-#define PPI_CHG2_CH0_Pos        PPI_CHG_CH0_Pos            
-#define PPI_CHG2_CH0_Msk        PPI_CHG_CH0_Msk            
-#define PPI_CHG2_CH0_Excluded   PPI_CHG_CH0_Excluded       
-#define PPI_CHG2_CH0_Included   PPI_CHG_CH0_Included        
-#define PPI_CHG3_CH15_Pos       PPI_CHG_CH15_Pos           
-#define PPI_CHG3_CH15_Msk       PPI_CHG_CH15_Msk           
-#define PPI_CHG3_CH15_Excluded  PPI_CHG_CH15_Excluded     
-#define PPI_CHG3_CH15_Included  PPI_CHG_CH15_Included      
-#define PPI_CHG3_CH14_Pos       PPI_CHG_CH14_Pos          
-#define PPI_CHG3_CH14_Msk       PPI_CHG_CH14_Msk           
-#define PPI_CHG3_CH14_Excluded  PPI_CHG_CH14_Excluded      
-#define PPI_CHG3_CH14_Included  PPI_CHG_CH14_Included       
-#define PPI_CHG3_CH13_Pos       PPI_CHG_CH13_Pos           
-#define PPI_CHG3_CH13_Msk       PPI_CHG_CH13_Msk            
-#define PPI_CHG3_CH13_Excluded  PPI_CHG_CH13_Excluded      
-#define PPI_CHG3_CH13_Included  PPI_CHG_CH13_Included      
-#define PPI_CHG3_CH12_Pos       PPI_CHG_CH12_Pos            
-#define PPI_CHG3_CH12_Msk       PPI_CHG_CH12_Msk            
-#define PPI_CHG3_CH12_Excluded  PPI_CHG_CH12_Excluded       
-#define PPI_CHG3_CH12_Included  PPI_CHG_CH12_Included       
-#define PPI_CHG3_CH11_Pos       PPI_CHG_CH11_Pos            
-#define PPI_CHG3_CH11_Msk       PPI_CHG_CH11_Msk            
-#define PPI_CHG3_CH11_Excluded  PPI_CHG_CH11_Excluded      
-#define PPI_CHG3_CH11_Included  PPI_CHG_CH11_Included       
-#define PPI_CHG3_CH10_Pos       PPI_CHG_CH10_Pos            
-#define PPI_CHG3_CH10_Msk       PPI_CHG_CH10_Msk            
-#define PPI_CHG3_CH10_Excluded  PPI_CHG_CH10_Excluded      
-#define PPI_CHG3_CH10_Included  PPI_CHG_CH10_Included      
-#define PPI_CHG3_CH9_Pos        PPI_CHG_CH9_Pos            
-#define PPI_CHG3_CH9_Msk        PPI_CHG_CH9_Msk            
-#define PPI_CHG3_CH9_Excluded   PPI_CHG_CH9_Excluded       
-#define PPI_CHG3_CH9_Included   PPI_CHG_CH9_Included       
-#define PPI_CHG3_CH8_Pos        PPI_CHG_CH8_Pos            
-#define PPI_CHG3_CH8_Msk        PPI_CHG_CH8_Msk             
-#define PPI_CHG3_CH8_Excluded   PPI_CHG_CH8_Excluded       
-#define PPI_CHG3_CH8_Included   PPI_CHG_CH8_Included       
-#define PPI_CHG3_CH7_Pos        PPI_CHG_CH7_Pos             
-#define PPI_CHG3_CH7_Msk        PPI_CHG_CH7_Msk            
-#define PPI_CHG3_CH7_Excluded   PPI_CHG_CH7_Excluded        
-#define PPI_CHG3_CH7_Included   PPI_CHG_CH7_Included       
-#define PPI_CHG3_CH6_Pos        PPI_CHG_CH6_Pos             
-#define PPI_CHG3_CH6_Msk        PPI_CHG_CH6_Msk             
-#define PPI_CHG3_CH6_Excluded   PPI_CHG_CH6_Excluded       
-#define PPI_CHG3_CH6_Included   PPI_CHG_CH6_Included        
-#define PPI_CHG3_CH5_Pos        PPI_CHG_CH5_Pos             
-#define PPI_CHG3_CH5_Msk        PPI_CHG_CH5_Msk             
-#define PPI_CHG3_CH5_Excluded   PPI_CHG_CH5_Excluded        
-#define PPI_CHG3_CH5_Included   PPI_CHG_CH5_Included       
-#define PPI_CHG3_CH4_Pos        PPI_CHG_CH4_Pos             
-#define PPI_CHG3_CH4_Msk        PPI_CHG_CH4_Msk            
-#define PPI_CHG3_CH4_Excluded   PPI_CHG_CH4_Excluded        
-#define PPI_CHG3_CH4_Included   PPI_CHG_CH4_Included        
-#define PPI_CHG3_CH3_Pos        PPI_CHG_CH3_Pos             
-#define PPI_CHG3_CH3_Msk        PPI_CHG_CH3_Msk            
-#define PPI_CHG3_CH3_Excluded   PPI_CHG_CH3_Excluded        
-#define PPI_CHG3_CH3_Included   PPI_CHG_CH3_Included        
-#define PPI_CHG3_CH2_Pos        PPI_CHG_CH2_Pos             
-#define PPI_CHG3_CH2_Msk        PPI_CHG_CH2_Msk             
-#define PPI_CHG3_CH2_Excluded   PPI_CHG_CH2_Excluded        
-#define PPI_CHG3_CH2_Included   PPI_CHG_CH2_Included       
-#define PPI_CHG3_CH1_Pos        PPI_CHG_CH1_Pos             
-#define PPI_CHG3_CH1_Msk        PPI_CHG_CH1_Msk             
-#define PPI_CHG3_CH1_Excluded   PPI_CHG_CH1_Excluded        
-#define PPI_CHG3_CH1_Included   PPI_CHG_CH1_Included        
-#define PPI_CHG3_CH0_Pos        PPI_CHG_CH0_Pos             
-#define PPI_CHG3_CH0_Msk        PPI_CHG_CH0_Msk             
-#define PPI_CHG3_CH0_Excluded   PPI_CHG_CH0_Excluded        
-#define PPI_CHG3_CH0_Included   PPI_CHG_CH0_Included      
+#define PPI_CHG0_CH15_Pos       PPI_CHG_CH15_Pos
+#define PPI_CHG0_CH15_Msk       PPI_CHG_CH15_Msk
+#define PPI_CHG0_CH15_Excluded  PPI_CHG_CH15_Excluded
+#define PPI_CHG0_CH15_Included  PPI_CHG_CH15_Included
+#define PPI_CHG0_CH14_Pos       PPI_CHG_CH14_Pos
+#define PPI_CHG0_CH14_Msk       PPI_CHG_CH14_Msk
+#define PPI_CHG0_CH14_Excluded  PPI_CHG_CH14_Excluded
+#define PPI_CHG0_CH14_Included  PPI_CHG_CH14_Included
+#define PPI_CHG0_CH13_Pos       PPI_CHG_CH13_Pos
+#define PPI_CHG0_CH13_Msk       PPI_CHG_CH13_Msk
+#define PPI_CHG0_CH13_Excluded  PPI_CHG_CH13_Excluded
+#define PPI_CHG0_CH13_Included  PPI_CHG_CH13_Included
+#define PPI_CHG0_CH12_Pos       PPI_CHG_CH12_Pos
+#define PPI_CHG0_CH12_Msk       PPI_CHG_CH12_Msk
+#define PPI_CHG0_CH12_Excluded  PPI_CHG_CH12_Excluded
+#define PPI_CHG0_CH12_Included  PPI_CHG_CH12_Included
+#define PPI_CHG0_CH11_Pos       PPI_CHG_CH11_Pos
+#define PPI_CHG0_CH11_Msk       PPI_CHG_CH11_Msk
+#define PPI_CHG0_CH11_Excluded  PPI_CHG_CH11_Excluded
+#define PPI_CHG0_CH11_Included  PPI_CHG_CH11_Included
+#define PPI_CHG0_CH10_Pos       PPI_CHG_CH10_Pos
+#define PPI_CHG0_CH10_Msk       PPI_CHG_CH10_Msk
+#define PPI_CHG0_CH10_Excluded  PPI_CHG_CH10_Excluded
+#define PPI_CHG0_CH10_Included  PPI_CHG_CH10_Included
+#define PPI_CHG0_CH9_Pos        PPI_CHG_CH9_Pos
+#define PPI_CHG0_CH9_Msk        PPI_CHG_CH9_Msk
+#define PPI_CHG0_CH9_Excluded   PPI_CHG_CH9_Excluded
+#define PPI_CHG0_CH9_Included   PPI_CHG_CH9_Included
+#define PPI_CHG0_CH8_Pos        PPI_CHG_CH8_Pos
+#define PPI_CHG0_CH8_Msk        PPI_CHG_CH8_Msk
+#define PPI_CHG0_CH8_Excluded   PPI_CHG_CH8_Excluded
+#define PPI_CHG0_CH8_Included   PPI_CHG_CH8_Included
+#define PPI_CHG0_CH7_Pos        PPI_CHG_CH7_Pos
+#define PPI_CHG0_CH7_Msk        PPI_CHG_CH7_Msk
+#define PPI_CHG0_CH7_Excluded   PPI_CHG_CH7_Excluded
+#define PPI_CHG0_CH7_Included   PPI_CHG_CH7_Included
+#define PPI_CHG0_CH6_Pos        PPI_CHG_CH6_Pos
+#define PPI_CHG0_CH6_Msk        PPI_CHG_CH6_Msk
+#define PPI_CHG0_CH6_Excluded   PPI_CHG_CH6_Excluded
+#define PPI_CHG0_CH6_Included   PPI_CHG_CH6_Included
+#define PPI_CHG0_CH5_Pos        PPI_CHG_CH5_Pos
+#define PPI_CHG0_CH5_Msk        PPI_CHG_CH5_Msk
+#define PPI_CHG0_CH5_Excluded   PPI_CHG_CH5_Excluded
+#define PPI_CHG0_CH5_Included   PPI_CHG_CH5_Included
+#define PPI_CHG0_CH4_Pos        PPI_CHG_CH4_Pos
+#define PPI_CHG0_CH4_Msk        PPI_CHG_CH4_Msk
+#define PPI_CHG0_CH4_Excluded   PPI_CHG_CH4_Excluded
+#define PPI_CHG0_CH4_Included   PPI_CHG_CH4_Included
+#define PPI_CHG0_CH3_Pos        PPI_CHG_CH3_Pos
+#define PPI_CHG0_CH3_Msk        PPI_CHG_CH3_Msk
+#define PPI_CHG0_CH3_Excluded   PPI_CHG_CH3_Excluded
+#define PPI_CHG0_CH3_Included   PPI_CHG_CH3_Included
+#define PPI_CHG0_CH2_Pos        PPI_CHG_CH2_Pos
+#define PPI_CHG0_CH2_Msk        PPI_CHG_CH2_Msk
+#define PPI_CHG0_CH2_Excluded   PPI_CHG_CH2_Excluded
+#define PPI_CHG0_CH2_Included   PPI_CHG_CH2_Included
+#define PPI_CHG0_CH1_Pos        PPI_CHG_CH1_Pos
+#define PPI_CHG0_CH1_Msk        PPI_CHG_CH1_Msk
+#define PPI_CHG0_CH1_Excluded   PPI_CHG_CH1_Excluded
+#define PPI_CHG0_CH1_Included   PPI_CHG_CH1_Included
+#define PPI_CHG0_CH0_Pos        PPI_CHG_CH0_Pos
+#define PPI_CHG0_CH0_Msk        PPI_CHG_CH0_Msk
+#define PPI_CHG0_CH0_Excluded   PPI_CHG_CH0_Excluded
+#define PPI_CHG0_CH0_Included   PPI_CHG_CH0_Included
+#define PPI_CHG1_CH15_Pos       PPI_CHG_CH15_Pos
+#define PPI_CHG1_CH15_Msk       PPI_CHG_CH15_Msk
+#define PPI_CHG1_CH15_Excluded  PPI_CHG_CH15_Excluded
+#define PPI_CHG1_CH15_Included  PPI_CHG_CH15_Included
+#define PPI_CHG1_CH14_Pos       PPI_CHG_CH14_Pos
+#define PPI_CHG1_CH14_Msk       PPI_CHG_CH14_Msk
+#define PPI_CHG1_CH14_Excluded  PPI_CHG_CH14_Excluded
+#define PPI_CHG1_CH14_Included  PPI_CHG_CH14_Included
+#define PPI_CHG1_CH13_Pos       PPI_CHG_CH13_Pos
+#define PPI_CHG1_CH13_Msk       PPI_CHG_CH13_Msk
+#define PPI_CHG1_CH13_Excluded  PPI_CHG_CH13_Excluded
+#define PPI_CHG1_CH13_Included  PPI_CHG_CH13_Included
+#define PPI_CHG1_CH12_Pos       PPI_CHG_CH12_Pos
+#define PPI_CHG1_CH12_Msk       PPI_CHG_CH12_Msk
+#define PPI_CHG1_CH12_Excluded  PPI_CHG_CH12_Excluded
+#define PPI_CHG1_CH12_Included  PPI_CHG_CH12_Included
+#define PPI_CHG1_CH11_Pos       PPI_CHG_CH11_Pos
+#define PPI_CHG1_CH11_Msk       PPI_CHG_CH11_Msk
+#define PPI_CHG1_CH11_Excluded  PPI_CHG_CH11_Excluded
+#define PPI_CHG1_CH11_Included  PPI_CHG_CH11_Included
+#define PPI_CHG1_CH10_Pos       PPI_CHG_CH10_Pos
+#define PPI_CHG1_CH10_Msk       PPI_CHG_CH10_Msk
+#define PPI_CHG1_CH10_Excluded  PPI_CHG_CH10_Excluded
+#define PPI_CHG1_CH10_Included  PPI_CHG_CH10_Included
+#define PPI_CHG1_CH9_Pos        PPI_CHG_CH9_Pos
+#define PPI_CHG1_CH9_Msk        PPI_CHG_CH9_Msk
+#define PPI_CHG1_CH9_Excluded   PPI_CHG_CH9_Excluded
+#define PPI_CHG1_CH9_Included   PPI_CHG_CH9_Included
+#define PPI_CHG1_CH8_Pos        PPI_CHG_CH8_Pos
+#define PPI_CHG1_CH8_Msk        PPI_CHG_CH8_Msk
+#define PPI_CHG1_CH8_Excluded   PPI_CHG_CH8_Excluded
+#define PPI_CHG1_CH8_Included   PPI_CHG_CH8_Included
+#define PPI_CHG1_CH7_Pos        PPI_CHG_CH7_Pos
+#define PPI_CHG1_CH7_Msk        PPI_CHG_CH7_Msk
+#define PPI_CHG1_CH7_Excluded   PPI_CHG_CH7_Excluded
+#define PPI_CHG1_CH7_Included   PPI_CHG_CH7_Included
+#define PPI_CHG1_CH6_Pos        PPI_CHG_CH6_Pos
+#define PPI_CHG1_CH6_Msk        PPI_CHG_CH6_Msk
+#define PPI_CHG1_CH6_Excluded   PPI_CHG_CH6_Excluded
+#define PPI_CHG1_CH6_Included   PPI_CHG_CH6_Included
+#define PPI_CHG1_CH5_Pos        PPI_CHG_CH5_Pos
+#define PPI_CHG1_CH5_Msk        PPI_CHG_CH5_Msk
+#define PPI_CHG1_CH5_Excluded   PPI_CHG_CH5_Excluded
+#define PPI_CHG1_CH5_Included   PPI_CHG_CH5_Included
+#define PPI_CHG1_CH4_Pos        PPI_CHG_CH4_Pos
+#define PPI_CHG1_CH4_Msk        PPI_CHG_CH4_Msk
+#define PPI_CHG1_CH4_Excluded   PPI_CHG_CH4_Excluded
+#define PPI_CHG1_CH4_Included   PPI_CHG_CH4_Included
+#define PPI_CHG1_CH3_Pos        PPI_CHG_CH3_Pos
+#define PPI_CHG1_CH3_Msk        PPI_CHG_CH3_Msk
+#define PPI_CHG1_CH3_Excluded   PPI_CHG_CH3_Excluded
+#define PPI_CHG1_CH3_Included   PPI_CHG_CH3_Included
+#define PPI_CHG1_CH2_Pos        PPI_CHG_CH2_Pos
+#define PPI_CHG1_CH2_Msk        PPI_CHG_CH2_Msk
+#define PPI_CHG1_CH2_Excluded   PPI_CHG_CH2_Excluded
+#define PPI_CHG1_CH2_Included   PPI_CHG_CH2_Included
+#define PPI_CHG1_CH1_Pos        PPI_CHG_CH1_Pos
+#define PPI_CHG1_CH1_Msk        PPI_CHG_CH1_Msk
+#define PPI_CHG1_CH1_Excluded   PPI_CHG_CH1_Excluded
+#define PPI_CHG1_CH1_Included   PPI_CHG_CH1_Included
+#define PPI_CHG1_CH0_Pos        PPI_CHG_CH0_Pos
+#define PPI_CHG1_CH0_Msk        PPI_CHG_CH0_Msk
+#define PPI_CHG1_CH0_Excluded   PPI_CHG_CH0_Excluded
+#define PPI_CHG1_CH0_Included   PPI_CHG_CH0_Included
+#define PPI_CHG2_CH15_Pos       PPI_CHG_CH15_Pos
+#define PPI_CHG2_CH15_Msk       PPI_CHG_CH15_Msk
+#define PPI_CHG2_CH15_Excluded  PPI_CHG_CH15_Excluded
+#define PPI_CHG2_CH15_Included  PPI_CHG_CH15_Included
+#define PPI_CHG2_CH14_Pos       PPI_CHG_CH14_Pos
+#define PPI_CHG2_CH14_Msk       PPI_CHG_CH14_Msk
+#define PPI_CHG2_CH14_Excluded  PPI_CHG_CH14_Excluded
+#define PPI_CHG2_CH14_Included  PPI_CHG_CH14_Included
+#define PPI_CHG2_CH13_Pos       PPI_CHG_CH13_Pos
+#define PPI_CHG2_CH13_Msk       PPI_CHG_CH13_Msk
+#define PPI_CHG2_CH13_Excluded  PPI_CHG_CH13_Excluded
+#define PPI_CHG2_CH13_Included  PPI_CHG_CH13_Included
+#define PPI_CHG2_CH12_Pos       PPI_CHG_CH12_Pos
+#define PPI_CHG2_CH12_Msk       PPI_CHG_CH12_Msk
+#define PPI_CHG2_CH12_Excluded  PPI_CHG_CH12_Excluded
+#define PPI_CHG2_CH12_Included  PPI_CHG_CH12_Included
+#define PPI_CHG2_CH11_Pos       PPI_CHG_CH11_Pos
+#define PPI_CHG2_CH11_Msk       PPI_CHG_CH11_Msk
+#define PPI_CHG2_CH11_Excluded  PPI_CHG_CH11_Excluded
+#define PPI_CHG2_CH11_Included  PPI_CHG_CH11_Included
+#define PPI_CHG2_CH10_Pos       PPI_CHG_CH10_Pos
+#define PPI_CHG2_CH10_Msk       PPI_CHG_CH10_Msk
+#define PPI_CHG2_CH10_Excluded  PPI_CHG_CH10_Excluded
+#define PPI_CHG2_CH10_Included  PPI_CHG_CH10_Included
+#define PPI_CHG2_CH9_Pos        PPI_CHG_CH9_Pos
+#define PPI_CHG2_CH9_Msk        PPI_CHG_CH9_Msk
+#define PPI_CHG2_CH9_Excluded   PPI_CHG_CH9_Excluded
+#define PPI_CHG2_CH9_Included   PPI_CHG_CH9_Included
+#define PPI_CHG2_CH8_Pos        PPI_CHG_CH8_Pos
+#define PPI_CHG2_CH8_Msk        PPI_CHG_CH8_Msk
+#define PPI_CHG2_CH8_Excluded   PPI_CHG_CH8_Excluded
+#define PPI_CHG2_CH8_Included   PPI_CHG_CH8_Included
+#define PPI_CHG2_CH7_Pos        PPI_CHG_CH7_Pos
+#define PPI_CHG2_CH7_Msk        PPI_CHG_CH7_Msk
+#define PPI_CHG2_CH7_Excluded   PPI_CHG_CH7_Excluded
+#define PPI_CHG2_CH7_Included   PPI_CHG_CH7_Included
+#define PPI_CHG2_CH6_Pos        PPI_CHG_CH6_Pos
+#define PPI_CHG2_CH6_Msk        PPI_CHG_CH6_Msk
+#define PPI_CHG2_CH6_Excluded   PPI_CHG_CH6_Excluded
+#define PPI_CHG2_CH6_Included   PPI_CHG_CH6_Included
+#define PPI_CHG2_CH5_Pos        PPI_CHG_CH5_Pos
+#define PPI_CHG2_CH5_Msk        PPI_CHG_CH5_Msk
+#define PPI_CHG2_CH5_Excluded   PPI_CHG_CH5_Excluded
+#define PPI_CHG2_CH5_Included   PPI_CHG_CH5_Included
+#define PPI_CHG2_CH4_Pos        PPI_CHG_CH4_Pos
+#define PPI_CHG2_CH4_Msk        PPI_CHG_CH4_Msk
+#define PPI_CHG2_CH4_Excluded   PPI_CHG_CH4_Excluded
+#define PPI_CHG2_CH4_Included   PPI_CHG_CH4_Included
+#define PPI_CHG2_CH3_Pos        PPI_CHG_CH3_Pos
+#define PPI_CHG2_CH3_Msk        PPI_CHG_CH3_Msk
+#define PPI_CHG2_CH3_Excluded   PPI_CHG_CH3_Excluded
+#define PPI_CHG2_CH3_Included   PPI_CHG_CH3_Included
+#define PPI_CHG2_CH2_Pos        PPI_CHG_CH2_Pos
+#define PPI_CHG2_CH2_Msk        PPI_CHG_CH2_Msk
+#define PPI_CHG2_CH2_Excluded   PPI_CHG_CH2_Excluded
+#define PPI_CHG2_CH2_Included   PPI_CHG_CH2_Included
+#define PPI_CHG2_CH1_Pos        PPI_CHG_CH1_Pos
+#define PPI_CHG2_CH1_Msk        PPI_CHG_CH1_Msk
+#define PPI_CHG2_CH1_Excluded   PPI_CHG_CH1_Excluded
+#define PPI_CHG2_CH1_Included   PPI_CHG_CH1_Included
+#define PPI_CHG2_CH0_Pos        PPI_CHG_CH0_Pos
+#define PPI_CHG2_CH0_Msk        PPI_CHG_CH0_Msk
+#define PPI_CHG2_CH0_Excluded   PPI_CHG_CH0_Excluded
+#define PPI_CHG2_CH0_Included   PPI_CHG_CH0_Included
+#define PPI_CHG3_CH15_Pos       PPI_CHG_CH15_Pos
+#define PPI_CHG3_CH15_Msk       PPI_CHG_CH15_Msk
+#define PPI_CHG3_CH15_Excluded  PPI_CHG_CH15_Excluded
+#define PPI_CHG3_CH15_Included  PPI_CHG_CH15_Included
+#define PPI_CHG3_CH14_Pos       PPI_CHG_CH14_Pos
+#define PPI_CHG3_CH14_Msk       PPI_CHG_CH14_Msk
+#define PPI_CHG3_CH14_Excluded  PPI_CHG_CH14_Excluded
+#define PPI_CHG3_CH14_Included  PPI_CHG_CH14_Included
+#define PPI_CHG3_CH13_Pos       PPI_CHG_CH13_Pos
+#define PPI_CHG3_CH13_Msk       PPI_CHG_CH13_Msk
+#define PPI_CHG3_CH13_Excluded  PPI_CHG_CH13_Excluded
+#define PPI_CHG3_CH13_Included  PPI_CHG_CH13_Included
+#define PPI_CHG3_CH12_Pos       PPI_CHG_CH12_Pos
+#define PPI_CHG3_CH12_Msk       PPI_CHG_CH12_Msk
+#define PPI_CHG3_CH12_Excluded  PPI_CHG_CH12_Excluded
+#define PPI_CHG3_CH12_Included  PPI_CHG_CH12_Included
+#define PPI_CHG3_CH11_Pos       PPI_CHG_CH11_Pos
+#define PPI_CHG3_CH11_Msk       PPI_CHG_CH11_Msk
+#define PPI_CHG3_CH11_Excluded  PPI_CHG_CH11_Excluded
+#define PPI_CHG3_CH11_Included  PPI_CHG_CH11_Included
+#define PPI_CHG3_CH10_Pos       PPI_CHG_CH10_Pos
+#define PPI_CHG3_CH10_Msk       PPI_CHG_CH10_Msk
+#define PPI_CHG3_CH10_Excluded  PPI_CHG_CH10_Excluded
+#define PPI_CHG3_CH10_Included  PPI_CHG_CH10_Included
+#define PPI_CHG3_CH9_Pos        PPI_CHG_CH9_Pos
+#define PPI_CHG3_CH9_Msk        PPI_CHG_CH9_Msk
+#define PPI_CHG3_CH9_Excluded   PPI_CHG_CH9_Excluded
+#define PPI_CHG3_CH9_Included   PPI_CHG_CH9_Included
+#define PPI_CHG3_CH8_Pos        PPI_CHG_CH8_Pos
+#define PPI_CHG3_CH8_Msk        PPI_CHG_CH8_Msk
+#define PPI_CHG3_CH8_Excluded   PPI_CHG_CH8_Excluded
+#define PPI_CHG3_CH8_Included   PPI_CHG_CH8_Included
+#define PPI_CHG3_CH7_Pos        PPI_CHG_CH7_Pos
+#define PPI_CHG3_CH7_Msk        PPI_CHG_CH7_Msk
+#define PPI_CHG3_CH7_Excluded   PPI_CHG_CH7_Excluded
+#define PPI_CHG3_CH7_Included   PPI_CHG_CH7_Included
+#define PPI_CHG3_CH6_Pos        PPI_CHG_CH6_Pos
+#define PPI_CHG3_CH6_Msk        PPI_CHG_CH6_Msk
+#define PPI_CHG3_CH6_Excluded   PPI_CHG_CH6_Excluded
+#define PPI_CHG3_CH6_Included   PPI_CHG_CH6_Included
+#define PPI_CHG3_CH5_Pos        PPI_CHG_CH5_Pos
+#define PPI_CHG3_CH5_Msk        PPI_CHG_CH5_Msk
+#define PPI_CHG3_CH5_Excluded   PPI_CHG_CH5_Excluded
+#define PPI_CHG3_CH5_Included   PPI_CHG_CH5_Included
+#define PPI_CHG3_CH4_Pos        PPI_CHG_CH4_Pos
+#define PPI_CHG3_CH4_Msk        PPI_CHG_CH4_Msk
+#define PPI_CHG3_CH4_Excluded   PPI_CHG_CH4_Excluded
+#define PPI_CHG3_CH4_Included   PPI_CHG_CH4_Included
+#define PPI_CHG3_CH3_Pos        PPI_CHG_CH3_Pos
+#define PPI_CHG3_CH3_Msk        PPI_CHG_CH3_Msk
+#define PPI_CHG3_CH3_Excluded   PPI_CHG_CH3_Excluded
+#define PPI_CHG3_CH3_Included   PPI_CHG_CH3_Included
+#define PPI_CHG3_CH2_Pos        PPI_CHG_CH2_Pos
+#define PPI_CHG3_CH2_Msk        PPI_CHG_CH2_Msk
+#define PPI_CHG3_CH2_Excluded   PPI_CHG_CH2_Excluded
+#define PPI_CHG3_CH2_Included   PPI_CHG_CH2_Included
+#define PPI_CHG3_CH1_Pos        PPI_CHG_CH1_Pos
+#define PPI_CHG3_CH1_Msk        PPI_CHG_CH1_Msk
+#define PPI_CHG3_CH1_Excluded   PPI_CHG_CH1_Excluded
+#define PPI_CHG3_CH1_Included   PPI_CHG_CH1_Included
+#define PPI_CHG3_CH0_Pos        PPI_CHG_CH0_Pos
+#define PPI_CHG3_CH0_Msk        PPI_CHG_CH0_Msk
+#define PPI_CHG3_CH0_Excluded   PPI_CHG_CH0_Excluded
+#define PPI_CHG3_CH0_Included   PPI_CHG_CH0_Included
 
 /* SPIS */
 /* nRF51 devices do not have an SPIS0, only SPIS1. SPIS0_EASYDMA_MAXCNT_SIZE was therefore renamed. */
-#define SPIS0_EASYDMA_MAXCNT_SIZE SPIS1_EASYDMA_MAXCNT_SIZE  
+#define SPIS0_EASYDMA_MAXCNT_SIZE SPIS1_EASYDMA_MAXCNT_SIZE
 
 
 

+ 4 - 4
bsp/nrf51822/Libraries/nrf51822/Include/nrf_gpio.h

@@ -246,16 +246,16 @@ static __INLINE void nrf_gpio_pin_toggle(uint32_t pin_number)
 {
     const uint32_t pin_bit   = 1UL << pin_number;
     const uint32_t pin_state = ((NRF_GPIO->OUT >> pin_number) & 1UL);
-    
+
     if (pin_state == 0)
     {
         // Current state low, set high.
-        NRF_GPIO->OUTSET = pin_bit;        
+        NRF_GPIO->OUTSET = pin_bit;
     }
     else
     {
-        // Current state high, set low.    
-        NRF_GPIO->OUTCLR = pin_bit;       
+        // Current state high, set low.
+        NRF_GPIO->OUTCLR = pin_bit;
     }
 }
 

+ 54 - 54
bsp/nrf51822/project.uvoptx

@@ -194,8 +194,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>applications\application.c</PathWithFileName>
-      <FilenameWithoutPath>application.c</FilenameWithoutPath>
+      <PathWithFileName>applications\startup.c</PathWithFileName>
+      <FilenameWithoutPath>startup.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -206,8 +206,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>applications\startup.c</PathWithFileName>
-      <FilenameWithoutPath>startup.c</FilenameWithoutPath>
+      <PathWithFileName>applications\application.c</PathWithFileName>
+      <FilenameWithoutPath>application.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -226,8 +226,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\libcpu\arm\common\backtrace.c</PathWithFileName>
-      <FilenameWithoutPath>backtrace.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\libcpu\arm\common\div0.c</PathWithFileName>
+      <FilenameWithoutPath>div0.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -250,32 +250,32 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\libcpu\arm\common\div0.c</PathWithFileName>
-      <FilenameWithoutPath>div0.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\libcpu\arm\common\backtrace.c</PathWithFileName>
+      <FilenameWithoutPath>backtrace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
       <FileNumber>6</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\libcpu\arm\cortex-m0\context_rvds.S</PathWithFileName>
-      <FilenameWithoutPath>context_rvds.S</FilenameWithoutPath>
+      <PathWithFileName>..\..\libcpu\arm\cortex-m0\cpuport.c</PathWithFileName>
+      <FilenameWithoutPath>cpuport.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
       <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\libcpu\arm\cortex-m0\cpuport.c</PathWithFileName>
-      <FilenameWithoutPath>cpuport.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\libcpu\arm\cortex-m0\context_rvds.S</PathWithFileName>
+      <FilenameWithoutPath>context_rvds.S</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -294,8 +294,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\drivers\src\workqueue.c</PathWithFileName>
-      <FilenameWithoutPath>workqueue.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\drivers\src\dataqueue.c</PathWithFileName>
+      <FilenameWithoutPath>dataqueue.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -306,8 +306,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\drivers\src\waitqueue.c</PathWithFileName>
-      <FilenameWithoutPath>waitqueue.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\drivers\src\workqueue.c</PathWithFileName>
+      <FilenameWithoutPath>workqueue.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -318,8 +318,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\drivers\src\dataqueue.c</PathWithFileName>
-      <FilenameWithoutPath>dataqueue.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\drivers\src\ringblk_buf.c</PathWithFileName>
+      <FilenameWithoutPath>ringblk_buf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -330,8 +330,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\drivers\src\ringbuffer.c</PathWithFileName>
-      <FilenameWithoutPath>ringbuffer.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\drivers\src\completion.c</PathWithFileName>
+      <FilenameWithoutPath>completion.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -354,8 +354,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\drivers\src\ringblk_buf.c</PathWithFileName>
-      <FilenameWithoutPath>ringblk_buf.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\drivers\src\ringbuffer.c</PathWithFileName>
+      <FilenameWithoutPath>ringbuffer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -366,8 +366,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\drivers\src\completion.c</PathWithFileName>
-      <FilenameWithoutPath>completion.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\drivers\src\waitqueue.c</PathWithFileName>
+      <FilenameWithoutPath>waitqueue.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -454,8 +454,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\finsh\cmd.c</PathWithFileName>
-      <FilenameWithoutPath>cmd.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\finsh\msh.c</PathWithFileName>
+      <FilenameWithoutPath>msh.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -466,8 +466,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\components\finsh\msh.c</PathWithFileName>
-      <FilenameWithoutPath>msh.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\components\finsh\cmd.c</PathWithFileName>
+      <FilenameWithoutPath>cmd.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -486,8 +486,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\clock.c</PathWithFileName>
-      <FilenameWithoutPath>clock.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\kservice.c</PathWithFileName>
+      <FilenameWithoutPath>kservice.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -498,8 +498,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\object.c</PathWithFileName>
-      <FilenameWithoutPath>object.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\device.c</PathWithFileName>
+      <FilenameWithoutPath>device.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -510,8 +510,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\irq.c</PathWithFileName>
-      <FilenameWithoutPath>irq.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\components.c</PathWithFileName>
+      <FilenameWithoutPath>components.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -522,8 +522,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\scheduler.c</PathWithFileName>
-      <FilenameWithoutPath>scheduler.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\thread.c</PathWithFileName>
+      <FilenameWithoutPath>thread.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -534,8 +534,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\components.c</PathWithFileName>
-      <FilenameWithoutPath>components.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\object.c</PathWithFileName>
+      <FilenameWithoutPath>object.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -546,8 +546,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\thread.c</PathWithFileName>
-      <FilenameWithoutPath>thread.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\idle.c</PathWithFileName>
+      <FilenameWithoutPath>idle.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -558,8 +558,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\ipc.c</PathWithFileName>
-      <FilenameWithoutPath>ipc.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\mem.c</PathWithFileName>
+      <FilenameWithoutPath>mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -570,8 +570,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\kservice.c</PathWithFileName>
-      <FilenameWithoutPath>kservice.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\ipc.c</PathWithFileName>
+      <FilenameWithoutPath>ipc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -582,8 +582,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\mem.c</PathWithFileName>
-      <FilenameWithoutPath>mem.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\irq.c</PathWithFileName>
+      <FilenameWithoutPath>irq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -594,8 +594,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\idle.c</PathWithFileName>
-      <FilenameWithoutPath>idle.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\timer.c</PathWithFileName>
+      <FilenameWithoutPath>timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -606,8 +606,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\timer.c</PathWithFileName>
-      <FilenameWithoutPath>timer.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\clock.c</PathWithFileName>
+      <FilenameWithoutPath>clock.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -618,8 +618,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\src\device.c</PathWithFileName>
-      <FilenameWithoutPath>device.c</FilenameWithoutPath>
+      <PathWithFileName>..\..\src\scheduler.c</PathWithFileName>
+      <FilenameWithoutPath>scheduler.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

+ 51 - 51
bsp/nrf51822/project.uvprojx

@@ -383,14 +383,14 @@
           <GroupName>Applications</GroupName>
           <Files>
             <File>
-              <FileName>application.c</FileName>
+              <FileName>startup.c</FileName>
               <FileType>1</FileType>
-              <FilePath>applications\application.c</FilePath>
+              <FilePath>applications\startup.c</FilePath>
             </File>
             <File>
-              <FileName>startup.c</FileName>
+              <FileName>application.c</FileName>
               <FileType>1</FileType>
-              <FilePath>applications\startup.c</FilePath>
+              <FilePath>applications\application.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -398,9 +398,9 @@
           <GroupName>CPU</GroupName>
           <Files>
             <File>
-              <FileName>backtrace.c</FileName>
+              <FileName>div0.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath>
+              <FilePath>..\..\libcpu\arm\common\div0.c</FilePath>
             </File>
             <File>
               <FileName>showmem.c</FileName>
@@ -408,44 +408,44 @@
               <FilePath>..\..\libcpu\arm\common\showmem.c</FilePath>
             </File>
             <File>
-              <FileName>div0.c</FileName>
+              <FileName>backtrace.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\common\div0.c</FilePath>
-            </File>
-            <File>
-              <FileName>context_rvds.S</FileName>
-              <FileType>2</FileType>
-              <FilePath>..\..\libcpu\arm\cortex-m0\context_rvds.S</FilePath>
+              <FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath>
             </File>
             <File>
               <FileName>cpuport.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\..\libcpu\arm\cortex-m0\cpuport.c</FilePath>
             </File>
+            <File>
+              <FileName>context_rvds.S</FileName>
+              <FileType>2</FileType>
+              <FilePath>..\..\libcpu\arm\cortex-m0\context_rvds.S</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
           <GroupName>DeviceDrivers</GroupName>
           <Files>
             <File>
-              <FileName>workqueue.c</FileName>
+              <FileName>dataqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\workqueue.c</FilePath>
+              <FilePath>..\..\components\drivers\src\dataqueue.c</FilePath>
             </File>
             <File>
-              <FileName>waitqueue.c</FileName>
+              <FileName>workqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\waitqueue.c</FilePath>
+              <FilePath>..\..\components\drivers\src\workqueue.c</FilePath>
             </File>
             <File>
-              <FileName>dataqueue.c</FileName>
+              <FileName>ringblk_buf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\dataqueue.c</FilePath>
+              <FilePath>..\..\components\drivers\src\ringblk_buf.c</FilePath>
             </File>
             <File>
-              <FileName>ringbuffer.c</FileName>
+              <FileName>completion.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\ringbuffer.c</FilePath>
+              <FilePath>..\..\components\drivers\src\completion.c</FilePath>
             </File>
             <File>
               <FileName>pipe.c</FileName>
@@ -453,14 +453,14 @@
               <FilePath>..\..\components\drivers\src\pipe.c</FilePath>
             </File>
             <File>
-              <FileName>ringblk_buf.c</FileName>
+              <FileName>ringbuffer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\ringblk_buf.c</FilePath>
+              <FilePath>..\..\components\drivers\src\ringbuffer.c</FilePath>
             </File>
             <File>
-              <FileName>completion.c</FileName>
+              <FileName>waitqueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\drivers\src\completion.c</FilePath>
+              <FilePath>..\..\components\drivers\src\waitqueue.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -498,14 +498,14 @@
               <FilePath>..\..\components\finsh\shell.c</FilePath>
             </File>
             <File>
-              <FileName>cmd.c</FileName>
+              <FileName>msh.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\finsh\cmd.c</FilePath>
+              <FilePath>..\..\components\finsh\msh.c</FilePath>
             </File>
             <File>
-              <FileName>msh.c</FileName>
+              <FileName>cmd.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\components\finsh\msh.c</FilePath>
+              <FilePath>..\..\components\finsh\cmd.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -513,24 +513,14 @@
           <GroupName>Kernel</GroupName>
           <Files>
             <File>
-              <FileName>clock.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\src\clock.c</FilePath>
-            </File>
-            <File>
-              <FileName>object.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\src\object.c</FilePath>
-            </File>
-            <File>
-              <FileName>irq.c</FileName>
+              <FileName>kservice.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\irq.c</FilePath>
+              <FilePath>..\..\src\kservice.c</FilePath>
             </File>
             <File>
-              <FileName>scheduler.c</FileName>
+              <FileName>device.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\scheduler.c</FilePath>
+              <FilePath>..\..\src\device.c</FilePath>
             </File>
             <File>
               <FileName>components.c</FileName>
@@ -543,14 +533,14 @@
               <FilePath>..\..\src\thread.c</FilePath>
             </File>
             <File>
-              <FileName>ipc.c</FileName>
+              <FileName>object.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\ipc.c</FilePath>
+              <FilePath>..\..\src\object.c</FilePath>
             </File>
             <File>
-              <FileName>kservice.c</FileName>
+              <FileName>idle.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\kservice.c</FilePath>
+              <FilePath>..\..\src\idle.c</FilePath>
             </File>
             <File>
               <FileName>mem.c</FileName>
@@ -558,9 +548,14 @@
               <FilePath>..\..\src\mem.c</FilePath>
             </File>
             <File>
-              <FileName>idle.c</FileName>
+              <FileName>ipc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\idle.c</FilePath>
+              <FilePath>..\..\src\ipc.c</FilePath>
+            </File>
+            <File>
+              <FileName>irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\src\irq.c</FilePath>
             </File>
             <File>
               <FileName>timer.c</FileName>
@@ -568,9 +563,14 @@
               <FilePath>..\..\src\timer.c</FilePath>
             </File>
             <File>
-              <FileName>device.c</FileName>
+              <FileName>clock.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\src\device.c</FilePath>
+              <FilePath>..\..\src\clock.c</FilePath>
+            </File>
+            <File>
+              <FileName>scheduler.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\src\scheduler.c</FilePath>
             </File>
             <File>
               <FileName>mempool.c</FileName>

+ 13 - 13
bsp/nrf51822/rtconfig.h

@@ -3,16 +3,16 @@
 #define __RTTHREAD_CFG_H__
 
 /* RT_NAME_MAX*/
-#define RT_NAME_MAX	   6
+#define RT_NAME_MAX    6
 
 /* RT_ALIGN_SIZE*/
-#define RT_ALIGN_SIZE	4
+#define RT_ALIGN_SIZE   4
 
 /* PRIORITY_MAX */
-#define RT_THREAD_PRIORITY_MAX	8
+#define RT_THREAD_PRIORITY_MAX  8
 
 /* Tick per Second */
-#define RT_TICK_PER_SECOND	100
+#define RT_TICK_PER_SECOND  100
 
 /* SECTION: RT_DEBUG */
 /* Thread Debug */
@@ -24,20 +24,20 @@
 /* Using Hook */
 #define RT_USING_HOOK
 
-#define IDLE_THREAD_STACK_SIZE	512
+#define IDLE_THREAD_STACK_SIZE  512
 
 /* Using Software Timer */
 /* #define RT_USING_TIMER_SOFT */
-#define RT_TIMER_THREAD_PRIO		4
-#define RT_TIMER_THREAD_STACK_SIZE	512
-#define RT_TIMER_TICK_PER_SECOND	100
+#define RT_TIMER_THREAD_PRIO        4
+#define RT_TIMER_THREAD_STACK_SIZE  512
+#define RT_TIMER_TICK_PER_SECOND    100
 
 /* SECTION: IPC */
 /* Using Semaphore*/
 #define RT_USING_SEMAPHORE
 
 /* Using Mutex */
-#define RT_USING_MUTEX 
+#define RT_USING_MUTEX
 
 /* Using Event */
 /* #define RT_USING_EVENT */
@@ -74,9 +74,9 @@
 /* SECTION: Console options */
 #define RT_USING_CONSOLE
 /* the buffer size of console*/
-#define RT_CONSOLEBUF_SIZE	128
+#define RT_CONSOLEBUF_SIZE  128
 // <string name="RT_CONSOLE_DEVICE_NAME" description="The device name for console" default="uart1" />
-#define RT_CONSOLE_DEVICE_NAME	    "uart0"
+#define RT_CONSOLE_DEVICE_NAME      "uart0"
 
 
 
@@ -84,8 +84,8 @@
 #define RT_USING_FINSH
 /* configure finsh parameters */
 #define FINSH_THREAD_PRIORITY 6
-#define FINSH_THREAD_STACK_SIZE	512
-#define FINSH_HISTORY_LINES	1
+#define FINSH_THREAD_STACK_SIZE 512
+#define FINSH_HISTORY_LINES 1
 /* Using symbol table */
 #define FINSH_USING_SYMTAB
 #define FINSH_USING_DESCRIPTION