Skip to content

Commit

Permalink
bump idf v5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
franzbischoff committed Nov 16, 2023
1 parent fb2ad04 commit 3d90369
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 75 deletions.
35 changes: 27 additions & 8 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM espressif/idf:release-v4.4 AS build-44
FROM espressif/idf:release-v5.0 AS build-50
FROM espressif/idf:release-v5.1 AS build-51

ARG DEBIAN_FRONTEND=nointeractive

Expand Down Expand Up @@ -30,18 +31,19 @@ RUN apt-get update \
RUN update-alternatives --install /usr/local/bin/usbip usbip "$(find /usr/lib/linux-tools/*/usbip | tail -n1)" 20

# QEMU
ENV QEMU_REL=esp-develop-20220919
ENV QEMU_SHA256=f6565d3f0d1e463a63a7f81aec94cce62df662bd42fc7606de4b4418ed55f870
ENV QEMU_DIST=qemu-${QEMU_REL}.tar.bz2
ENV QEMU_URL=https://github.com/espressif/qemu/releases/download/${QEMU_REL}/${QEMU_DIST}
ENV QEMU_VER=8.1.2
ENV QEMU_REL=20231017
ENV QEMU_SHA256=3f5a60b92ac10950c424d5494e91ae43e65dd2ba48b590050712adc9f40f6625
ENV QEMU_FILE=esp-qemu-xtensa-softmmu-develop_${QEMU_VER}_${QEMU_REL}-x86_64-linux-gnu.tar.bz2
ENV QEMU_URL=https://github.com/espressif/qemu/releases/download/esp-develop-${QEMU_VER}-${QEMU_REL}/${QEMU_FILE}

ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8

RUN curl -sSL -o ${QEMU_DIST} ${QEMU_URL} \
&& echo "${QEMU_SHA256} *${QEMU_DIST}" | sha256sum --check --strict - \
&& tar -xf $QEMU_DIST -C /opt \
&& rm ${QEMU_DIST}
RUN curl -sSL -o ${QEMU_FILE} ${QEMU_URL} \
&& echo "${QEMU_SHA256} *${QEMU_FILE}" | sha256sum --check --strict - \
&& tar -xf $QEMU_FILE -C /opt \
&& rm ${QEMU_FILE}

RUN curl https://get.trunk.io -fsSL | bash -s -- -y

Expand All @@ -52,10 +54,25 @@ ENV PATH=/opt/qemu/bin:${PATH}
RUN curl -sSL -o /usr/bin/hadolint https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-x86_64 \
&& chmod 755 /usr/bin/hadolint

RUN curl -sSL -o vale.tar.gz https://github.com/errata-ai/vale/releases/download/v2.28.0/vale_2.28.0_Linux_64-bit.tar.gz \
&& tar -xf vale.tar.gz -C /usr/bin \
&& rm vale.tar.gz

RUN curl -sSL -o packages-microsoft-prod.deb "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb

