Skip to content

Commit 0fececd

Browse files
XaositekXaositek
authored
Merge branch 'develop' into multicast-fix
2 parents 3dc2c8c + a4ea55f commit 0fececd

1,421 files changed

Lines changed: 121928 additions & 21080 deletions

File tree

Some content is hidden

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

‎.claude/settings.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"hooks": {
3+
"PostToolUse": [
4+
{
5+
"matcher": "Write|Edit",
6+
"hooks": [
7+
{
8+
"type": "command",
9+
"command": "f=$(tr -d '\\n' | grep -o '\"file_path\"[[:space:]]*:[[:space:]]*\"[^\"]*\"' | head -1 | sed 's/.*:[[:space:]]*\"//; s/\"$//'); [ -n \"$f\" ] && [ -f \"$f\" ] || exit 0; t=$(command -v trunk || echo \"$HOME/.cache/trunk/launcher/trunk\"); [ -x \"$t\" ] || { echo \"trunk-fmt hook: trunk not found; its launcher needs curl or wget to bootstrap the CLI (see 'Formatting & the trunk toolchain' in .github/copilot-instructions.md)\" >&2; exit 1; }; out=$(\"$t\" fmt --force \"$f\" 2>&1) || { echo \"trunk-fmt hook: trunk fmt failed on $f: $out\" >&2; exit 1; }",
10+
"timeout": 120,
11+
"statusMessage": "Formatting (trunk)..."
12+
}
13+
]
14+
}
15+
]
16+
}
17+
}

‎.clusterfuzzlite/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ ENV PIP_ROOT_USER_ACTION=ignore
1818
# trunk-ignore(hadolint/DL3008): apt packages are not pinned.
1919
# trunk-ignore(terrascan/AC_DOCKER_0002): apt packages are not pinned.
2020
RUN apt-get update && apt-get install --no-install-recommends -y \
21-
cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
21+
cmake git zip libgpiod-dev libjsoncpp-dev libbluetooth-dev libi2c-dev \
2222
libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
23-
libusb-1.0-0-dev libssl-dev pkg-config && \
23+
libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev libsdl2-dev && \
2424
apt-get clean && rm -rf /var/lib/apt/lists/* && \
2525
pip install --no-cache-dir -U \
2626
platformio==6.1.16 \

‎.clusterfuzzlite/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cmake --install "$WORK/ulfius/$SANITIZER" --prefix /usr
3131
cd "$SRC/firmware"
3232

3333
PLATFORMIO_EXTRA_SCRIPTS=$(echo -e "pre:.clusterfuzzlite/platformio-clusterfuzzlite-pre.py\npost:.clusterfuzzlite/platformio-clusterfuzzlite-post.py")
34-
STATIC_LIBS=$(pkg-config --libs --static libulfius openssl libgpiod yaml-cpp bluez --silence-errors)
34+
STATIC_LIBS=$(pkg-config --libs --static libulfius openssl libgpiod yaml-cpp jsoncpp bluez --silence-errors)
3535
export PLATFORMIO_EXTRA_SCRIPTS
3636
export STATIC_LIBS
3737
export PLATFORMIO_WORKSPACE_DIR="$WORK/pio/$SANITIZER"
@@ -51,7 +51,7 @@ for f in .clusterfuzzlite/*_fuzzer.cpp; do
5151
fuzzer=$(basename "$f" .cpp)
5252
cp -f "$f" src/fuzzer.cpp
5353
pio run -vvv --environment "$PIO_ENV"
54-
program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/program"
54+
program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/meshtasticd"
5555
cp "$program" "$OUT/$fuzzer"
5656

5757
# Copy shared libraries used by the fuzzer.

‎.coderabbit.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
2+
# CodeRabbit config - see https://docs.coderabbit.ai/getting-started/yaml-configuration
3+
language: en-US
4+
5+
reviews:
6+
# chill = fewer nitpicks.
7+
profile: chill
8+
high_level_summary: true
9+
poem: false
10+
auto_review:
11+
enabled: true
12+
# Don't burn reviews on WIP. This repo opens lots of draft PRs; review on "ready".
13+
drafts: false
14+
# Review PRs regardless of target branch.
15+
base_branches:
16+
- ".*"
17+
# Skip Renovate dependency updates - CI gates dependencies; we review for substance, not every bump.
18+
ignore_usernames:
19+
- renovate
20+
- renovate[bot]
21+
# Stop reviewing once a PR is closed.
22+
abort_on_close: true
23+
24+
path_filters:
25+
# Generated - don't review, just noise + token burn.
26+
- "!src/mesh/generated/**"
27+
- "!protobufs/**"
28+
29+
path_instructions:
30+
- path: "bin/config.d/**"
31+
instructions: >
32+
meshtasticd configuration files. Bundled with meshtasticd Linux/MacOS packaging.
33+
Ensure configurations include metadata found in other configs.

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1616
libssl-dev \
1717
libulfius-dev \
1818
libyaml-cpp-dev \
19+
libjsoncpp-dev \
1920
pipx \
2021
pkg-config \
2122
python3 \

‎.devcontainer/devcontainer.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,21 @@
88
"features": {
99
"ghcr.io/devcontainers/features/python:1": {
1010
"installTools": true,
11-
"version": "3.14"
11+
"version": "3.13"
1212
}
1313
},
1414
"customizations": {
1515
"vscode": {
1616
"extensions": [
1717
"ms-vscode.cpptools",
18-
"platformio.platformio-ide",
18+
"Jason2866.esp-decoder",
19+
"pioarduino.pioarduino-ide",
1920
"Trunk.io"
2021
],
21-
"unwantedRecommendations": ["ms-azuretools.vscode-docker"],
22+
"unwantedRecommendations": [
23+
"ms-azuretools.vscode-docker",
24+
"platformio.platformio-ide"
25+
],
2226
"settings": {
2327
"extensions.ignoreRecommendations": true
2428
}

‎.envrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use nix

‎.github/ISSUE_TEMPLATE/Bug Report.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ body:
7575
- type: checkboxes
7676
id: mui
7777
attributes:
78-
label: Is this bug report about any UI component firmware like InkHUD or Meshtatic UI (MUI)?
78+
label: Is this bug report about any UI (https://meshtastic.org/docs/configuration/device-uis/) component firmware?
7979
options:
80-
- label: Meshtastic UI aka MUI colorTFT
81-
- label: InkHUD ePaper
82-
- label: OLED slide UI on any display
80+
- label: Meshtastic UI aka MUI
81+
- label: InkHUD
82+
- label: BaseUI
8383

8484
- type: input
8585
id: version

‎.github/actionlint.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
self-hosted-runner:
33
# Labels of self-hosted runner in array of strings.
44
labels:
5+
- arctastic
56
- test-runner

‎.github/actions/build-variant/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ runs:
7676
done
7777
7878
- name: PlatformIO ${{ inputs.arch }} download cache
79-
uses: actions/cache@v4
79+
uses: actions/cache@v6
8080
with:
8181
path: ~/.platformio/.cache
8282
key: pio-cache-${{ inputs.arch }}-${{ hashFiles('.github/actions/**', '**.ini') }}
@@ -100,9 +100,9 @@ runs:
100100
id: version
101101

102102
- name: Store binaries as an artifact
103-
uses: actions/upload-artifact@v5
103+
uses: actions/upload-artifact@v7
104104
with:
105-
name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
105+
name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
106106
overwrite: true
107107
path: |
108108
${{ inputs.artifact-paths }}

0 commit comments

Comments
 (0)