Skip to content

Commit dbf5e5f

Browse files
hnhoanhnhoan
committed
Fixed compile update
1 parent 2149009 commit dbf5e5f

File tree

14 files changed

+9004
-17
lines changed

14 files changed

+9004
-17
lines changed

‎ARM/Nordic/nRF51/EHAL/.project

+16-16
Original file line numberDiff line numberDiff line change
@@ -370,16 +370,6 @@
370370
<type>1</type>
371371
<locationURI>PARENT-4-PROJECT_LOC/src/sysstatus.c</locationURI>
372372
</link>
373-
<link>
374-
<name>src/timer_hf_nrf5x.cpp</name>
375-
<type>1</type>
376-
<locationURI>PARENT-2-PROJECT_LOC/src/timer_hf_nrf5x.cpp</locationURI>
377-
</link>
378-
<link>
379-
<name>src/timer_lf_nrf5x.cpp</name>
380-
<type>1</type>
381-
<locationURI>PARENT-2-PROJECT_LOC/src/timer_lf_nrf5x.cpp</locationURI>
382-
</link>
383373
<link>
384374
<name>src/timer_nrf_app_timer.cpp</name>
385375
<type>1</type>
@@ -566,9 +556,9 @@
566556
<locationURI>PARENT-4-PROJECT_LOC/src/coredev/i2c.cpp</locationURI>
567557
</link>
568558
<link>
569-
<name>src/coredev/i2c_nrf5x.cpp</name>
559+
<name>src/coredev/i2c_nrfx.cpp</name>
570560
<type>1</type>
571-
<locationURI>PARENT-2-PROJECT_LOC/src/i2c_nrf5x.cpp</locationURI>
561+
<locationURI>PARENT-2-PROJECT_LOC/src/i2c_nrfx.cpp</locationURI>
572562
</link>
573563
<link>
574564
<name>src/coredev/i2c_spi_nrf5x_irq.cpp</name>
@@ -586,24 +576,34 @@
586576
<locationURI>PARENT-4-PROJECT_LOC/src/coredev/spi.cpp</locationURI>
587577
</link>
588578
<link>
589-
<name>src/coredev/spi_nrf5x.cpp</name>
579+
<name>src/coredev/spi_nrfx.cpp</name>
590580
<type>1</type>
591-
<locationURI>PARENT-2-PROJECT_LOC/src/spi_nrf5x.cpp</locationURI>
581+
<locationURI>PARENT-2-PROJECT_LOC/src/spi_nrfx.cpp</locationURI>
592582
</link>
593583
<link>
594584
<name>src/coredev/timer.cpp</name>
595585
<type>1</type>
596586
<locationURI>PARENT-4-PROJECT_LOC/src/coredev/timer.cpp</locationURI>
597587
</link>
588+
<link>
589+
<name>src/coredev/timer_hf_nrfx.cpp</name>
590+
<type>1</type>
591+
<locationURI>PARENT-2-PROJECT_LOC/src/timer_hf_nrfx.cpp</locationURI>
592+
</link>
593+
<link>
594+
<name>src/coredev/timer_lf_nrfx.cpp</name>
595+
<type>1</type>
596+
<locationURI>PARENT-2-PROJECT_LOC/src/timer_lf_nrfx.cpp</locationURI>
597+
</link>
598598
<link>
599599
<name>src/coredev/uart.c</name>
600600
<type>1</type>
601601
<locationURI>PARENT-4-PROJECT_LOC/src/coredev/uart.c</locationURI>
602602
</link>
603603
<link>
604-
<name>src/coredev/uart_nrf5x.cpp</name>
604+
<name>src/coredev/uart_nrfx.cpp</name>
605605
<type>1</type>
606-
<locationURI>PARENT-2-PROJECT_LOC/src/uart_nrf5x.cpp</locationURI>
606+
<locationURI>PARENT-2-PROJECT_LOC/src/uart_nrfx.cpp</locationURI>
607607
</link>
608608
<link>
609609
<name>src/imu/imu.cpp</name>

‎ARM/Nordic/nRF51/EHAL/include/nrf51.h

+1,313
Large diffs are not rendered by default.

