Skip to content

Commit 587b6c0

Browse files
authored
Merge branch 'apache:master' into drivers/timers/capture
2 parents 69af15c + 2c1e3d6 commit 587b6c0

File tree

3,662 files changed

+187212
-86570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,662 files changed

+187212
-86570
lines changed

.codespell-ignore-lines

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Linix 45ZWN24-40 2 0.5 Ohm 0.400 mH 2.34A 24V
1717
* [#15520](https://github.com/apache/nuttx/pull/15520) drivers/note: fix typo falgs and align local name to irq_mask
1818
* [#4526](https://github.com/apache/nuttx/pull/4526) Rearch video
1919
* [#6447](https://github.com/apache/nuttx/pull/6447) bcm43xxx: Remove bcmf_txavail_work and resue bcmf_tx_poll_work
20-
ans init
20+
ans init
2121
* CAF : Depends on CONFIG_NET_PROMISCUOUS
2222
* been lost). If ORE is set along with RXNE then it tells you
2323
/* GIR bits must be masked! */
@@ -170,3 +170,11 @@ libs/libc/tre-mem.c
170170
* | 0 | 1 | x | EXT | RIN | IN | off |
171171
* FIFO mode, INT1 , THS 0
172172
* REG03[3] ITERM Termination Current Limit 128-1024mA Default: 256mA
173+
FAR usbdev_fs_waiter_sem_t *sems; /* List of blocking request */
174+
FAR usbdev_fs_waiter_sem_t *cur_sem = fs_ep->sems;
175+
fs_ep->sems = NULL;
176+
fs_ep, &fs_ep->sems, queue);
177+
fs_ep, &fs_ep->sems, &fs_ep->reqq);
178+
#define RTPROT_RA 9 /* RDISC/ND router advertisements */
179+
/* Followed by one or more ND options */
180+
* message using the Neighbor Discovery (ND) protocol. It then listens

.codespellrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ exclude-file = .codespell-ignore-lines
88
# Ignore complete files (e.g. legal text or other immutable material).
99
skip =
1010
LICENSE,
11+
*/CODEOWNERS,
1112

1213
# Ignore seemingly misspelled words.
1314
# lowercase: case insensitive
@@ -39,6 +40,7 @@ ignore-words-list =
3940
IST,
4041
infor,
4142
inport,
43+
ist,
4244
lod,
4345
mot,
4446
mis,

.editorconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# EditorConfig: https://EditorConfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
end_of_line = lf
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
[*.{c,h}]
11+
indent_style = space
12+
indent_size = 2
13+
max_line_length = 78
14+
curly_bracket_next_line = true
15+
indent_brace_style = GNU
16+
17+
[Makefile]
18+
indent_style = tab
19+
[Make.defs]
20+
indent_style = tab
21+
[Kconfig]
22+
indent_style = tab
23+
24+
[*.sh]
25+
indent_style = tab
26+
max_line_length = 80

.github/CODEOWNERS

Lines changed: 22907 additions & 0 deletions
Large diffs are not rendered by default.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,21 @@
1313

1414
## Testing
1515

16-
*Update this section with details on how did you verify the change,
17-
what Host was used for build (OS, CPU, compiler, ..), what Target was
18-
used for verification (arch, board:config, ..), etc. Providing build
19-
and runtime logs from before and after change is highly appreciated.*
16+
*This section should provide a detailed description of what you did
17+
to verify your changes work and do not break existing code.*
2018

19+
*Please provide information about your host machine, the board(s) you
20+
tested your changes on, and how you tested. Logs should be included.*
2121

22+
*For example, when changing something in the core OS functions, you
23+
may want to run the OSTest application to verify that there are no
24+
regressions. Changes to ADC code may warrant running the `adc`
25+
example. Adding a new uORB driver may require that you run
26+
`uorb_listener` to verify correct operation.*
27+
28+
*Pure documentation changes can just be tested with `make html`
29+
(see docs) and verification of the correct format in your
30+
browser.*
31+
32+
**_PRs without testing information will not be accepted. We will
33+
request test logs._**

.github/workflows/build.yml

Lines changed: 105 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ on:
1717
paths-ignore:
1818
- 'AUTHORS'
1919
- 'CONTRIBUTING.md'
20+
- '**/CODEOWNERS'
2021
- 'Documentation/**'
2122
- 'tools/ci/docker/linux/**'
23+
- 'tools/codeowners/*'
2224
push:
2325
paths-ignore:
2426
- 'AUTHORS'
@@ -94,7 +96,7 @@ jobs:
9496
echo "apps_ref=$APPS_REF" >> $GITHUB_OUTPUT
9597
9698
- name: Checkout nuttx repo
97-
uses: actions/checkout@v5
99+
uses: actions/checkout@v6
98100
with:
99101
repository: apache/nuttx
100102
ref: ${{ steps.gittargets.outputs.os_ref }}
@@ -104,7 +106,7 @@ jobs:
104106
run: git -C sources/nuttx fetch --tags
105107