RUN curl -fsSL https://files.pvs-studio.com/etc/pubkey.txt | apt-key add - \
&& curl -sSL -o /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/etc/viva64.list \
&& apt-get update \
&& apt-get install -y -q --no-install-recommends \
pvs-studio \
strace \
&& rm -rf /var/lib/apt/lists/*

# academic work
RUN pvs-studio-analyzer credentials PVS-Studio Free FREE-FREE-FREE-FREE

# installed dotnet for Astyle plugin. You'll get some warning about missing dotnet, but you can ignore it
# RUN wget --no-verbose https://dot.net/v1/dotnet-install.sh \
# && chmod 755 dotnet-install.sh \
Expand All @@ -67,6 +84,8 @@ RUN curl -sSL -o packages-microsoft-prod.deb "https://packages.microsoft.com/con
RUN echo "source /opt/esp/idf/export.sh > /dev/null 2>&1" >> ~/.bashrc \
&& updatedb

## idf_tools.py install xtensa-clang

# trunk-ignore(semgrep/dockerfile.security.missing-user.missing-user)
ENTRYPOINT [ "/opt/esp/entrypoint.sh" ]

Expand Down
111 changes: 58 additions & 53 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,64 @@
"name": "ESP-IDF QEMU",
"build": {
"dockerfile": "Dockerfile",
"target": "build-50"
"target": "build-51"
},
"customizations": {
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vscode.cpptools",
"espressif.esp-idf-extension",
"ms-vscode.cmake-tools",
"GitHub.copilot-labs",
"GitHub.copilot-nightly",
"spywhere.guides",
"natqe.reload",
"mutantdino.resourcemonitor",
"ExecutableBookProject.myst-highlight",
"ms-dotnettools.vscode-dotnet-runtime",
"chiehyu.vscode-astyle",
"cschlosser.doxdocgen",
"richie5um2.vscode-sort-json",
"redhat.vscode-yaml",
"qcz.text-power-tools",
"PascalReitermann93.vscode-yaml-sort",
"twxs.cmake",
"josetr.cmake-language-support-vscode",
"gerane.Theme-Twilight",
"usernamehw.errorlens",
"emilast.LogFileHighlighter",
"PKief.material-icon-theme",
"IBM.output-colorizer",
"trunk.io",
"EditorConfig.EditorConfig",
"microhobby.linuxkerneldev",
"remcohaszing.schemastore",
"betwo.vscode-doxygen-runner",
"Serhioromano.vscode-gitflow",
"marvhen.reflow-markdown"
],
"settings": {
"terminal.integrated.defaultProfile.linux": "bash",
"idf.espIdfPath": "/opt/esp/idf",
"idf.useIDFKconfigStyle": true,
"idf.saveScope": 2,
"idf.customExtraPaths": "",
"idf.pythonBinPath": "/opt/esp/python_env/idf5.1_py3.8_env/bin/python",
"idf.toolsPath": "/opt/esp",
"idf.gitPath": "/usr/bin/git",
"idf.adapterTargetName": "esp32",
"idf.openOcdConfigs": [
"board/esp32-wrover-kit-1.8v.cfg",
"target/esp32.cfg"
],
"C_Cpp.intelliSenseEngineFallback": "enabled",
"C_Cpp.clang_format_fallbackStyle": "llvm",
"C_Cpp.clang_format_sortIncludes": false,
"C_Cpp.formatting": "clangFormat"
}
}
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vscode.cpptools",
"espressif.esp-idf-extension",
"ms-vscode.cmake-tools",
"GitHub.copilot-labs",
"GitHub.copilot-nightly",
"spywhere.guides",
"natqe.reload",
"mutantdino.resourcemonitor",
"ExecutableBookProject.myst-highlight",
"ms-dotnettools.vscode-dotnet-runtime",
"chiehyu.vscode-astyle",
"cschlosser.doxdocgen",
"richie5um2.vscode-sort-json",
"redhat.vscode-yaml",
"qcz.text-power-tools",
"PascalReitermann93.vscode-yaml-sort",
"twxs.cmake",
"josetr.cmake-language-support-vscode",
"gerane.Theme-Twilight",
"usernamehw.errorlens",
"emilast.LogFileHighlighter",
"PKief.material-icon-theme",
"IBM.output-colorizer",
"trunk.io",
"EditorConfig.EditorConfig",
"microhobby.linuxkerneldev",
"remcohaszing.schemastore",
"betwo.vscode-doxygen-runner",
"Serhioromano.vscode-gitflow",
"marvhen.reflow-markdown"
],
"workspaceMount": "source=${localWorkspaceFolder},target=/workspaces,type=bind",
/* the path of workspace folder to be opened after container is running
*/
Expand All @@ -50,24 +73,6 @@
"IDF_CMAKE_WARN_UNINITIALIZED": "TRUE",
"IDF_MAINTAINER": "1"
},
"settings": {
"terminal.integrated.defaultProfile.linux": "bash",
"idf.espIdfPath": "/opt/esp/idf",
"idf.useIDFKconfigStyle": true,
"idf.saveScope": 2,
"idf.customExtraPaths": "",
"idf.pythonBinPath": "/opt/esp/python_env/idf4.3_py3.6_env/bin/python",
"idf.toolsPath": "/opt/esp",
"idf.gitPath": "/usr/bin/git",
"idf.adapterTargetName": "esp32",
"idf.openOcdConfigs": [
"board/esp32-wrover-kit-1.8v.cfg",
"target/esp32.cfg"
],
"C_Cpp.intelliSenseEngineFallback": "Enabled",
"C_Cpp.clang_format_fallbackStyle": "llvm",
"C_Cpp.clang_format_sortIncludes": false,
"C_Cpp.formatting": "clangFormat"
},
"runArgs": ["--privileged"]
// "postAttachCommand": "git config --global --unset-all gpg.program"
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ sdkconfig.old
dependencies.lock
managed_components
.vscode*/**
.vscode-ctags
1 change: 1 addition & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*logs
*actions
*notifications
*tools
plugins
user_trunk.yaml
user.yaml
14 changes: 7 additions & 7 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
version: 0.1
cli:
version: 1.1.0
version: 1.17.2
plugins:
sources:
- id: trunk
ref: v0.0.6
ref: v1.2.1
uri: https://github.com/trunk-io/plugins
lint:
compile_commands: json
enabled:
- semgrep@0.121.2
- include-what-you-use@0.18
- stylelint@14.15.0
- stylelint@15.11.0
- yamllint@1.28.0
- actionlint@1.6.22
- prettier@2.7.1
- actionlint@1.6.26
- prettier@3.1.0
- hadolint@2.12.0
- clang-tidy@14.0.0
- clang-format@14.0.0
- gitleaks@8.15.0
- markdownlint@0.32.2
- gitleaks@8.18.0
- markdownlint@0.37.0
- git-diff-check
ignore:
- linters: [prettier]
Expand Down
2 changes: 1 addition & 1 deletion docs/doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "max32664 lib"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 0.9.4
PROJECT_NUMBER = 0.9.5

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
4 changes: 4 additions & 0 deletions max32664-hub/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.9.5

- Compatibility with IDF 5.1

## 0.9.4

- Compatibility with IDF 5.0
Expand Down
6 changes: 3 additions & 3 deletions max32664-hub/examples/basic/main/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 0.9.0
version: 0.9.1
description: The first basic example
dependencies:
idf: ">=4.4.0"
idf: ">=5.1.0"
franzbischoff/max32664-hub:
version: ">=0.9.4"
version: ">=0.9.5"
override_path: ../../../
4 changes: 2 additions & 2 deletions max32664-hub/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.9.4
version: 0.9.5
description: MAX32664 Hub library for ESP-IDF
url: https://github.com/franzbischoff/esp-idf-max32664-hub
files:
Expand All @@ -8,4 +8,4 @@ files:
- .clang-tidy
- .editorconfig
dependencies:
idf: ">=4.4.0"
idf: ">=5.1.0"
2 changes: 1 addition & 1 deletion max32664-hub/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.4
0.9.5

0 comments on commit 3d90369

Please sign in to comment.