‎ARM/Nordic/nRF51/EHAL/include/nrf51422_peripherals.h

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
/*
2+
3+
Copyright (c) 2010 - 2020, Nordic Semiconductor ASA
4+
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without modification,
8+
are permitted provided that the following conditions are met:
9+
10+
1. Redistributions of source code must retain the above copyright notice, this
11+
list of conditions and the following disclaimer.
12+
13+
2. Redistributions in binary form, except as embedded into a Nordic
14+
Semiconductor ASA integrated circuit in a product or a software update for
15+
such product, must reproduce the above copyright notice, this list of
16+
conditions and the following disclaimer in the documentation and/or other
17+
materials provided with the distribution.
18+
19+
3. Neither the name of Nordic Semiconductor ASA nor the names of its
20+
contributors may be used to endorse or promote products derived from this
21+
software without specific prior written permission.
22+
23+
4. This software, with or without modification, must only be used with a
24+
Nordic Semiconductor ASA integrated circuit.
25+
26+
5. Any software provided in binary form under this license must not be reverse
27+
engineered, decompiled, modified and/or disassembled.
28+
29+
THIS SOFTWARE IS PROVIDED BY NORDIC SEMICONDUCTOR ASA "AS IS" AND ANY EXPRESS
30+
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
31+
OF MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE ARE
32+
DISCLAIMED. IN NO EVENT SHALL NORDIC SEMICONDUCTOR ASA OR CONTRIBUTORS BE
33+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
34+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
35+
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
37+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
38+
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39+
40+
*/
41+
42+
/* This file is deprecated */
43+
#ifndef _NRF51422_PERIPHERALS_H
44+
#define _NRF51422_PERIPHERALS_H
45+
46+
47+
/* Clock Peripheral */
48+
#define CLOCK_PRESENT
49+
#define CLOCK_COUNT 1
50+
51+
/* Power Peripheral */
52+
#define POWER_PRESENT
53+
#define POWER_COUNT 1
54+
55+
#define POWER_FEATURE_RAMON_REGISTERS_PRESENT
56+
57+
/* Non-Volatile Memory Controller */
58+
#define NVMC_PRESENT
59+
#define NVMC_COUNT 1
60+
61+
/* Software Interrupts */
62+
#define SWI_PRESENT
63+
#define SWI_COUNT 6
64+
65+
/* GPIO */
66+
#define GPIO_PRESENT
67+
#define GPIO_COUNT 1
68+
69+
#define P0_PIN_NUM 32
70+
71+
#define P0_FEATURE_PINS_PRESENT 0xFFFFFFFFUL
72+
73+
/* MPU and BPROT */
74+
#define BPROT_PRESENT
75+
76+
#define BPROT_REGIONS_SIZE 4096
77+
#define BPROT_REGIONS_NUM 64
78+
79+
/* Radio */
80+
#define RADIO_PRESENT
81+
#define RADIO_COUNT 1
82+
83+
/* Accelerated Address Resolver */
84+
#define AAR_PRESENT
85+
#define AAR_COUNT 1
86+
87+
#define AAR_MAX_IRK_NUM 8
88+
89+
/* AES Electronic CodeBook mode encryption */
90+
#define ECB_PRESENT
91+
#define ECB_COUNT 1
92+
93+
/* AES CCM mode encryption */
94+
#define CCM_PRESENT
95+
#define CCM_COUNT 1
96+
97+
/* Peripheral to Peripheral Interconnect */
98+
#define PPI_PRESENT
99+
#define PPI_COUNT 1
100+
101+
#define PPI_CH_NUM 16
102+
#define PPI_FIXED_CH_NUM 12
103+
#define PPI_GROUP_NUM 4
104+
105+
/* Timer/Counter */
106+
#define TIMER_PRESENT
107+
#define TIMER_COUNT 3
108+
109+
#define TIMER0_MAX_SIZE 32
110+
#define TIMER1_MAX_SIZE 16
111+
#define TIMER2_MAX_SIZE 16
112+
113+
#define TIMER0_CC_NUM 4
114+
#define TIMER1_CC_NUM 4
115+
#define TIMER2_CC_NUM 4
116+
117+
/* Real Time Counter */
118+
#define RTC_PRESENT
119+
#define RTC_COUNT 2
120+
121+
#define RTC0_CC_NUM 3
122+
#define RTC1_CC_NUM 4
123+
124+
/* RNG */
125+
#define RNG_PRESENT
126+
#define RNG_COUNT 1
127+
128+
/* Watchdog Timer */
129+
#define WDT_PRESENT
130+
#define WDT_COUNT 1
131+
132+
/* Temperature Sensor */
133+
#define TEMP_PRESENT
134+
#define TEMP_COUNT 1
135+
136+
/* Serial Peripheral Interface Master */
137+
#define SPI_PRESENT
138+
#define SPI_COUNT 2
139+
140+
/* Serial Peripheral Interface Slave with DMA */
141+
#define SPIS_PRESENT
142+
#define SPIS_COUNT 1
143+
144+
#define SPIS1_EASYDMA_MAXCNT_SIZE 8
145+
146+
/* Two Wire Interface Master */
147+
#define TWI_PRESENT
148+
#define TWI_COUNT 2
149+
150+
/* Universal Asynchronous Receiver-Transmitter */
151+
#define UART_PRESENT
152+
#define UART_COUNT 1
153+
154+
/* Quadrature Decoder */
155+
#define QDEC_PRESENT
156+
#define QDEC_COUNT 1
157+
158+
/* Analog to Digital Converter */
159+
#define ADC_PRESENT
160+
#define ADC_COUNT 1
161+
162+
/* GPIO Tasks and Events */
163+
#define GPIOTE_PRESENT
164+
#define GPIOTE_COUNT 1
165+
166+
#define GPIOTE_CH_NUM 4
167+
168+
/* Low Power Comparator */
169+
#define LPCOMP_PRESENT
170+
#define LPCOMP_COUNT 1
171+
172+
#define LPCOMP_REFSEL_RESOLUTION 8
173+
174+
175+
#endif // _NRF51422_PERIPHERALS_H

0 commit comments

Comments
 (0)