106108
- name: Checkout apps repo
107-
uses: actions/checkout@v5
109+
uses: actions/checkout@v6
108110
with:
109111
repository: apache/nuttx-apps
110112
ref: ${{ steps.gittargets.outputs.apps_ref }}
@@ -115,7 +117,7 @@ jobs:
115117
run: tar zcf sources.tar.gz sources
116118

117119
- name: Archive Source Bundle
118-
uses: actions/upload-artifact@v4
120+
uses: actions/upload-artifact@v6
119121
with:
120122
name: source-bundle
121123
path: sources.tar.gz
@@ -152,8 +154,18 @@ jobs:
152154

153155
steps:
154156

157+
- name: Show Disk Space
158+
run: df -h
159+
160+
- name: Free Disk Space (Ubuntu)
161+
run: |
162+
sudo rm -rf /usr/local/lib/android
163+
164+
- name: After CLEAN-UP Disk Space
165+
run: df -h
166+
155167
- name: Download Source Artifact
156-
uses: actions/download-artifact@v5
168+
uses: actions/download-artifact@v7
157169
with:
158170
name: source-bundle
159171
path: .
@@ -174,6 +186,30 @@ jobs:
174186
- name: Export NuttX Repo SHA
175187
run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
176188

189+
- name: Install NTFC
190+
uses: ./sources/nuttx/.github/actions/ci-container
191+
env:
192+
BLOBDIR: /tools/blobs
193+
with:
194+
run: |
195+
# install python venv
196+
apt-get update
197+
apt-get install -y python3 python3-dev python3-venv
198+
199+
# get NTFC sources
200+
git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-ntfc
201+
cd /github/workspace/nuttx-ntfc
202+
203+
# install NTFC with venv
204+
python3 -m venv /github/workspace/nuttx-ntfc/venv
205+
source /github/workspace/nuttx-ntfc/venv/bin/activate
206+
pip3 install .
207+
deactivate
208+
209+
# get NTFC test cases
210+
cd external
211+
git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
212+
177213
- name: Run builds
178214
uses: ./sources/nuttx/.github/actions/ci-container
179215
env:
@@ -182,6 +218,7 @@ jobs:
182218
run: |
183219
echo "::add-matcher::sources/nuttx/.github/gcc.json"
184220
export ARTIFACTDIR=`pwd`/buildartifacts
221+
export NTFCDIR=/github/workspace/nuttx-ntfc
185222
git config --global --add safe.directory /github/workspace/sources/nuttx
186223
git config --global --add safe.directory /github/workspace/sources/apps
187224
cd sources/nuttx/tools/ci
@@ -192,13 +229,62 @@ jobs:
192229
./cibuild.sh -c -A -N -R -S testlist/${{matrix.boards}}.dat
193230
fi
194231
195-
- uses: actions/upload-artifact@v4
232+
- name: Post-build Disk Space
233+
if: always()
234+
run: df -h
235+
236+
- uses: actions/upload-artifact@v6
196237
if: ${{ always() }}
197238
with:
198239
name: linux-${{matrix.boards}}-builds
199240
path: buildartifacts/
200241
continue-on-error: true
201242

243+
# Test the out-of-tree build
244+
OOT-Build:
245+
needs: Linux
246+
runs-on: ubuntu-latest
247+
env:
248+
DOCKER_BUILDKIT: 1
249+
steps:
250+
- name: Download Source Artifact
251+
uses: actions/download-artifact@v7
252+
with:
253+
name: source-bundle
254+
path: .
255+
256+
- name: Extract sources
257+
run: tar zxf sources.tar.gz
258+
259+
- name: Docker Login
260+
uses: docker/login-action@v3
261+
with:
262+
registry: ghcr.io
263+
username: ${{ github.actor }}
264+
password: ${{ secrets.GITHUB_TOKEN }}
265+
266+
- name: Export NuttX Repo SHA
267+
run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
268+
269+
- name: Run Out-of-Tree Build Test
270+
uses: ./sources/nuttx/.github/actions/ci-container
271+
env:
272+
BLOBDIR: /tools/blobs
273+
with:
274+
run: |
275+
echo "::add-matcher::sources/nuttx/.github/gcc.json"
276+
git config --global --add safe.directory /github/workspace/sources/nuttx
277+
git config --global --add safe.directory /github/workspace/sources/apps
278+
cd sources/nuttx
279+
./tools/ci/cibuild-oot.sh
280+
281+
- uses: actions/upload-artifact@v6
282+
if: ${{ always() }}
283+
with:
284+
name: oot-build-artifacts
285+
path: sources/apps/testing/cxx-oot-build
286+
continue-on-error: true
287+
202288
# Select the macOS Builds based on PR Arch Label
203289
macOS-Arch:
204290
uses: apache/nuttx/.github/workflows/arch.yml@master
@@ -212,7 +298,7 @@ jobs:
212298
macOS:
213299
permissions:
214300
contents: none
215-
runs-on: macos-13
301+
runs-on: macos-15-intel
216302
needs: macOS-Arch
217303
if: ${{ needs.macOS-Arch.outputs.skip_all_builds != '1' }}
218304
strategy:
@@ -221,7 +307,7 @@ jobs:
221307
boards: ${{ fromJSON(needs.macOS-Arch.outputs.selected_builds) }}
222308
steps:
223309
- name: Download Source Artifact
224-
uses: actions/download-artifact@v5
310+
uses: actions/download-artifact@v7
225311
with:
226312
name: source-bundle
227313
path: .
@@ -231,7 +317,7 @@ jobs:
231317

232318
- name: Restore Tools Cache
233319
id: cache-tools
234-
uses: actions/cache@v4
320+
uses: actions/cache@v5
235321
env:
236322
cache-name: ${{ runner.os }}-cache-tools
237323
with:
@@ -243,7 +329,7 @@ jobs:
243329

244330
# Released version of Cython has issues with Python 11. Set runner to use Python 3.10
245331
# https://github.com/cython/cython/issues/4500
246-
- uses: actions/setup-python@v5
332+
- uses: actions/setup-python@v6
247333
with:
248334
python-version: '3.10'
249335
- name: Run Builds
@@ -253,7 +339,7 @@ jobs:
253339
cd sources/nuttx/tools/ci
254340
./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat
255341
256-
- uses: actions/upload-artifact@v4
342+
- uses: actions/upload-artifact@v6
257343
with:
258344
name: macos-${{matrix.boards}}-builds
259345
path: buildartifacts/
@@ -283,7 +369,7 @@ jobs:
283369
run:
284370
shell: msys2 {0}
285371
steps:
286-
- uses: actions/checkout@v5
372+
- uses: actions/checkout@v6
287373
- uses: msys2/setup-msys2@v2
288374
with:
289375
msystem: MSYS
@@ -304,8 +390,9 @@ jobs:
304390
zlib-devel
305391
cmake
306392
ninja
307-
python-pip
393+
python-pip
308394
vim
395+
genromfs
309396
310397
- name: pip3 install
311398
run: |
@@ -315,7 +402,7 @@ jobs:
315402
- run: git config --global core.autocrlf false
316403

317404
- name: Download Source Artifact
318-
uses: actions/download-artifact@v5
405+
uses: actions/download-artifact@v7
319406
with:
320407
name: source-bundle
321408
path: .
@@ -335,7 +422,7 @@ jobs:
335422
cd sources/nuttx/tools/ci
336423
./cibuild.sh -g -i -A -C -N -R testlist/${{matrix.boards}}.dat
337424
338-
- uses: actions/upload-artifact@v4
425+
- uses: actions/upload-artifact@v6
339426
with:
340427
name: msys2-${{matrix.boards}}-builds
341428
path: buildartifacts/
@@ -356,10 +443,10 @@ jobs:
356443
if: ${{ needs.msvc-Arch.outputs.skip_all_builds != '1' }}
357444
runs-on: windows-latest
358445
steps:
359-
- uses: actions/checkout@v5
446+
- uses: actions/checkout@v6
360447
# Set up Python environment and install kconfiglib
361448
- name: Set up Python and install kconfiglib
362-
uses: actions/setup-python@v5
449+
uses: actions/setup-python@v6
363450
with:
364451
python-version: '3.10'
365452
- name: Install kconfiglib
@@ -369,7 +456,7 @@ jobs:
369456
- run: git config --global core.autocrlf false
370457

371458
- name: Download Source Artifact
372-
uses: actions/download-artifact@v5
459+
uses: actions/download-artifact@v7
373460
with:
374461
name: source-bundle
375462
path: .
@@ -387,7 +474,7 @@ jobs:
387474
cd sources\nuttx\tools\ci
388475
.\cibuild.ps1 -n -i -A -C -N testlist\windows.dat
389476
390-
- uses: actions/upload-artifact@v4
477+
- uses: actions/upload-artifact@v6
391478
with:
392479
name: msvc-builds
393480
path: ./sources/buildartifacts/

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout nuttx repo
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434
with:
3535
repository: apache/nuttx
3636
path: nuttx

.github/workflows/doc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ jobs:
3535
build-html:
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@v5
39-
- uses: actions/setup-python@v5
38+
- uses: actions/checkout@v6
39+
- uses: actions/setup-python@v6
4040
with:
41-
python-version: '3.8'
41+
python-version: '3.10'
4242
- name: Generate Documentation
4343
run: |
4444
cd Documentation/
4545
pip3 install pipenv
4646
pipenv install
4747
pipenv run make html
48-
- uses: actions/upload-artifact@v4
48+
- uses: actions/upload-artifact@v6
4949
with:
5050
name: sphinx-docs
5151
path: |

0 commit comments

Comments
 (0)