versions: Update version to 4.4.2

bugfix/qatest spp crash (v4.4)

See merge request espressif/esp-idf!19238

.editorconfig

@@ -19,6 +19,14 @@ trim_trailing_whitespace = false
 indent_style = tab
 indent_size = 2
 
+[*/freertos/**]
+indent_style = tab
+indent_size = 4
+
+[{*/freertos/**.S,**/FreeRTOSConfig.h}]
+indent_style = space
+indent_size = 4
+
 [*.pem]
 insert_final_newline = false
 
@@ -31,7 +39,5 @@ indent_size = 4
 max_line_length = 120
 
 [{*.sh,*.yml,*.yaml}]
-indent_size = 2
-
-[*.ini]
+indent_style = space
 indent_size = 2

.flake8

@@ -143,22 +143,28 @@ exclude =
         components/bootloader/subproject/components/micro-ecc/micro-ecc,
         components/bt/host/nimble/nimble,
         components/cmock/CMock,
+        components/esptool_py/esptool,
+        components/expat/expat,
         components/json/cJSON,
+        components/libsodium/libsodium,
         components/mbedtls/mbedtls,
+        components/nghttp/nghttp2,
         components/openthread/openthread,
+        components/tinyusb,
         components/unity/unity,
         components/spiffs/spiffs,
+        examples/build_system/cmake/import_lib/main/lib/tinyxml2,
+        examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib,
     # autogenerated scripts
         components/protocomm/python/constants_pb2.py,
         components/protocomm/python/sec0_pb2.py,
         components/protocomm/python/sec1_pb2.py,
-        components/protocomm/python/sec2_pb2.py,
         components/protocomm/python/session_pb2.py,
-        components/wifi_provisioning/python/wifi_ctrl_pb2.py,
         components/wifi_provisioning/python/wifi_scan_pb2.py,
         components/wifi_provisioning/python/wifi_config_pb2.py,
         components/wifi_provisioning/python/wifi_constants_pb2.py,
         components/esp_local_ctrl/python/esp_local_ctrl_pb2.py,
+        examples/provisioning/legacy/custom_config/components/custom_provisioning/python/custom_config_pb2.py,
 
 per-file-ignores =
     # Sphinx conf.py files use star imports to setup config variables

.github/ISSUE_TEMPLATE/01_build_install_bug.yml

@@ -1,105 +0,0 @@
-name: Installation or build bug report
-description: Report installation or build bugs
-labels: ['Type: Bug']
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Answers checklist.
-      description: Before submitting a new issue, please follow the checklist and try to find the answer.
-      options:
-        - label: I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
-          required: true
-        - label: I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
-          required: true
-        - label: I have searched the issue tracker for a similar issue and not found a similar issue.
-          required: true
-  - type: input
-    id: idf_version
-    attributes:
-      label: IDF version.
-      description: On which IDF version does this issue occur on? Run `git describe --tags` to find it.
-      placeholder: ex. v3.2-dev-1148-g96cd3b75c
-    validations:
-      required: true
-  - type: dropdown
-    id: operating_system
-    attributes:
-      label: Operating System used.
-      multiple: false
-      options:
-        - Windows
-        - Linux
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: build
-    attributes:
-      label: How did you build your project?
-      multiple: false
-      options:
-        - Command line with Make
-        - Command line with CMake
-        - Command line with idf.py
-        - Eclipse IDE
-        - CLion IDE
-        - VS Code IDE
-        - Other (please specify in More Information)
-    validations:
-      required: true
-  - type: dropdown
-    id: windows_comand_line
-    attributes:
-      label: If you are using Windows, please specify command line type.
-      multiple: false
-      options:
-        - PowerShell
-        - CMD
-    validations:
-      required: false
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is the expected behavior?
-      description: Please provide a clear and concise description of the expected behavior.
-      placeholder: I expected it to...
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: What is the actual behavior?
-      description: Please describe actual behavior.
-      placeholder: Instead it...
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce.
-      description: 'How do you trigger this bug? Please walk us through it step by step. If this is build bug, please attach sdkconfig file (from your project folder). Please attach your code here.'
-      value: |
-        1. Step
-        2. Step
-        3. Step
-        ...
-    validations:
-      required: true
-  - type: textarea
-    id: debug_logs
-    attributes:
-      label: Build or installation Logs.
-      description: Build or installation log goes here, should contain the backtrace, as well as the reset source if it is a crash.
-      placeholder: Your log goes here.
-      render: plain
-    validations:
-      required: false
-  - type: textarea
-    id: more-info
-    attributes:
-      label: More Information.
-      description: Do you have any other information from investigating this?
-      placeholder: ex. I tried on my friend's Windows 10 PC and the command works there.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/02_runtime_bug.yml

@@ -1,125 +0,0 @@
-name: Runtime bug report
-description: Report runtime bugs
-labels: ['Type: Bug']
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Answers checklist.
-      description: Before submitting a new issue, please follow the checklist and try to find the answer.
-      options:
-        - label: I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
-          required: true
-        - label: I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
-          required: true
-        - label: I have searched the issue tracker for a similar issue and not found a similar issue.
-          required: true
-  - type: input
-    id: idf_version
-    attributes:
-      label: IDF version.
-      description: On which IDF version does this issue occur on? Run `git describe --tags` to find it.
-      placeholder: ex. v3.2-dev-1148-g96cd3b75c
-    validations:
-      required: true
-  - type: dropdown
-    id: operating_system
-    attributes:
-      label: Operating System used.
-      multiple: false
-      options:
-        - Windows
-        - Linux
-        - macOS
-    validations:
-      required: true
-  - type: dropdown
-    id: build
-    attributes:
-      label: How did you build your project?
-      multiple: false
-      options:
-        - Command line with Make
-        - Command line with CMake
-        - Command line with idf.py
-        - Eclipse IDE
-        - CLion IDE
-        - VS Code IDE
-        - Other (please specify in More Information)
-    validations:
-      required: true
-  - type: dropdown
-    id: windows_comand_line
-    attributes:
-      label: If you are using Windows, please specify command line type.
-      multiple: false
-      options:
-        - PowerShell
-        - CMD
-    validations:
-      required: false
-  - type: input
-    id: devkit
-    attributes:
-      label: Development Kit.
-      description: On which Development Kit does this issue occur on?
-      placeholder: ex. ESP32-Wrover-Kit v2 | Custom Board
-    validations:
-      required: true
-  - type: dropdown
-    id: power_supply
-    attributes:
-      label: Power Supply used.
-      multiple: false
-      options:
-        - USB
-        - External 5V
-        - External 3.3V
-        - Battery
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is the expected behavior?
-      description: Please provide a clear and concise description of the expected behavior.
-      placeholder: I expected it to...
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: What is the actual behavior?
-      description: Please describe actual behavior.
-      placeholder: Instead it...
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce.
-      description: 'How do you trigger this bug? Please walk us through it step by step. Please attach your code here.'
-      value: |
-        1. Step
-        2. Step
-        3. Step
-        ...
-    validations:
-      required: true
-  - type: textarea
-    id: debug_logs
-    attributes:
-      label: Debug Logs.
-      description: Debug log goes here, should contain the backtrace, as well as the reset source if it is a crash.
-      placeholder: Your log goes here.
-      render: plain
-    validations:
-      required: false
-  - type: textarea
-    id: more-info
-    attributes:
-      label: More Information.
-      description: Do you have any other information from investigating this?
-      placeholder: ex. I tried on my friend's Windows 10 PC and the command works there.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/03_feature_request.yml

@@ -1,34 +0,0 @@
-name: Feature request
-description: Suggest an idea for this project.
-labels: ['Type: Feature Request']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        * We welcome any ideas or feature requests! It’s helpful if you can explain exactly why the feature would be useful.
-        * There are usually some outstanding feature requests in the [existing issues list](https://github.com/espressif/esp-idf/labels/Type%3A%20Feature%20Request), feel free to add comments to them.
-        * If you would like to contribute, please read the [contributions guide](https://docs.espressif.com/projects/esp-idf/en/stable/esp32/contribute/index.html).
-  - type: textarea
-    id: problem-related
-    attributes:
-      label: Is your feature request related to a problem?
-      description: Please provide a clear and concise description of what the problem is.
-      placeholder: ex. I'm always frustrated when ...
-  - type: textarea
-    id: solution
-    attributes:
-      label: Describe the solution you'd like.
-      description: Please provide a clear and concise description of what you want to happen.
-      placeholder: ex. When connecting to an Espressif chip ...
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Describe alternatives you've considered.
-      description: Please provide a clear and concise description of any alternative solutions or features you've considered.
-      placeholder: ex. Choosing other approach wouldn't work, because ...
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context.
-      description: Please add any other context or screenshots about the feature request here.
-      placeholder: ex. This would work only when ...

.github/ISSUE_TEMPLATE/04_other_issue.yml

@@ -1,23 +0,0 @@
-name: General issue report
-description: File an issue report
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Answers checklist.
-      description: Before submitting a new issue, please follow the checklist and try to find the answer.
-      options:
-        - label: I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
-          required: true
-        - label: I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
-          required: true
-        - label: I have searched the issue tracker for a similar issue and not found a similar issue.
-          required: true
-  - type: textarea
-    id: issue
-    attributes:
-      label: General issue report
-      description: Your issue report goes here.
-      placeholder: ex. How do I run...
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,92 @@
+---
+name: Bug report
+about: ESP-IDF crashes, produces incorrect output, or has incorrect behavior
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+----------------------------- Delete below -----------------------------
+
+**Reminder: If your issue is a general question, starts similar to "How do I..", or is related to 3rd party development kits/libs, please discuss this on our community forum at https://esp32.com instead.**
+
+INSTRUCTIONS
+============
+
+Before submitting a new issue, please follow the checklist and try to find the answer.
+
+- [ ] I have read the documentation [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/) and the issue is not addressed there.
+- [ ] I have updated my IDF branch (master or release) to the latest version and checked that the issue is present there.
+- [ ] I have searched the issue tracker for a similar issue and not found a similar issue.
+
+If the issue cannot be solved after the steps before, please follow these instructions so we can get the needed information to help you in a quick and effective fashion.
+
+1. Fill in all the fields under **Environment** marked with [ ] by picking the correct option for you in each case and deleting the others.
+2. Describe your problem.
+3. Include [debug logs from the "monitor" tool](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/tools/idf-monitor.html), or [coredumps](https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/core_dump.html).
+4. Providing as much information as possible under **Other items if possible** will help us locate and fix the problem.
+5. Use [Markdown](https://guides.github.com/features/mastering-markdown/) (see formatting buttons above) and the Preview tab to check what the issue will look like.
+6. Delete these instructions from the above to the below marker lines before submitting this issue.
+
+**IMPORTANT: If you do not follow these instructions and provide the necessary details, your issue may not be resolved.**
+
+----------------------------- Delete above -----------------------------
+
+## Environment
+
+- Development Kit:      [ESP32-Wrover-Kit|ESP32-DevKitC|ESP32-PICO-Kit|ESP32-LyraT|ESP32-LyraTD-MSC|none]
+- Kit version (for WroverKit/PicoKit/DevKitC): [v1|v2|v3|v4]
+- Module or chip used:  [ESP32-WROOM-32|ESP32-WROOM-32D|ESP32-WROOM-32U|ESP32-WROVER|ESP32-WROVER-I|ESP32-WROVER-B|ESP32-WROVER-IB|ESP32-SOLO-1|ESP32-PICO-D4|ESP32]
+- IDF version (run ``git describe --tags`` to find it):
+    // v3.2-dev-1148-g96cd3b75c
+- Build System:         [Make|CMake|idf.py]
+- Compiler version (run ``xtensa-esp32-elf-gcc --version`` to find it):
+    // 1.22.0-80-g6c4433a
+- Operating System:     [Windows|Linux|macOS]
+- (Windows only) environment type: [MSYS2 mingw32|ESP Command Prompt|Plain Command Prompt|PowerShell].
+- Using an IDE?: [No|Yes (please give details)]
+- Power Supply:         [USB|external 5V|external 3.3V|Battery]
+
+## Problem Description
+
+//Detailed problem description goes here.
+
+### Expected Behavior
+
+### Actual Behavior
+
+### Steps to reproduce
+
+1. step1
+2. ...
+
+// If possible, attach a picture of your setup/wiring here.
+
+
+### Code to reproduce this issue
+
+```cpp
+// the code should be wrapped in the ```cpp tag so that it will be displayed better.
+#include "esp_log.h"
+
+void app_main()
+{
+
+}
+
+```
+// If your code is longer than 30 lines, [GIST](https://gist.github.com) is preferred.
+
+## Debug Logs
+
+```
+Debug log goes here, should contain the backtrace, as well as the reset source if it is a crash.
+Please copy the plain text here for us to search the error log. Or attach the complete logs but leave the main part here if the log is *too* long.
+```
+
+## Other items if possible
+
+- [ ] sdkconfig file (attach the sdkconfig file from your project folder)
+- [ ] elf file in the ``build`` folder (**note this may contain all the code details and symbols of your project.**)
+- [ ] coredump (This provides stacks of tasks.)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: ESP-IDF Programming Guide
     url: https://docs.espressif.com/projects/esp-idf/en/latest/

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for ESP-IDF
+title: ''
+labels: 'Type: Feature Request'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+Please give as many details as you can. Include suggestions for useful APIs or interfaces if relevant.
+
+**Additional context**
+
+Add any other context or screenshots about the feature request here.

.github/workflows/docker.yml

@@ -73,15 +73,3 @@ jobs:
           build-args: |
             IDF_CLONE_URL=${{ github.server_url }}/${{ github.repository }}.git
             IDF_CLONE_BRANCH_OR_TAG=${{ env.CLONE_BRANCH_OR_TAG }}
-
-      - name: Update Docker Hub repository description (master branch)
-        if: ${{ github.ref_type == 'branch' && github.ref_name == 'master' }}
-        uses: peter-evans/dockerhub-description@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          # Token based authentication is not supported here:
-          # https://github.com/peter-evans/dockerhub-description/issues/10
-          # https://github.com/docker/roadmap/issues/115#issuecomment-891694974
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: ${{ env.DOCKERHUB_REPO }}
-          readme-filepath: ./tools/docker/README.md

.github/workflows/issue_comment.yml

@@ -3,16 +3,12 @@ name: Sync issue comments to JIRA
 # This workflow will be triggered when new issue comment is created (including PR comments)
 on: issue_comment
 
-# Limit to single concurrent run for workflows which can create Jira issues.
-# Same concurrency group is used in new_issues.yml
-concurrency: jira_issues
-
 jobs:
   sync_issue_comments_to_jira:
     name: Sync Issue Comments to Jira
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - name: Sync issue comments to JIRA
         uses: espressif/github-actions/sync_issues_to_jira@master
         env:

.github/workflows/new_issues.yml

@@ -3,16 +3,12 @@ name: Sync issues to Jira
 # This workflow will be triggered when a new issue is opened
 on: issues
 
-# Limit to single concurrent run for workflows which can create Jira issues.
-# Same concurrency group is used in issue_comment.yml
-concurrency: jira_issues
-
 jobs:
   sync_issues_to_jira:
     name: Sync issues to Jira
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - name: Sync GitHub issues to Jira project
         uses: espressif/github-actions/sync_issues_to_jira@master
         env:

.github/workflows/new_prs.yml

@@ -6,16 +6,12 @@ on:
   schedule:
     - cron: "0 * * * *"
 
-# Limit to single concurrent run for workflows which can create Jira issues.
-# Same concurrency group is used in issue_comment.yml
-concurrency: jira_issues
-
 jobs:
   sync_prs_to_jira:
     name: Sync PRs to Jira
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - name: Sync PRs to Jira project
         uses: espressif/github-actions/sync_issues_to_jira@master
         with:

.github/workflows/pr_approved.yml

@@ -1,23 +0,0 @@
-name: Sync approved PRs to internal codebase
-on:
-  pull_request_target:
-    types: [labeled]
-
-jobs:
-  sync_prs_to_internal_codebase:
-    name: GitHub PR to Internal Codebase Sync
-    runs-on: ubuntu-latest
-    if: (github.event.label.name == 'PR-Sync-Merge')   ||
-        (github.event.label.name == 'PR-Sync-Rebase')  ||
-        (github.event.label.name == 'PR-Sync-Update')
-    steps:
-      - uses: actions/checkout@v2
-      - name: Sync approved PRs to internal codebase
-        uses: espressif/github-actions/github_pr_to_internal_pr@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITLAB_URL: ${{ secrets.GITLAB_URL }}
-          GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
-          GIT_CONFIG_NAME: ${{ secrets.GIT_CONFIG_NAME }}
-          GIT_CONFIG_EMAIL: ${{ secrets.GIT_CONFIG_EMAIL }}
-          JIRA_PROJECT: IDFGH

.github/workflows/pre_commit_check.yml

@@ -1,40 +0,0 @@
-name: Check pre-commit rules
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-permissions:
-  contents: read
-
-jobs:
-  pre_commit_check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Fetch head and base refs
-        # This is necessary for pre-commit to check the changes in the PR branch
-        run: |
-          git fetch origin ${{ github.base_ref }}:base_ref
-          git fetch origin pull/${{ github.event.pull_request.number }}/head:pr_ref
-      - name: Set up Python environment
-        uses: actions/setup-python@master
-        with:
-          python-version: v3.7
-      - name: Install python packages
-        run: |
-          pip install pre-commit
-          pre-commit install-hooks
-      - name: Run pre-commit and check for any changes
-        run: |
-          echo "Commits being checked:"
-          git log --oneline --no-decorate base_ref..pr_ref
-          echo ""
-          if ! pre-commit run --from-ref base_ref --to-ref pr_ref --show-diff-on-failure ; then
-            echo ""
-            echo "::notice::It looks like the commits in this PR have been made without having pre-commit hooks installed."
-            echo "::notice::Please see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/contribute/install-pre-commit-hook.html for instructions."
-            echo ""
-            exit 1
-          fi

.github/workflows/python_lint.yml

@@ -0,0 +1,33 @@
+name: Python CI
+
+# This workflow will be triggered when a PR modifies some python relevant files
+on:
+  pull_request:
+    paths:
+      - "**.py"
+      - "requirements.txt"
+
+jobs:
+  python_lint:
+    name: python lint
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Set up Python environment
+        uses: actions/setup-python@master
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          export IDF_PATH=${GITHUB_WORKSPACE}
+          pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Lint with flake8
+        run: |
+          pip install flake8
+          flake8 . --config=.flake8 --benchmark

.gitignore

@@ -21,20 +21,15 @@ GPATH
 # MacOS directory files
 .DS_Store
 
-# cache dir
-.cache/
-
 # Components Unit Test Apps files
-components/**/build/
-components/**/build_*_*/
+components/**/build
 components/**/sdkconfig
 components/**/sdkconfig.old
 
 # Example project files
-examples/**/build/
-examples/**/build_esp*_*/
 examples/**/sdkconfig
 examples/**/sdkconfig.old
+examples/**/build
 
 # Doc build artifacts
 docs/_build/
@@ -48,7 +43,7 @@ docs/_static/NotoSansSC-Regular.otf
 tools/unit-test-app/sdkconfig
 tools/unit-test-app/sdkconfig.old
 tools/unit-test-app/build
-tools/unit-test-app/build_*_*/
+tools/unit-test-app/builds
 tools/unit-test-app/output
 tools/unit-test-app/test_configs
 
@@ -56,11 +51,13 @@ tools/unit-test-app/test_configs
 log_ut_cmake
 
 # test application build files
-tools/test_apps/**/build/
-tools/test_apps/**/build_*_*/
+tools/test_apps/**/build
 tools/test_apps/**/sdkconfig
 tools/test_apps/**/sdkconfig.old
 
+# IDF monitor test
+tools/test_idf_monitor/outputs
+
 TEST_LOGS
 
 # gcov coverage reports
@@ -94,6 +91,3 @@ dependencies.lock
 
 # managed_components for examples
 managed_components
-
-# pytest log
-pytest_embedded_log/

.gitlab-ci.yml

@@ -1,5 +1,4 @@
 stages:
-  - upload_cache
   - pre_check
   - build
   - assign_test
@@ -54,183 +53,88 @@ variables:
   BATCH_BUILD: "1"
   V: "0"
   CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
-  PYTHON_VER: 3.7.10
-
-  CLANG_TIDY_RUNNER_PROJ: 2107  # idf/clang-tidy-runner
-  IDF_BUILD_APPS_PROJ: 2818  # espressif/idf-build-apps
 
   # Docker images
   BOT_DOCKER_IMAGE_TAG: ":latest"
-
-  ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.1:1"
-  CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis-v5.1:1-1"
-  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env-v5.1:1-1"
-  QEMU_IMAGE: "${CI_DOCKER_REGISTRY}/qemu-v5.1:1-20220802"
-  TARGET_TEST_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.1:1"
-
+  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v4.4-1-v6"
+  ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env:v4.4-1"
+  AFL_FUZZER_TEST_IMAGE: "$CI_DOCKER_REGISTRY/afl-fuzzer-test:v4.4-1-1"
+  CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis:v4.4-1-2"
   SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3"
 
-  PRE_COMMIT_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-pre-commit:1"
-
   # target test config file, used by assign test job
   CI_TARGET_TEST_CONFIG_FILE: "$CI_PROJECT_DIR/.gitlab/ci/target-test.yml"
 
   # target test repo parameters
   TEST_ENV_CONFIG_REPO: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/ci-test-runner-configs.git"
+  CI_AUTO_TEST_SCRIPT_REPO_URL: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/auto_test_script.git"
+  CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v4.1"
 
-  # cache python dependencies
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-
-  # Set this variable to the branch of idf-constraints repo in order to test a custom Python constraint file. The
-  # branch name must be without the remote part ("origin/"). Keep the variable empty in order to use the constraint
-  # file from https://dl.espressif.com/dl/esp-idf.
-  CI_PYTHON_CONSTRAINT_BRANCH: ""
-
-  # Update the filename for a specific ESP-IDF release. It is used only with CI_PYTHON_CONSTRAINT_BRANCH.
-  CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.1.txt"
-
-  # Set this variable to repository name of a Python tool you wish to install and test in the context of ESP-IDF CI.
-  # Keep the variable empty when not used.
-  CI_PYTHON_TOOL_REPO: ""
-
-  # Set this variable to the branch of a Python tool repo specified in CI_PYTHON_TOOL_REPO. The
-  # branch name must be without the remote part ("origin/"). Keep the variable empty when not used.
-  # This is used only if CI_PYTHON_TOOL_REPO is not empty.
-  CI_PYTHON_TOOL_BRANCH: ""
-
-  IDF_CI_BUILD: 1
-
-cache:
-  # pull only for most of the use cases since it's cache dir.
-  # Only set "push" policy for "upload_cache" stage jobs
-  - key: pip-cache
-    paths:
-      - .cache/pip
-    policy: pull
-  - key: submodule-cache
-    paths:
-      - .cache/submodule_archives
-    policy: pull
-
-.common_before_scripts: &common-before_scripts |
-  source tools/ci/utils.sh
-  is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
-
+.setup_tools_unless_target_test: &setup_tools_unless_target_test |
   if [[ -n "$IDF_DONT_USE_MIRRORS" ]]; then
-    export IDF_MIRROR_PREFIX_MAP=
+  export IDF_MIRROR_PREFIX_MAP=
   fi
-
-  if echo "$CI_MERGE_REQUEST_LABELS" | egrep "^([^,\n\r]+,)*include_nightly_run(,[^,\n\r]+)*$"; then
-    export INCLUDE_NIGHTLY_RUN="1"
-  fi
-
-  # configure cmake related flags
-  source tools/ci/configure_ci_environment.sh
-
-  # add extra python packages
-  export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/esp_app_trace:$IDF_PATH/components/partition_table:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
-
-.setup_tools_and_idf_python_venv: &setup_tools_and_idf_python_venv |
-  # must use after setup_tools_except_target_test
-  # otherwise the export.sh won't work properly
-
-  # download constraint file for dev
-  if [[ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]]; then
-    wget -O /tmp/constraint.txt --header="Authorization:Bearer ${ESPCI_TOKEN}" ${GITLAB_HTTP_SERVER}/api/v4/projects/2581/repository/files/${CI_PYTHON_CONSTRAINT_FILE}/raw?ref=${CI_PYTHON_CONSTRAINT_BRANCH}
-    mkdir -p ~/.espressif
-    mv /tmp/constraint.txt ~/.espressif/${CI_PYTHON_CONSTRAINT_FILE}
-  fi
-
-  # Mirror
-  if [[ -n "$IDF_DONT_USE_MIRRORS" ]]; then
-    export IDF_MIRROR_PREFIX_MAP=
-  fi
-
-  # install latest python packages
-  # target test jobs
-  if [[ "${CI_JOB_STAGE}" == "target_test" ]]; then
-    # ttfw jobs
-    if ! echo "${CI_JOB_NAME}" | egrep ".*pytest.*"; then
-      run_cmd bash install.sh --enable-ci --enable-ttfw
-    else
-      run_cmd bash install.sh --enable-ci --enable-pytest
-    fi
-  elif [[ "${CI_JOB_STAGE}" == "build_doc" ]]; then
-    run_cmd bash install.sh --enable-ci --enable-docs
-  elif [[ "${CI_JOB_STAGE}" == "build" ]]; then
-    run_cmd bash install.sh --enable-ci --enable-pytest
-  else
-    if ! echo "${CI_JOB_NAME}" | egrep ".*pytest.*"; then
-      run_cmd bash install.sh --enable-ci
-    else
-      run_cmd bash install.sh --enable-ci --enable-pytest
-    fi
-  fi
-
-  # Install esp-clang if necessary
-  if [[ "$IDF_TOOLCHAIN" == "clang" ]]; then
-    $IDF_PATH/tools/idf_tools.py --non-interactive install esp-clang
-  fi
-
-  source ./export.sh
-
-  # Custom OpenOCD
-  if [[ ! -z "$OOCD_DISTRO_URL" && "$CI_JOB_STAGE" == "target_test" ]]; then
+  if [[ "$SETUP_TOOLS" == "1" || "$CI_JOB_STAGE" != "target_test" ]]; then
+  tools/idf_tools.py --non-interactive install ${SETUP_TOOLS_LIST:-} && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
+    if [[ ! -z "$OOCD_DISTRO_URL" && "$CI_JOB_STAGE" == "target_test" ]]; then
     echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}"
     wget $OOCD_DISTRO_URL
     ARCH_NAME=$(basename $OOCD_DISTRO_URL)
     tar -x -f $ARCH_NAME
     export OPENOCD_SCRIPTS=$PWD/openocd-esp32/share/openocd/scripts
     export PATH=$PWD/openocd-esp32/bin:$PATH
-  fi
-
-  if [[ -n "$CI_PYTHON_TOOL_REPO" ]]; then
-    git clone --quiet --depth=1 -b ${CI_PYTHON_TOOL_BRANCH} https://gitlab-ci-token:${ESPCI_TOKEN}@${GITLAB_HTTPS_HOST}/espressif/${CI_PYTHON_TOOL_REPO}.git
-    pip install ./${CI_PYTHON_TOOL_REPO}
-    rm -rf ${CI_PYTHON_TOOL_REPO}
+    fi
   fi
 
 before_script:
-  - *common-before_scripts
-  - *setup_tools_and_idf_python_venv
+  - source tools/ci/utils.sh
+  - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+  - source tools/ci/setup_python.sh
   - add_gitlab_ssh_keys
+  - source tools/ci/configure_ci_environment.sh
+  - *setup_tools_unless_target_test
   - fetch_submodules
 
+# used for check scripts which we want to run unconditionally
+.before_script_no_sync_submodule:
+  before_script:
+    - echo "Not setting up GitLab key, not fetching submodules"
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+    - source tools/ci/setup_python.sh
+    - source tools/ci/configure_ci_environment.sh
+
 .before_script_minimal:
   before_script:
-    - *common-before_scripts
+    - echo "Only load utils.sh"
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
 
 .before_script_macos:
   before_script:
-    - *common-before_scripts
-    # On macOS, these tools need to be installed
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
     - export IDF_TOOLS_PATH="${HOME}/.espressif_runner_${CI_RUNNER_ID}_${CI_CONCURRENT_ID}"
+    - $IDF_PATH/tools/idf_tools.py install-python-env
+    # On macOS, these tools need to be installed
     - $IDF_PATH/tools/idf_tools.py --non-interactive install cmake ninja
     # This adds tools (compilers) and the version-specific Python environment to PATH
-    - *setup_tools_and_idf_python_venv
+    - *setup_tools_unless_target_test
+    # Install packages required by CI scripts into IDF Python environment
+    - pip install -r $IDF_PATH/tools/ci/python_packages/ttfw_idf/requirements.txt
+    - source tools/ci/configure_ci_environment.sh
+    # Part of tools/ci/setup_python.sh; we don't use pyenv on macOS, so can't run the rest of the script.
+    - export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
     - fetch_submodules
 
-.before_script_build_jobs:
-  before_script:
-    - *common-before_scripts
-    - *setup_tools_and_idf_python_venv
-    - add_gitlab_ssh_keys
-    - fetch_submodules
-    - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
-    - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}
-
 default:
   retry:
     max: 2
-    when:
-      # In case of a runner failure we could hop to another one, or a network error could go away.
-      - runner_system_failure
-      # Job execution timeout may be caused by a network issue.
-      - job_execution_timeout
+    # In case of a runner failure we could hop to another one, or a network error could go away.
+    when: runner_system_failure
 
 include:
   - '.gitlab/ci/rules.yml'
-  - '.gitlab/ci/upload_cache.yml'
   - '.gitlab/ci/docs.yml'
   - '.gitlab/ci/static-code-analysis.yml'
   - '.gitlab/ci/pre_check.yml'

.gitlab/ci/README.md

@@ -19,13 +19,6 @@
     - [Functions](#functions)
       - [CI Job Related](#ci-job-related)
       - [Shell Script Related](#shell-script-related)
-  - [Manifest File to Control the Build/Test apps](#manifest-file-to-control-the-buildtest-apps)
-    - [Grammar](#grammar)
-      - [Operands](#operands)
-      - [Operators](#operators)
-      - [Limitation:](#limitation)
-    - [How does it work?](#how-does-it-work)
-    - [Example](#example)
 
 ## General Workflow
 
@@ -52,11 +45,10 @@
 - `custom_test[_esp32/esp32s2/...]`
 - `docker`
 - `docs`
-- `docs_full`, triggers a full docs build, regardless of files changed
 - `example_test[_esp32/esp32s2/...]`
 - `fuzzer_test`
 - `host_test`
-- `integration_test[_wifi/ble]`
+- `integration_test`
 - `iperf_stress_test`
 - `macos`
 - `macos_test`
@@ -116,7 +108,7 @@ curl -X POST --header "PRIVATE-TOKEN: [YOUR PERSONAL ACCESS TOKEN]" [GITLAB_SERV
     ```yaml
     check_docs_lang_sync:
       extends:
-        - .pre_check_template
+        - .pre_check_job_template
         - .rules:build:docs
       script:
         - cd docs
@@ -231,14 +223,3 @@ To run these commands in shell script locally, place `source tools/ci/utils.sh`
 - `info`: log in green color
 - `run_cmd`: run the command with duration seconds info
 - `retry_failed`: run the command with duration seconds info, retry when failed
-
-## Manifest File to Control the Build/Test apps
-
-`.build-test-rules.yml` file is a manifest file to control if the CI is running the build and test job or not. The Supported Targets table in `README.md` for apps would be auto-generated by `pre-commit` from the app's `.build-test-rules.yml`.
-
-### Grammar
-
-We're using the latest version of [idf-build-apps][idf-build-apps]. Please refer to their [documentation][manifest-doc]
-
-[idf-build-apps]: https://github.com/espressif/idf-build-apps
-[manifest-doc]: https://docs.espressif.com/projects/idf-build-apps/en/latest/manifest.html

.gitlab/ci/assign-test.yml

@@ -1,18 +1,18 @@
 .assign_test_template:
-  image: $TARGET_TEST_ENV_IMAGE
+  image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG
   stage: assign_test
   tags:
     - assign_test
   variables:
-    SUBMODULES_TO_FETCH: "none"
+    SUBMODULES_TO_FETCH: components/esptool_py/esptool
   artifacts:
     paths:
-      - ${TEST_DIR}/test_configs/
-      - artifact_index.json
+      - ${TEST_DIR}/test_configs
+      - ${BUILD_DIR}/artifact_index.json
     when: always
     expire_in: 1 week
   script:
-    - run_cmd python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py $TEST_TYPE $TEST_DIR -c $CI_TARGET_TEST_CONFIG_FILE -o $TEST_DIR/test_configs
+    - python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py $TEST_TYPE $TEST_DIR -c $CI_TARGET_TEST_CONFIG_FILE -o $TEST_DIR/test_configs
 
 assign_example_test:
   extends:
@@ -25,24 +25,64 @@ assign_example_test:
     - job: build_examples_cmake_esp32s2
       artifacts: false
       optional: true
-    - job: build_examples_cmake_esp32c2
-      artifacts: false
-      optional: true
     - job: build_examples_cmake_esp32c3
       artifacts: false
       optional: true
-    - job: build_examples_cmake_esp32c6
-      artifacts: false
-      optional: true
-    - job: build_examples_cmake_esp32h2
-      artifacts: false
-      optional: true
     - job: build_examples_cmake_esp32s3
       artifacts: false
       optional: true
   variables:
     TEST_TYPE: example_test
-    TEST_DIR: examples
+    TEST_DIR: ${CI_PROJECT_DIR}/examples
+    BUILD_DIR: ${CI_PROJECT_DIR}/build_examples
+
+assign_custom_test:
+  extends:
+    - .assign_test_template
+    - .rules:build:custom_test
+  needs:
+    - job: build_test_apps_esp32
+      artifacts: false
+      optional: true
+    - job: build_test_apps_esp32s2
+      artifacts: false
+      optional: true
+    - job: build_test_apps_esp32c3
+      artifacts: false
+      optional: true
+    - job: build_test_apps_esp32s3
+      artifacts: false
+      optional: true
+  variables:
+    TEST_TYPE: custom_test
+    TEST_DIR: ${CI_PROJECT_DIR}/tools/test_apps
+    BUILD_DIR: ${CI_PROJECT_DIR}/build_test_apps
+
+assign_component_ut:
+  extends:
+    - .assign_test_template
+    - .rules:build:component_ut
+  needs:
+    - job: build_component_ut_esp32
+      artifacts: false
+      optional: true
+    - job: build_component_ut_esp32s2
+      artifacts: false
+      optional: true
+    - job: build_component_ut_esp32c3
+      artifacts: false
+      optional: true
+    - job: build_component_ut_esp32s3
+      artifacts: false
+      optional: true
+  variables:
+    TEST_TYPE: component_ut
+    TEST_DIR: ${CI_PROJECT_DIR}/component_ut
+    BUILD_DIR: ${CI_PROJECT_DIR}/build_component_ut
+  script:
+    # COMPONENT_UT_DIRS is set by `set_component_ut_vars` in `utils.sh`
+    - set_component_ut_vars
+    - python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py $TEST_TYPE $COMPONENT_UT_DIRS -c $CI_TARGET_TEST_CONFIG_FILE -o $TEST_DIR/test_configs
 
 assign_unit_test:
   extends:
@@ -53,47 +93,76 @@ assign_unit_test:
       optional: true
     - job: build_esp_idf_tests_cmake_esp32s2
       optional: true
-    - job: build_esp_idf_tests_cmake_esp32c2
-      optional: true
     - job: build_esp_idf_tests_cmake_esp32c3
       optional: true
-    - job: build_esp_idf_tests_cmake_esp32c6
-      optional: true
-    - job: build_esp_idf_tests_cmake_esp32h2
-      optional: true
     - job: build_esp_idf_tests_cmake_esp32s3
       optional: true
   variables:
     TEST_TYPE: unit_test
-    TEST_DIR: components/idf_test/unit_test
+    TEST_DIR: ${CI_PROJECT_DIR}/components/idf_test/unit_test
+    BUILD_DIR: ${CI_PROJECT_DIR}/tools/unit-test-app/builds
+  script:
+    - python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py $TEST_TYPE $TEST_DIR -c $CI_TARGET_TEST_CONFIG_FILE -o $TEST_DIR/test_configs
 
 assign_integration_test:
   extends:
     - .assign_test_template
     - .rules:test:integration_test
-    - .before_script_minimal
-  image: ${CI_INTEGRATION_TEST_ENV_IMAGE}
   needs:
     - build_ssc_esp32
     - build_ssc_esp32c3
-    - build_ssc_esp32c2
   artifacts:
     paths:
       - $TEST_DIR/test_configs
-    expire_in: 1 week
   variables:
     TEST_DIR: ${CI_PROJECT_DIR}/tools/ci/integration_test
     BUILD_DIR: ${CI_PROJECT_DIR}/SSC/ssc_bin
     INTEGRATION_TEST_CASE_PATH: "${CI_PROJECT_DIR}/auto_test_script/TestCaseFiles"
     ASSIGN_TEST_CASE_SCRIPT: "${CI_PROJECT_DIR}/auto_test_script/bin/CIAssignTestCases.py"
     PYTHONPATH: ${CI_PROJECT_DIR}/auto_test_script/packages
-    GIT_LFS_SKIP_SMUDGE: 1
+    PYTHON_VER: 3.7.7
   script:
-    - add_gitlab_ssh_keys
     # clone test script to assign tests
-    - retry_failed git clone ${CI_AUTO_TEST_SCRIPT_REPO_URL} auto_test_script
-    - python $CHECKOUT_REF_SCRIPT auto_test_script auto_test_script
-    - cd auto_test_script
-    - ./tools/ci/setup_idfci.sh
+    # can not retry if downing git lfs files failed, so using empty_branch first.
+    - retry_failed git clone ${CI_AUTO_TEST_SCRIPT_REPO_URL} -b empty_branch
+    - retry_failed git -C auto_test_script checkout -f ${CI_AUTO_TEST_SCRIPT_REPO_BRANCH}
+    - python $CHECKOUT_REF_SCRIPT auto_test_script auto_test_script --customized_only
     # assign integration test cases
     - python ${ASSIGN_TEST_CASE_SCRIPT} -t ${INTEGRATION_TEST_CASE_PATH} -c $CI_TARGET_TEST_CONFIG_FILE -b ${BUILD_DIR} -o $TEST_DIR/test_configs
+
+update_test_cases:
+  extends: .rules:ref:master-schedule
+  stage: assign_test
+  image: $CI_DOCKER_REGISTRY/ubuntu-test-env
+  tags:
+    - deploy_test
+  needs:
+    - build_esp_idf_tests_cmake_esp32
+    - build_esp_idf_tests_cmake_esp32s2
+    - build_esp_idf_tests_cmake_esp32s3
+    - build_esp_idf_tests_cmake_esp32c3
+  artifacts:
+    when: always
+    paths:
+      - ${CI_PROJECT_DIR}/test-management/*.log
+    expire_in: 1 week
+  variables:
+    SUBMODULES_TO_FETCH: "components/esptool_py/esptool"
+    UNIT_TEST_DIR: "${CI_PROJECT_DIR}/components/idf_test/unit_test"
+    BOT_ACCOUNT_CONFIG_FILE: "${CI_PROJECT_DIR}/test-management/Config/Account.local.yml"
+    PYTHONPATH: ${CI_PROJECT_DIR}/auto_test_script/packages
+    PYTHON_VER: 3.7.7
+  script:
+    - export GIT_SHA=$(echo ${PIPELINE_COMMIT_SHA} | cut -c 1-8)
+    - retry_failed git clone $TEST_MANAGEMENT_REPO
+    - python $CHECKOUT_REF_SCRIPT test-management test-management
+    - cd test-management
+    - echo $BOT_JIRA_ACCOUNT > ${BOT_ACCOUNT_CONFIG_FILE}
+    # update unit test cases
+    - export UNIT_TEST_CASE_FILES=$(find $UNIT_TEST_DIR -maxdepth 1 -name "*.yml" | xargs)
+    - python ImportTestCase.py $JIRA_TEST_MANAGEMENT_PROJECT unity -d $UNIT_TEST_CASE_FILES -r $GIT_SHA
+    # update example test cases
+    - python ImportTestCase.py $JIRA_TEST_MANAGEMENT_PROJECT tiny_test_fw -d ${CI_PROJECT_DIR}/examples -r $GIT_SHA
+    - python ImportTestCase.py $JIRA_TEST_MANAGEMENT_PROJECT tiny_test_fw -d ${CI_PROJECT_DIR}/tools/test_apps -r $GIT_SHA
+    # organize test cases
+    - python OrganizeTestCases.py $JIRA_TEST_MANAGEMENT_PROJECT

.gitlab/ci/build.yml

@@ -3,9 +3,8 @@
   image: $ESP_ENV_IMAGE
   tags:
     - build
-    # build only on shiny servers since shiny storage server is at the same location
-    - shiny
   variables:
+    SIZE_INFO_LOCATION: "$CI_PROJECT_DIR/size_info.txt"
     # Enable ccache for all build jobs. See configure_ci_environment.sh for more ccache related settings.
     IDF_CCACHE_ENABLE: "1"
   after_script:
@@ -13,413 +12,13 @@
     - test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats || true
   dependencies: []
 
-.build_cmake_template:
-  extends:
-    - .build_template
-    - .before_script_build_jobs
-  dependencies: # set dependencies to null to avoid missing artifacts issue
-  needs:
-    - job: fast_template_app
-      artifacts: false
-  artifacts:
-    paths:
-      - "**/build*/size.json"
-      - "**/build*/build_log.txt"
-      - "**/build*/*.bin"
-      # upload to s3 server to save the artifacts size
-      # - "**/build*/*.map"
-      # ttfw tests require elf files
-      - "**/build*/*.elf"
-      - "**/build*/flasher_args.json"
-      - "**/build*/flash_project_args"
-      - "**/build*/config/sdkconfig.json"
-      # ttfw tests require sdkconfig file
-      - "**/build*/sdkconfig"
-      - "**/build*/bootloader/*.bin"
-      - "**/build*/partition_table/*.bin"
-      - list_job_*.json
-      - size_info.txt
-      # unit test specific
-      - components/idf_test/unit_test/*.yml
-    when: always
-    expire_in: 4 days
-  after_script:
-    # Show ccache statistics if enabled globally
-    - test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats || true
-    # upload the binary files to s3 server
-    - echo -e "\e[0Ksection_start:`date +%s`:upload_binaries_to_s3_server[collapsed=true]\r\e[0KUploading binaries to s3 Server"
-    - shopt -s globstar
-    # use || true to bypass the no-file error
-    - zip ${CI_JOB_ID}.zip **/build*/*.bin || true
-    - zip ${CI_JOB_ID}.zip **/build*/*.elf || true
-    - zip ${CI_JOB_ID}.zip **/build*/*.map || true
-    - zip ${CI_JOB_ID}.zip **/build*/flasher_args.json || true
-    - zip ${CI_JOB_ID}.zip **/build*/flash_project_args || true
-    - zip ${CI_JOB_ID}.zip **/build*/config/sdkconfig.json || true
-    - zip ${CI_JOB_ID}.zip **/build*/sdkconfig || true
-    - zip ${CI_JOB_ID}.zip **/build*/bootloader/*.bin || true
-    - zip ${CI_JOB_ID}.zip **/build*/partition_table/*.bin || true
-    - mc alias set shiny-s3 ${SHINY_S3_SERVER} ${SHINY_S3_ACCESS_KEY} ${SHINY_S3_SECRET_KEY}
-    - mc cp ${CI_JOB_ID}.zip shiny-s3/idf-artifacts/${CI_PIPELINE_ID}/${CI_JOB_ID}.zip
-    - echo -e "\e[0Ksection_end:`date +%s`:upload_binaries_to_s3_server\r\e[0K"
-    - echo "Please download the full binary files (including *.elf and *.map files) from the following share link"
-    # would be clean up after 4 days
-    - mc share download shiny-s3/idf-artifacts/${CI_PIPELINE_ID}/${CI_JOB_ID}.zip --expire=96h
-  script:
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v
-      -t $IDF_TARGET
-      --copy-sdkconfig
-      --collect-size-info size_info.txt
-      --collect-app-info list_job_${CI_NODE_INDEX:-1}.json
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      --extra-preserve-dirs
-        examples/bluetooth/esp_ble_mesh/ble_mesh_console
-        examples/bluetooth/hci/controller_hci_uart_esp32
-        examples/wifi/iperf
-
-.build_cmake_clang_template:
-  extends:
-    - .build_cmake_template
-  variables:
-    IDF_TOOLCHAIN: clang
-    TEST_BUILD_OPTS_EXTRA: ""
-    TEST_DIR: tools/test_apps/system/cxx_pthread_bluetooth
-  script:
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v
-      -t $IDF_TARGET
-      --copy-sdkconfig
-      --collect-size-info size_info.txt
-      --collect-app-info list_job_${CI_NODE_INDEX:-1}.json
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-      $TEST_BUILD_OPTS_EXTRA
-
-.build_pytest_template:
-  extends:
-    - .build_cmake_template
-    - .before_script_build_jobs
-  artifacts:
-    paths:
-      - "**/build*/size.json"
-      - "**/build*/build_log.txt"
-      - "**/build*/*.bin"
-      # upload to s3 server to save the artifacts size
-      # - "**/build*/*.map"
-      # - "**/build*/*.elf"
-      - "**/build*/flasher_args.json"
-      - "**/build*/flash_project_args"
-      - "**/build*/config/sdkconfig.json"
-      - "**/build*/bootloader/*.bin"
-      - "**/build*/partition_table/*.bin"
-      - list_job_*.json
-      - size_info.txt
-    when: always
-    expire_in: 4 days
-  script:
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v
-      -t $IDF_TARGET
-      --pytest-apps
-      --collect-size-info size_info.txt
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-
-.build_pytest_no_jtag_template:
-  extends: .build_pytest_template
-  script:
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v
-      -t $IDF_TARGET
-      -m \"not host_test and not jtag\"
-      --pytest-apps
-      --collect-size-info size_info.txt
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-
-.build_pytest_jtag_template:
-  extends:
-    - .build_cmake_template
-    - .before_script_build_jobs
-  artifacts:
-    paths:
-      - "**/build*/size.json"
-      - "**/build*/build_log.txt"
-      - "**/build*/*.bin"
-      # upload to s3 server to save the artifacts size
-      # - "**/build*/*.map"
-      - "**/build*/*.elf"  # need elf for gdb
-      - "**/build*/flasher_args.json"
-      - "**/build*/flash_project_args"
-      - "**/build*/config/sdkconfig.json"
-      - "**/build*/bootloader/*.bin"
-      - "**/build*/partition_table/*.bin"
-      - list_job_*.json
-      - size_info.txt
-    when: always
-    expire_in: 4 days
-  script:
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py $TEST_DIR -v
-      -t $IDF_TARGET
-      -m \"not host_test and jtag\"
-      --pytest-apps
-      --collect-size-info size_info.txt
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-
-build_pytest_examples_esp32:
-  extends:
-    - .build_pytest_no_jtag_template
-    - .rules:build:example_test-esp32
-  parallel: 6
-  variables:
-    IDF_TARGET: esp32
-    TEST_DIR: examples
-
-build_pytest_examples_esp32s2:
-  extends:
-    - .build_pytest_no_jtag_template
-    - .rules:build:example_test-esp32s2
-  parallel: 3
-  variables:
-    IDF_TARGET: esp32s2
-    TEST_DIR: examples
-
-build_pytest_examples_esp32s3:
-  extends:
-    - .build_pytest_no_jtag_template
-    - .rules:build:example_test-esp32s3
-  parallel: 4
-  variables:
-    IDF_TARGET: esp32s3
-    TEST_DIR: examples
-
-build_pytest_examples_esp32c3:
-  extends:
-    - .build_pytest_no_jtag_template
-    - .rules:build:example_test-esp32c3
-  parallel: 4
-  variables:
-    IDF_TARGET: esp32c3
-    TEST_DIR: examples
-
-build_pytest_examples_esp32c2:
-  extends:
-    - .build_pytest_no_jtag_template
-    - .rules:build:example_test-esp32c2
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32c2
-    TEST_DIR: examples
-
-build_pytest_examples_jtag:  # for all targets
-  extends:
-    - .build_pytest_jtag_template
-    - .rules:build:example_test-esp32
-  variables:
-    IDF_TARGET: all
-    TEST_DIR: examples
-
-build_pytest_examples_esp32c6:
-  extends:
-    - .build_pytest_template
-    - .rules:build:example_test-esp32c6
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32c6
-    TEST_DIR: examples
-
-build_pytest_examples_esp32h2:
-  extends:
-    - .build_pytest_template
-    - .rules:build:example_test-esp32h2
-  variables:
-    IDF_TARGET: esp32h2
-    TEST_DIR: examples
-
-build_pytest_components_esp32:
-  extends:
-    - .build_pytest_template
-    - .rules:build:component_ut-esp32
-  parallel: 5
-  variables:
-    IDF_TARGET: esp32
-    TEST_DIR: components
-
-build_pytest_components_esp32s2:
-  extends:
-    - .build_pytest_template
-    - .rules:build:component_ut-esp32s2
-  parallel: 4
-  variables:
-    IDF_TARGET: esp32s2
-    TEST_DIR: components
-
-build_pytest_components_esp32s3:
-  extends:
-    - .build_pytest_template
-    - .rules:build:component_ut-esp32s3
-  parallel: 4
-  variables:
-    IDF_TARGET: esp32s3
-    TEST_DIR: components
-
-build_pytest_components_esp32c3:
-  extends:
-    - .build_pytest_template
-    - .rules:build:component_ut-esp32c3
-  parallel: 4
-  variables:
-    IDF_TARGET: esp32c3
-    TEST_DIR: components
-
-build_pytest_components_esp32c2:
-  extends:
-    - .build_pytest_template
-    - .rules:build:component_ut-esp32c2
-  parallel: 3
-  variables:
-    IDF_TARGET: esp32c2
-    TEST_DIR: components
-
-build_pytest_components_esp32c6:
-  extends:
-    - .build_pytest_template
-    - .rules:build:component_ut-esp32c6
-  parallel: 3
-  variables:
-    IDF_TARGET: esp32c6
-    TEST_DIR: components
-
-build_pytest_components_esp32h2:
-  extends:
-    - .build_pytest_template
-    - .rules:build:component_ut-esp32h2
-  parallel: 4
-  variables:
-    IDF_TARGET: esp32h2
-    TEST_DIR: components
-
-build_only_components_apps:
-  extends:
-    - .build_cmake_template
-    - .rules:build:component_ut
-  parallel: 5
-  script:
-    - set_component_ut_vars
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py $COMPONENT_UT_DIRS -v
-      -t all
-      --collect-size-info size_info.txt
-      --collect-app-info list_job_${CI_NODE_INDEX:-1}.json
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-
-.build_pytest_test_apps_template:
-  extends: .build_pytest_template
-  artifacts:
-    paths:
-      - "**/build*/size.json"
-      - "**/build*/build_log.txt"
-      - "**/build*/*.bin"
-      # upload to s3 server to save the artifacts size
-      # - "**/build*/*.map"
-      # pytest test apps requires elf files for coredump tests
-      - "**/build*/*.elf"
-      - "**/build*/flasher_args.json"
-      - "**/build*/flash_project_args"
-      - "**/build*/config/sdkconfig.json"
-      - "**/build*/bootloader/*.elf"
-      - "**/build*/bootloader/*.bin"
-      - "**/build*/partition_table/*.bin"
-      - "**/build*/project_description.json"
-      - list_job_*.json
-      - size_info.txt
-    when: always
-    expire_in: 4 days
-
-build_pytest_test_apps_esp32:
-  extends:
-    - .build_pytest_test_apps_template
-    - .rules:build:custom_test-esp32
-  variables:
-    IDF_TARGET: esp32
-    TEST_DIR: tools/test_apps
-
-build_pytest_test_apps_esp32s2:
-  extends:
-    - .build_pytest_test_apps_template
-    - .rules:build:custom_test-esp32s2
-  variables:
-    IDF_TARGET: esp32s2
-    TEST_DIR: tools/test_apps
-
-build_pytest_test_apps_esp32s3:
-  extends:
-    - .build_pytest_test_apps_template
-    - .rules:build:custom_test-esp32s3
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32s3
-    TEST_DIR: tools/test_apps
-
-build_pytest_test_apps_esp32c3:
-  extends:
-    - .build_pytest_test_apps_template
-    - .rules:build:custom_test-esp32c3
-  variables:
-    IDF_TARGET: esp32c3
-    TEST_DIR: tools/test_apps
-
-build_pytest_test_apps_esp32c2:
-  extends:
-    - .build_pytest_test_apps_template
-    - .rules:build:custom_test-esp32c2
-  variables:
-    IDF_TARGET: esp32c2
-    TEST_DIR: tools/test_apps
-
-build_pytest_test_apps_esp32c6:
-  extends:
-    - .build_pytest_test_apps_template
-    - .rules:build:custom_test-esp32c6
-  variables:
-    IDF_TARGET: esp32c6
-    TEST_DIR: tools/test_apps
-
-build_pytest_test_apps_esp32h2:
-  extends:
-    - .build_pytest_test_apps_template
-    - .rules:build:custom_test-esp32h2
-  variables:
-    IDF_TARGET: esp32h2
-    TEST_DIR: tools/test_apps
-
-build_only_tools_test_apps:
-  extends:
-    - .build_cmake_template
-    - .rules:build:custom_test
-  parallel: 9
-  script:
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py tools/test_apps -v
-      -t all
-      --collect-size-info size_info.txt
-      --collect-app-info list_job_${CI_NODE_INDEX:-1}.json
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-
 .build_template_app_template:
-  extends:
-    - .build_template
-    - .before_script_build_jobs
+  extends: .build_template
   variables:
     LOG_PATH: "${CI_PROJECT_DIR}/log_template_app"
     BUILD_PATH: "${CI_PROJECT_DIR}/build_template_app"
     BUILD_DIR: "@t/@w"
+    BUILD_LOG_MAKE: "${LOG_PATH}/make_@t_@w.txt"
     BUILD_LOG_CMAKE: "${LOG_PATH}/cmake_@t_@w.txt"
     BUILD_COMMAND_ARGS: ""
   artifacts:
@@ -428,7 +27,6 @@ build_only_tools_test_apps:
       - log_template_app/*
       - size_info.txt
       - build_template_app/**/size.json
-    expire_in: 1 week
   script:
     # Set the variable for 'esp-idf-template' testing
     - ESP_IDF_TEMPLATE_GIT=${ESP_IDF_TEMPLATE_GIT:-"https://github.com/espressif/esp-idf-template.git"}
@@ -437,6 +35,8 @@ build_only_tools_test_apps:
     # using on esp-idf. If it doesn't exist then just stick to the default branch
     - python $CHECKOUT_REF_SCRIPT esp-idf-template esp-idf-template
     - export PATH="$IDF_PATH/tools:$PATH"
+    - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
+    - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}
     # Only do the default cmake build for each target, remaining part are done in the build_template_app job
     - tools/ci/build_template_app.sh ${BUILD_COMMAND_ARGS}
 
@@ -455,9 +55,6 @@ fast_template_app:
   extends:
     - .build_template
     - .rules:build:integration_test
-  needs:
-    - job: fast_template_app
-      artifacts: false
   artifacts:
     paths:
       - SSC/ssc_bin
@@ -480,12 +77,6 @@ build_ssc_esp32s2:
   variables:
     TARGET_NAME: "ESP32S2"
 
-build_ssc_esp32c2:
-  extends: .build_ssc_template
-  parallel: 2
-  variables:
-    TARGET_NAME: "ESP32C2"
-
 build_ssc_esp32c3:
   extends: .build_ssc_template
   parallel: 3
@@ -498,59 +89,41 @@ build_ssc_esp32s3:
   variables:
     TARGET_NAME: "ESP32S3"
 
-build_ssc_esp32c6:
-  extends: .build_ssc_template
-  parallel: 3
-  variables:
-    TARGET_NAME: "ESP32C6"
-
-build_ssc_esp32h2:
-  extends: .build_ssc_template
-  parallel: 2
-  variables:
-    TARGET_NAME: "ESP32H2"
-
 .build_esp_idf_tests_cmake_template:
-  extends:
-    - .build_cmake_template
-    - .before_script_build_jobs
+  extends: .build_template
+  dependencies:  # set dependencies to null to avoid missing artifacts issue
+  needs:
+    - job: fast_template_app
+      artifacts: false
+    - scan_tests
   artifacts:
     paths:
-      - "**/build*/size.json"
-      - "**/build*/build_log.txt"
-      - "**/build*/*.bin"
-      # upload to s3 server to save the artifacts size
-      # - "**/build*/*.map"
-      # ttfw tests require elf files
-      - "**/build*/*.elf"
-      - "**/build*/flasher_args.json"
-      - "**/build*/flash_project_args"
-      - "**/build*/config/sdkconfig.json"
-      - "**/build*/sdkconfig"
-      - "**/build*/bootloader/*.bin"
-      - "**/build*/partition_table/*.bin"
-      - list_job_*.json
-      - size_info.txt
+      - tools/unit-test-app/output/${IDF_TARGET}
+      - tools/unit-test-app/builds/*.json
+      - tools/unit-test-app/builds/${IDF_TARGET}/*/size.json
       - components/idf_test/unit_test/*.yml
+      - $LOG_PATH
+      - $SIZE_INFO_LOCATION
     when: always
     expire_in: 4 days
+  variables:
+    LOG_PATH: "$CI_PROJECT_DIR/log_ut_cmake"
+    BUILD_PATH: ${CI_PROJECT_DIR}/tools/unit-test-app/builds
+    OUTPUT_PATH: ${CI_PROJECT_DIR}/tools/unit-test-app/output
+    BUILD_SYSTEM: "cmake"
+    TEST_TYPE: "unit_test"
+    PYTHON_VER: 3.6.13
+    LDGEN_CHECK_MAPPING: 1
   script:
-    # CI specific options start from "--collect-size-info xxx". could ignore when running locally
-    - run_cmd python tools/ci/ci_build_apps.py tools/unit-test-app -v
-      -t $IDF_TARGET
-      --config "configs/*="
-      --copy-sdkconfig
-      --preserve-all
-      --collect-size-info size_info.txt
-      --collect-app-info list_job_${CI_NODE_INDEX:-1}.json
-      --parallel-count ${CI_NODE_TOTAL:-1}
-      --parallel-index ${CI_NODE_INDEX:-1}
-    - run_cmd python tools/unit-test-app/tools/UnitTestParser.py tools/unit-test-app ${CI_NODE_INDEX:-1}
+    - ${IDF_PATH}/tools/ci/find_apps_build_apps.sh
+    - cd $CI_PROJECT_DIR/tools/unit-test-app
+    - python tools/UnitTestParser.py ${BUILD_PATH} ${CI_NODE_INDEX:-1}
 
 build_esp_idf_tests_cmake_esp32:
   extends:
     - .build_esp_idf_tests_cmake_template
     - .rules:build:unit_test-esp32
+  parallel: 2
   variables:
     IDF_TARGET: esp32
 
@@ -558,6 +131,7 @@ build_esp_idf_tests_cmake_esp32s2:
   extends:
     - .build_esp_idf_tests_cmake_template
     - .rules:build:unit_test-esp32s2
+  parallel: 2
   variables:
     IDF_TARGET: esp32s2
 
@@ -568,13 +142,6 @@ build_esp_idf_tests_cmake_esp32s3:
   variables:
     IDF_TARGET: esp32s3
 
-build_esp_idf_tests_cmake_esp32c2:
-  extends:
-    - .build_esp_idf_tests_cmake_template
-    - .rules:build:unit_test-esp32c2
-  variables:
-    IDF_TARGET: esp32c2
-
 build_esp_idf_tests_cmake_esp32c3:
   extends:
     - .build_esp_idf_tests_cmake_template
@@ -582,136 +149,175 @@ build_esp_idf_tests_cmake_esp32c3:
   variables:
     IDF_TARGET: esp32c3
 
-build_esp_idf_tests_cmake_esp32c6:
-  extends:
-    - .build_esp_idf_tests_cmake_template
-    - .rules:build:unit_test-esp32c6
+.build_examples_template:
+  extends: .build_template
+  dependencies:  # set dependencies to null to avoid missing artifacts issue
+  needs:
+    - job: fast_template_app
+      artifacts: false
+    - scan_tests
   variables:
-    IDF_TARGET: esp32c6
+    TEST_PREFIX: examples
+    TEST_RELATIVE_DIR: examples
+    SCAN_TEST_JSON: ${CI_PROJECT_DIR}/${TEST_RELATIVE_DIR}/test_configs/scan_${IDF_TARGET}_${BUILD_SYSTEM}.json
+    TEST_TYPE: example_test
+    LOG_PATH: ${CI_PROJECT_DIR}/log_${TEST_PREFIX}
+    BUILD_PATH: ${CI_PROJECT_DIR}/build_${TEST_PREFIX}
+    PYTHON_VER: 3.6.13
+    LDGEN_CHECK_MAPPING: 1
+  script:
+    # it's not possible to build 100% out-of-tree and have the "artifacts"
+    # mechanism work, but this is the next best thing
+    - ${IDF_PATH}/tools/ci/find_apps_build_apps.sh
 
-build_esp_idf_tests_cmake_esp32h2:
+build_examples_make:
   extends:
-    - .build_esp_idf_tests_cmake_template
-    - .rules:build:unit_test-esp32h2
+    - .build_examples_template
+    - .rules:build:example_test-esp32
+  stage: host_test
+  # This is a workaround for a rarely encountered issue with building examples in CI.
+  # Probably related to building of Kconfig in 'make clean' stage
+  retry: 1
+  parallel: 8
+  artifacts:
+    paths:
+      - $LOG_PATH
+      - build_${TEST_PREFIX}/*/*/*/build/size.json
+      - $SIZE_INFO_LOCATION
+    when: always
+    expire_in: 4 days
   variables:
-    IDF_TARGET: esp32h2
+    BUILD_SYSTEM: make
+    IDF_TARGET: esp32  # currently we only support esp32
+
+# same as above, but for CMake
+.build_examples_cmake_template:
+  extends: .build_examples_template
+  artifacts:
+    paths:
+      - build_${TEST_PREFIX}/list.json
+      - build_${TEST_PREFIX}/list_job_*.json
+      - build_${TEST_PREFIX}/*/*/*/sdkconfig
+      - build_${TEST_PREFIX}/*/*/*/build/size.json
+      - build_${TEST_PREFIX}/*/*/*/build/*.bin
+      - build_${TEST_PREFIX}/*/*/*/build/*.elf
+      - build_${TEST_PREFIX}/*/*/*/build/*.map
+      - build_${TEST_PREFIX}/*/*/*/build/flasher_args.json
+      - build_${TEST_PREFIX}/*/*/*/build/bootloader/*.bin
+      - build_${TEST_PREFIX}/*/*/*/build/partition_table/*.bin
+      - $LOG_PATH
+      - $SIZE_INFO_LOCATION
+    when: always
+    expire_in: 4 days
+  variables:
+    BUILD_SYSTEM: cmake
 
 build_examples_cmake_esp32:
   extends:
-    - .build_cmake_template
+    - .build_examples_cmake_template
     - .rules:build:example_test-esp32
-  parallel: 8
+  parallel: 10
   variables:
     IDF_TARGET: esp32
-    TEST_DIR: examples
 
 build_examples_cmake_esp32s2:
   extends:
-    - .build_cmake_template
+    - .build_examples_cmake_template
     - .rules:build:example_test-esp32s2
-  parallel: 7
+  parallel: 8
   variables:
     IDF_TARGET: esp32s2
-    TEST_DIR: examples
 
 build_examples_cmake_esp32s3:
   extends:
-    - .build_cmake_template
+    - .build_examples_cmake_template
     - .rules:build:example_test-esp32s3
-  parallel: 7
+  parallel: 8
   variables:
     IDF_TARGET: esp32s3
-    TEST_DIR: examples
-
-build_examples_cmake_esp32c2:
-  extends:
-    - .build_cmake_template
-    - .rules:build:example_test-esp32c2
-  parallel: 6
-  variables:
-    IDF_TARGET: esp32c2
-    TEST_DIR: examples
 
 build_examples_cmake_esp32c3:
   extends:
-    - .build_cmake_template
+    - .build_examples_cmake_template
     - .rules:build:example_test-esp32c3
-  parallel: 6
+  parallel: 8
   variables:
     IDF_TARGET: esp32c3
-    TEST_DIR: examples
 
-build_examples_cmake_esp32c6:
-  extends:
-    - .build_cmake_template
-    - .rules:build:example_test-esp32c6
-  parallel: 6
+.build_test_apps_template:
+  extends: .build_examples_cmake_template
   variables:
-    IDF_TARGET: esp32c6
-    TEST_DIR: examples
+    TEST_PREFIX: test_apps
+    TEST_RELATIVE_DIR: tools/test_apps
+    TEST_TYPE: custom_test
+  script:
+    - ${IDF_PATH}/tools/ci/find_apps_build_apps.sh
 
-build_examples_cmake_esp32h2:
+build_test_apps_esp32:
   extends:
-    - .build_cmake_template
-    - .rules:build:example_test-esp32h2
-  parallel: 2
-  variables:
-    IDF_TARGET: esp32h2
-    TEST_DIR: examples
-
-build_clang_test_apps_esp32:
-  extends:
-    - .build_cmake_clang_template
+    - .build_test_apps_template
     - .rules:build:custom_test-esp32
+  parallel: 8
   variables:
     IDF_TARGET: esp32
 
-build_clang_test_apps_esp32s2:
+build_test_apps_esp32s2:
   extends:
-    - .build_cmake_clang_template
+    - .build_test_apps_template
     - .rules:build:custom_test-esp32s2
+  parallel: 8
   variables:
     IDF_TARGET: esp32s2
 
-build_clang_test_apps_esp32s3:
+build_test_apps_esp32s3:
   extends:
-    - .build_cmake_clang_template
+    - .build_test_apps_template
     - .rules:build:custom_test-esp32s3
+  parallel: 8
   variables:
     IDF_TARGET: esp32s3
 
-.build_clang_test_apps_riscv:
+build_test_apps_esp32c3:
   extends:
-    - .build_cmake_clang_template
-  variables:
-    # For RISCV clang generates '.linker-options' sections of type 'llvm_linker_options' in asm files.
-    # See (https://llvm.org/docs/Extensions.html#linker-options-section-linker-options).
-    # Binutils gas ignores them with warning.
-    # TODO: LLVM-112, Use integrated assembler.
-    TEST_BUILD_OPTS_EXTRA: "--ignore-warning-str 'Warning: unrecognized section type'"
-
-build_clang_test_apps_esp32c3:
-  extends:
-    - .build_clang_test_apps_riscv
+    - .build_test_apps_template
     - .rules:build:custom_test-esp32c3
+  parallel: 8
   variables:
     IDF_TARGET: esp32c3
 
-build_clang_test_apps_esp32c2:
-  extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build:custom_test-esp32c2
+.build_component_ut_template:
+  extends: .build_test_apps_template
   variables:
-    IDF_TARGET: esp32c2
+    TEST_PREFIX: component_ut
+    TEST_RELATIVE_DIR: component_ut
 
-build_clang_test_apps_esp32c6:
+build_component_ut_esp32:
   extends:
-    - .build_clang_test_apps_riscv
-    - .rules:build:custom_test-esp32c6
-  # TODO: c6 builds fail in master due to missing headers
-  allow_failure: true
+    - .build_component_ut_template
+    - .rules:build:component_ut-esp32
   variables:
-    IDF_TARGET: esp32c6
+    IDF_TARGET: esp32
+
+build_component_ut_esp32s2:
+  extends:
+    - .build_component_ut_template
+    - .rules:build:component_ut-esp32s2
+  variables:
+    IDF_TARGET: esp32s2
+
+build_component_ut_esp32s3:
+  extends:
+    - .build_component_ut_template
+    - .rules:build:component_ut-esp32s3
+  variables:
+    IDF_TARGET: esp32s3
+
+build_component_ut_esp32c3:
+  extends:
+    - .build_component_ut_template
+    - .rules:build:component_ut-esp32c3
+  variables:
+    IDF_TARGET: esp32c3
 
 .test_build_system_template:
   stage: host_test
@@ -728,6 +334,11 @@ build_clang_test_apps_esp32c6:
     - cd test_build_system
     - ${IDF_PATH}/tools/ci/${SHELL_TEST_SCRIPT}
 
+test_build_system:
+  extends: .test_build_system_template
+  variables:
+    SHELL_TEST_SCRIPT: test_build_system.sh
+
 test_build_system_cmake:
   extends: .test_build_system_template
   variables:
@@ -743,26 +354,6 @@ test_build_system_cmake_macos:
   variables:
     SHELL_TEST_SCRIPT: test_build_system_cmake.sh
 
-test_build_system_spaces:
-  extends: .test_build_system_template
-  variables:
-    SHELL_TEST_SCRIPT: test_build_system_spaces.py
-
-pytest_build_system:
-  extends: .test_build_system_template
-  artifacts:
-    paths:
-      - XUNIT_RESULT.xml
-      - test_build_system
-    when: always
-    expire_in: 2 days
-    reports:
-      junit: XUNIT_RESULT.xml
-  script:
-    - ${IDF_PATH}/tools/ci/test_configure_ci_environment.sh
-    - cd ${IDF_PATH}/tools/test_build_system
-    - pytest --work-dir ${CI_PROJECT_DIR}/test_build_system --junitxml=${CI_PROJECT_DIR}/XUNIT_RESULT.xml
-
 build_docker:
   extends:
     - .before_script_minimal

.gitlab/ci/default-build-test-rules.yml

@@ -1,20 +0,0 @@
-# this file support two keywords:
-# - extra_default_build_targets:
-#     besides of the SUPPORTED_TARGETS in IDF,
-#     enable build for the specified targets by default as well.
-# - bypass_check_test_targets:
-#     suppress the check_build_test_rules check-test-script warnings for the specified targets
-#
-# This file should ONLY be used during bringup. Should be reset to empty after the bringup process
-extra_default_build_targets:
- - esp32c6
- - esp32h2
-
-# bypass_check_test_targets:
-#  - esp32h2
-#  - esp32c6
-#
-# These lines would
-# - enable the README.md check for esp32c6. Don't forget to add the build jobs in .gitlab/ci/build.yml
-# - disable the test script check with the manifest file.
-#

.gitlab/ci/dependencies/README.md

@@ -97,4 +97,4 @@ There are a few extra dependencies while generating the dependency tree graph, p
 
 ### CLI usage
 
-`python $IDF_PATH/tools/ci/generate_rules.py --graph OUTPUT_PATH`
+`python generate_rules.py --graph OUTPUT_PATH`

.gitlab/ci/dependencies/dependencies.yml

@@ -3,9 +3,6 @@
   - esp32s2
   - esp32s3
   - esp32c3
-  - esp32c2
-  - esp32c6
-  - esp32h2
 
 .target_test: &target_test
   - example_test
@@ -22,7 +19,6 @@
   patterns:
     - build_components
     - build_system
-    - downloadable-tools
   included_in:
     - build:target_test
 
@@ -35,9 +31,6 @@
     - docker
   patterns:
     - docker
-    - submodule
-    - build_system
-    - downloadable-tools
 
 "build:windows":
   labels:
@@ -55,7 +48,6 @@
   patterns:
     - build_system
     - macos
-    - downloadable-tools
 
 # ---------------
 # Build Test Jobs
@@ -69,8 +61,6 @@
   patterns:
     - build_components
     - build_system
-    - build_target_test
-    - downloadable-tools
   included_in:
     - "build:{0}"
     - build:target_test
@@ -84,7 +74,6 @@ build:integration_test:
   included_in:
     - build:target_test
 
-
 ####################
 # Target Test Jobs #
 ####################
@@ -124,78 +113,13 @@ build:integration_test:
     - "build:component_ut-{0}"
     - build:target_test
 
-# To reduce the specific runners' usage.
-# Do not create these jobs by default patterns on development branches
-# Can be triggered by labels or related changes
-"test:{0}-{1}-{2}":
-  matrix:
-    - *target_test
-    - *all_targets
-    - - bt        # example_test_005
-      - wifi      # pytest*wifi*
-      - ethernet  # pytest*ethernet*
-      - sdio      # pytest*sdio*
-      - usb       # USB Device & Host tests
-      - adc       # pytest*adc*
-      - i154
-      - flash_multi
-      - ecdsa
-      - ccs811    # pytest*ccs811*
-  patterns:
-    - "{0}-{1}-{2}"
-    - "{0}-{2}"
-    - "target_test-{2}"
+"test:integration_test":
   labels:
-    - "{0}_{1}"
-    - "{0}"
-    - target_test
-  included_in:
-    - "build:{0}-{1}"
-    - "build:{0}"
-    - build:target_test
-
-# For example_test*flash_encryption_wifi_high_traffic jobs
-# set `INCLUDE_NIGHTLY_RUN` variable when triggered on development branches
-"test:example_test-{0}-include_nightly_run-rule":
-  matrix:
-    - - esp32
-      - esp32c3
-  specific_rules:
-    - "if-example_test-ota-include_nightly_run-rule"
-  included_in:
-    - "build:example_test-{0}"
-    - "build:example_test"
-    - build:target_test
-
-# For i154 runners
-"test:example_test-i154":
-  patterns:
-    - "example_test-i154"
-    - "target_test-i154"
-  labels:
-    - target_test
-    - example_test
-  included_in:
-    - "build:example_test-esp32s3"
-    - "build:example_test-esp32c6"
-    - "build:example_test-esp32h2"
-    - "build:example_test"
-    - build:target_test
-
-"test:integration_test_{0}":
-  matrix:
-    - - wifi
-      - ble
-  labels:
-    - integration_test_{0}
     - integration_test
     - target_test
   patterns:
-    - integration_test-{0}
-    - target_test-{0}
-    # - maybe others
+    - integration_test
   included_in:
-    - test:integration_test
     - build:integration_test
     - build:target_test
 
@@ -214,16 +138,27 @@ build:integration_test:
 #################################
 # Triggered Only By Labels Jobs #
 #################################
+"labels:iperf_stress_test": # example_test
+  labels:
+    - iperf_stress_test
+  included_in:
+    - build:example_test
+    - build:example_test-esp32
+    - build:target_test
+
+"labels:weekend_test": # custom test
+  labels:
+    - weekend_test
+  included_in:
+    - build:custom_test
+    - build:custom_test-esp32
+    - build:target_test
+
 "labels:nvs_coverage": # host_test
   labels:
     - nvs_coverage
 
-"labels-protected:lan8720":  # UT # FIXME: IDFCI-1176 temporary run this on master/release or with label
+"labels:fuzzer_test-weekend_test": # host test
   labels:
-    - lan8720
-  included_in:
-    - build:unit_test
-    - build:unit_test-esp32
-    - build:target_test
-    - build:component_ut
-    - build:component_ut-esp32
+    - fuzzer_test
+    - weekend_test

.gitlab/ci/dependencies/generate_rules.py

@@ -1,7 +1,18 @@
 #!/usr/bin/env python
 #
-# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-# SPDX-License-Identifier: Apache-2.0
+# Copyright 2021 Espressif Systems (Shanghai) CO LTD
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import argparse
 import inspect
@@ -11,8 +22,6 @@ from collections import defaultdict
 from itertools import product
 
 import yaml
-from check_rules_yml import get_needed_rules
-from idf_ci_utils import IDF_PATH
 
 try:
     import pygraphviz as pgv
@@ -24,6 +33,8 @@ try:
 except ImportError:  # used for type hint
     pass
 
+IDF_PATH = os.path.abspath(os.getenv('IDF_PATH', os.path.join(os.path.dirname(__file__), '..', '..', '..')))
+
 
 def _list(str_or_list):  # type: (Union[str, list]) -> list
     if isinstance(str_or_list, str):
@@ -77,12 +88,9 @@ class RulesWriter:
     RULE_PROTECTED_NO_LABEL = '    - <<: *if-protected-no_label'
     RULE_BUILD_ONLY = '    - <<: *if-label-build-only\n' \
                       '      when: never'
-    RULE_REVERT_BRANCH = '    - <<: *if-revert-branch\n' \
-                         '      when: never'
     RULE_LABEL_TEMPLATE = '    - <<: *if-label-{0}'
     RULE_PATTERN_TEMPLATE = '    - <<: *if-dev-push\n' \
                             '      changes: *patterns-{0}'
-    SPECIFIC_RULE_TEMPLATE = '    - <<: *{0}'
     RULES_TEMPLATE = inspect.cleandoc(r"""
     .rules:{0}:
       rules:
@@ -157,8 +165,6 @@ class RulesWriter:
                 continue
             if 'included_in' in v:
                 for item in _list(v['included_in']):
-                    if 'specific_rules' in v:
-                        res[item]['specific_rules'].update(_list(v['specific_rules']))
                     if 'labels' in v:
                         res[item]['labels'].update(_list(v['labels']))
                     if 'patterns' in v:
@@ -201,27 +207,19 @@ class RulesWriter:
     def new_rules_str(self):  # type: () -> str
         res = []
         for k, v in sorted(self.rules.items()):
-            if '.rules:' + k not in get_needed_rules():
-                print(f'WARNING: unused rule: {k}, skipping...')
-                continue
             res.append(self.RULES_TEMPLATE.format(k, self._format_rule(k, v)))
         return '\n\n'.join(res)
 
     def _format_rule(self, name, cfg):  # type: (str, dict) -> str
-        _rules = [self.RULE_REVERT_BRANCH]
+        _rules = []
         if name.endswith('-production'):
             _rules.append(self.RULE_PROTECTED_NO_LABEL)
         else:
             if not (name.endswith('-preview') or name.startswith('labels:')):
                 _rules.append(self.RULE_PROTECTED)
-            if name.startswith('test:'):
+            # Special case for esp32c3 example_test, for now it only run with label
+            if name.startswith('test:') or name == 'labels:example_test-esp32c3':
                 _rules.append(self.RULE_BUILD_ONLY)
-
-            for specific_rule in cfg['specific_rules']:
-                if f'.{specific_rule}' in self.rules_cfg:
-                    _rules.append(self.SPECIFIC_RULE_TEMPLATE.format(specific_rule))
-                else:
-                    print('WARNING: specific_rule {} not exists'.format(specific_rule))
             for label in cfg['labels']:
                 _rules.append(self.RULE_LABEL_TEMPLATE.format(label))
             for pattern in cfg['patterns']:

.gitlab/ci/deploy.yml

@@ -1,33 +1,10 @@
 .deploy_job_template:
+  extends: .before_script_no_sync_submodule
   stage: deploy
   image: $ESP_ENV_IMAGE
   tags:
     - deploy
 
-# Check this before push_to_github
-check_submodule_sync:
-  extends:
-    - .deploy_job_template
-    - .rules:test:submodule
-  stage: test_deploy
-  tags:
-    - github_sync
-  retry: 2
-  variables:
-    GIT_STRATEGY: clone
-    SUBMODULES_TO_FETCH: "none"
-    PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git"
-  dependencies: []
-  script:
-    - git submodule deinit --force .
-    # setting the default remote URL to the public one, to resolve relative location URLs
-    - git config remote.origin.url ${PUBLIC_IDF_URL}
-    # check if all submodules are correctly synced to public repository
-    - git submodule init
-    - git config --get-regexp '^submodule\..*\.url$' || true
-    - git submodule update --recursive
-    - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"
-
 push_to_github:
   extends:
     - .deploy_job_template
@@ -45,37 +22,54 @@ deploy_test_result:
     - .deploy_job_template
     - .before_script_minimal
     - .rules:ref:master-always
-  image: $CI_DOCKER_REGISTRY/bot-env:1
-  dependencies: []
+  image: $CI_DOCKER_REGISTRY/bot-env
   tags:
     - deploy_test
   artifacts:
     when: always
     paths:
       - ${CI_PROJECT_DIR}/test-management/*.log
-    expire_in: 1 week
+      # save all test logs as artifacts, make it easier to track errors
+      - ${CI_PROJECT_DIR}/TEST_LOGS
+    expire_in: 1 mos
   variables:
+    UNIT_TEST_CASE_FILE: "${CI_PROJECT_DIR}/components/idf_test/unit_test/TestCaseAll.yml"
     BOT_ACCOUNT_CONFIG_FILE: "${CI_PROJECT_DIR}/test-management/Config/Account.local.yml"
-    TEST_RESULTS_PATH: "${CI_PROJECT_DIR}/TEST_RESULTS"
+    TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw"
+    AUTO_TEST_SCRIPT_PATH: "${CI_PROJECT_DIR}/auto_test_script"
   script:
     - add_gitlab_ssh_keys
-    - export GIT_SHA=$(echo ${CI_COMMIT_SHA} | cut -c 1-8)
-    - export REV_COUNT=$(git rev-list --count ${GIT_SHA} --)
+    - export GIT_SHA=$(echo ${PIPELINE_COMMIT_SHA} | cut -c 1-8)
+    - export REV_COUNT=$(git rev-list --count ${PIPELINE_COMMIT_SHA} --)
     - export SUMMARY="IDF CI test result for $GIT_SHA (r${REV_COUNT})"
-    # Download test result
-    - export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
-    - python3 ${IDF_PATH}/tools/ci/get_all_test_results.py --path ${TEST_RESULTS_PATH} --include_retried
-    - if [[ -z $(find ${TEST_RESULTS_PATH} -name "*.xml") ]]; then exit 0; fi
-    # Clone test-management repo
+    # artifacts of job update_test_cases creates test-management folder
+    # we need to remove it so we can clone test-management folder again
+    - rm -rf test-management
     - retry_failed git clone $TEST_MANAGEMENT_REPO
     - python3 $CHECKOUT_REF_SCRIPT test-management test-management
     - cd test-management
     - echo $BOT_JIRA_ACCOUNT > ${BOT_ACCOUNT_CONFIG_FILE}
-    # Make sure all requirements are installed
-    - pip3 install -r requirements.txt
-    # Update test cases
-    - python3 ImportTestCase.py $JIRA_TEST_MANAGEMENT_PROJECT from_xml -d ${TEST_RESULTS_PATH} -r $GIT_SHA -l IDFCI
     # update test results
-    - python3 ImportTestResult.py -r "$GIT_SHA (r${REV_COUNT})" -j $JIRA_TEST_MANAGEMENT_PROJECT -s "$SUMMARY" -l IDFCI -p ${TEST_RESULTS_PATH} --pipeline_url ${CI_PIPELINE_URL}
-  # May need a long time to upload all test results.
-  timeout: 4 hours
+    - python3 ImportTestResult.py -r "$GIT_SHA (r${REV_COUNT})" -j $JIRA_TEST_MANAGEMENT_PROJECT -s "$SUMMARY" -l CI -p ${CI_PROJECT_DIR}/TEST_LOGS --pipeline_url ${CI_PIPELINE_URL}
+
+check_submodule_sync:
+  extends:
+    - .deploy_job_template
+    - .rules:test:submodule
+  tags:
+    - github_sync
+  retry: 2
+  variables:
+    GIT_STRATEGY: clone
+    SUBMODULES_TO_FETCH: "none"
+    PUBLIC_IDF_URL: "https://github.com/espressif/esp-idf.git"
+  dependencies: []
+  script:
+    - git submodule deinit --force .
+    # setting the default remote URL to the public one, to resolve relative location URLs
+    - git config remote.origin.url ${PUBLIC_IDF_URL}
+    # check if all submodules are correctly synced to public repository
+    - git submodule init
+    - git config --get-regexp '^submodule\..*\.url$' || true
+    - git submodule update --recursive
+    - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely"

.gitlab/ci/docs.yml

@@ -1,20 +1,12 @@
-.patterns-docs-full: &patterns-docs-full
+.patterns-docs: &patterns-docs
   - ".gitlab/ci/docs.yml"
   - "docs/**/*"
-  - "**/*.rst"
-  - "CONTRIBUTING.rst"
-  - "**/soc_caps.h"
-
-.patterns-docs-partial: &patterns-docs-partial
   - "components/**/*.h"
   - "components/**/Kconfig*"
   - "components/**/CMakeList.txt"
   - "components/**/sdkconfig*"
-  - "tools/tools.json"
-  - "tools/idf_tools.py"
-
-.patterns-example-readme: &patterns-example-readme
-  - "examples/**/*.md"
+  - "tools/kconfig_new/**/*"
+  - "CONTRIBUTING.rst"
 
 .patterns-docs-preview: &patterns-docs-preview
   - "docs/**/*"
@@ -28,78 +20,91 @@
 .if-label-build_docs: &if-label-build_docs
   if: '$BOT_LABEL_BUILD_DOCS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*build_docs(?:,[^,\n\r]+)*$/i'
 
+.if-label-docs: &if-label-docs
+  if: '$BOT_LABEL_DOCS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*docs(?:,[^,\n\r]+)*$/i'
+
 .if-label-docs_full: &if-label-docs_full
   if: '$BOT_LABEL_DOCS_FULL || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*docs_full(?:,[^,\n\r]+)*$/i'
 
 .if-dev-push: &if-dev-push
   if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event")'
 
-.doc-rules:build:docs-full:
+.doc-rules:build:docs:
   rules:
     - <<: *if-protected
     - <<: *if-label-build_docs
+    - <<: *if-label-docs
     - <<: *if-label-docs_full
     - <<: *if-dev-push
-      changes: *patterns-docs-full
-
-.doc-rules:build:docs-partial:
-  rules:
-    - <<: *if-dev-push
-      changes: *patterns-docs-full
-      when: never
-    - <<: *if-dev-push
-      changes: *patterns-docs-partial
+      changes: *patterns-docs
 
 # stage: pre_check
 check_readme_links:
   extends:
-    - .pre_check_template
+    - .pre_check_job_template
   tags: ["build", "amd64", "internet"]
   allow_failure: true
-  rules:
-    - <<: *if-protected
-    - <<: *if-dev-push
-      changes: *patterns-example-readme
   script:
     - python ${IDF_PATH}/tools/ci/check_readme_links.py
 
 check_docs_lang_sync:
   extends:
-    - .pre_check_template
-    - .doc-rules:build:docs-full
+    - .pre_check_job_template
+    - .doc-rules:build:docs
   script:
     - cd docs
     - ./check_lang_folder_sync.sh
 
 .build_docs_template:
   image: $ESP_IDF_DOC_ENV_IMAGE
-  stage: build_doc
+  variables:
+    PYTHON_VER: 3.7.10
   tags:
     - build_docs
   dependencies: []
   script:
+    - pip install -r requirements.txt
     - cd docs
+    - pip install -U -r requirements.txt
     - build-docs -t $DOCTGT -bs $DOC_BUILDERS -l $DOCLANG build
   parallel:
     matrix:
       - DOCLANG: ["en", "zh_CN"]
-        DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c2", "esp32c6", "esp32h2"]
+        DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3"]
 
 check_docs_gh_links:
   image: $ESP_IDF_DOC_ENV_IMAGE
+  variables:
+    PYTHON_VER: 3.7.10
   extends:
-    - .pre_check_template
-    - .doc-rules:build:docs-full
+    - .pre_check_job_template
+    - .doc-rules:build:docs
   script:
+    - pip install -r requirements.txt
     - cd docs
+    - pip install -U -r requirements.txt
     - build-docs gh-linkcheck
 
+# stage: build_doc
+# Add this stage to let the build_docs job run in parallel with build
+.build_docs_build_stage_template:
+  extends:
+    - .build_docs_template
+  stage: build_doc
+  needs:
+    - job: check_docs_lang_sync
+      artifacts: false
+    - job: check_docs_gh_links
+      artifacts: false
+
 # Doc jobs have a lot of special cases, we specify rules here directly instead
 # in dependencies.yml to simplify things
 build_docs_html_full:
   extends:
-    - .build_docs_template
-    - .doc-rules:build:docs-full
+    - .build_docs_build_stage_template
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-docs_full
   artifacts:
     when: always
     paths:
@@ -109,10 +114,16 @@ build_docs_html_full:
   variables:
     DOC_BUILDERS: "html"
 
-build_docs_html_partial:
+build_docs_html_fast:
   extends:
-    - .build_docs_template
-    - .doc-rules:build:docs-partial
+    - .build_docs_build_stage_template
+  rules:
+    - <<: *if-label-docs_full
+      when: never
+    - <<: *if-label-build_docs
+    - <<: *if-label-docs
+    - <<: *if-dev-push
+      changes: *patterns-docs
   artifacts:
     when: always
     paths:
@@ -121,17 +132,14 @@ build_docs_html_partial:
     expire_in: 4 days
   variables:
     DOC_BUILDERS: "html"
-  parallel:
-    matrix:
-      - DOCLANG: "en"
-        DOCTGT: "esp32"
-      - DOCLANG: "zh_CN"
-        DOCTGT: "esp32c6"
+    DOCS_FAST_BUILD: "yes"
 
 build_docs_pdf:
   extends:
-    - .build_docs_template
-    - .doc-rules:build:docs-full
+    - .build_docs_build_stage_template
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-docs_full
   artifacts:
     when: always
     paths:
@@ -141,17 +149,22 @@ build_docs_pdf:
     DOC_BUILDERS: "latex"
 
 .deploy_docs_template:
+  extends:
+    - .before_script_no_sync_submodule
   image: $ESP_IDF_DOC_ENV_IMAGE
-  variables:
-    DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
-    PYTHONUNBUFFERED: 1
   stage: test_deploy
   tags:
     - deploy
     - shiny
+  variables:
+    PYTHON_VER: 3.7.10
+    DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
+    PYTHONUNBUFFERED: 1
+  dependencies: []
   script:
     - add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
     - export GIT_VER=$(git describe --always ${PIPELINE_COMMIT_SHA} --)
+    - pip install -U -r docs/requirements.txt
     - deploy-docs
 
 # stage: test_deploy
@@ -160,16 +173,13 @@ deploy_docs_preview:
     - .deploy_docs_template
   rules:
     - <<: *if-label-build_docs
-    - <<: *if-label-docs_full
+    - <<: *if-label-docs
     - <<: *if-dev-push
       changes: *patterns-docs-preview
-  needs:
-    - job: build_docs_html_partial
-      optional: true
-    - job: build_docs_html_full
-      optional: true
-    - job: build_docs_pdf
-      optional: true
+  dependencies:
+    - build_docs_html_fast
+    - build_docs_html_full
+    - build_docs_pdf
   variables:
     TYPE: "preview"
     # older branches use DOCS_DEPLOY_KEY, DOCS_SERVER, DOCS_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview'
@@ -200,17 +210,12 @@ deploy_docs_production:
     DOCS_DEPLOY_SERVER_USER: "$DOCS_PROD_SERVER_USER"
     DOCS_DEPLOY_PATH: "$DOCS_PROD_PATH"
     DOCS_DEPLOY_URL_BASE: "https://docs.espressif.com/projects/esp-idf"
-    DEPLOY_STABLE: 1
 
 check_doc_links:
   extends:
     - .build_docs_template
-  rules:
-    - <<: *if-protected-no_label
+    - .rules:protected
   stage: post_deploy
-  needs:
-    - job: deploy_docs_production
-      artifacts: false
   tags: ["build", "amd64", "internet"]
   artifacts:
     when: always
@@ -220,5 +225,7 @@ check_doc_links:
     expire_in: 1 week
   allow_failure: true
   script:
+    - pip install -r requirements.txt
     - cd docs
+    - pip install -U -r requirements.txt
     - build-docs -t $DOCTGT -l $DOCLANG linkcheck

.gitlab/ci/host-test.yml

@@ -2,17 +2,12 @@
   extends: .rules:test:host_test
   stage: host_test
   image: $ESP_ENV_IMAGE
+  variables:
+    PYTHON_VER: 3.6.13
   tags:
     - host_test
   dependencies: []
-  # run host_test jobs immediately, only after upload cache
-  needs:
-    - job: upload-pip-cache
-      optional: true
-      artifacts: false
-    - job: upload-submodules-cache
-      optional: true
-      artifacts: false
+  needs: []  # run host_test jobs immediately
 
 test_nvs_on_host:
   extends: .host_test_template
@@ -36,6 +31,8 @@ test_nvs_coverage:
 
 test_partition_table_on_host:
   extends: .host_test_template
+  tags:
+    - build
   script:
     - cd components/partition_table/test_gen_esp32part_host
     - ./gen_esp32part_tests.py
@@ -60,42 +57,64 @@ test_ldgen_on_host:
   extends: .host_test_template
   script:
     - cd tools/ldgen/test
-    - export PYTHONPATH=$PYTHONPATH:..
-    - python -m unittest
+    - ./test_fragments.py
+    - ./test_generation.py
+    - ./test_entity.py
+    - ./test_output_commands.py
   variables:
     LC_ALL: C.UTF-8
 
-test_reproducible_build:
-  extends: .host_test_template
-  script:
-    - ./tools/ci/test_reproducible_build.sh
+.host_fuzzer_test_template:
+  extends:
+    - .host_test_template
+    - .rules:labels:fuzzer_test-weekend_test
+  image: $AFL_FUZZER_TEST_IMAGE
   artifacts:
-    when: on_failure
+    when: always
     paths:
-      - "**/sdkconfig"
-      - "**/build*/*.bin"
-      - "**/build*/*.elf"
-      - "**/build*/*.map"
-      - "**/build*/flasher_args.json"
-      - "**/build*/*.bin"
-      - "**/build*/bootloader/*.bin"
-      - "**/build*/partition_table/*.bin"
+      - ${FUZZER_TEST_DIR}/out/crashes
+      - ${FUZZER_TEST_DIR}/fuzz_output.log
     expire_in: 1 week
+  script:
+    - export AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1 && export AFL_SKIP_CPUFREQ=1
+    - cd ${FUZZER_TEST_DIR}
+    # run AFL fuzzer for one hour
+    - ( ( make ${FUZZER_PARAMS} fuzz | tee fuzz_output.log | grep -v '\(Fuzzing test case\|Entering queue cycle\)' ) || pkill sleep ) &
+    - ( sleep 3600 || mkdir -p out/crashes/env_failed ) && pkill afl-fuz
+    # check no crashes found
+    - test -z "$(ls out/crashes/)" || exit 1
+
+test_mdns_fuzzer_on_host:
+  extends: .host_fuzzer_test_template
+  variables:
+    FUZZER_TEST_DIR: components/mdns/test_afl_fuzz_host
+
+test_lwip_dns_fuzzer_on_host:
+  extends: .host_fuzzer_test_template
+  variables:
+    FUZZER_TEST_DIR: components/lwip/test_afl_host
+    FUZZER_PARAMS: MODE=dns
+
+test_lwip_dhcp_fuzzer_on_host:
+  extends: .host_fuzzer_test_template
+  variables:
+    FUZZER_TEST_DIR: components/lwip/test_afl_host
+    FUZZER_PARAMS: MODE=dhcp_client
+
+test_lwip_dhcps_fuzzer_on_host:
+  extends: .host_fuzzer_test_template
+  variables:
+    FUZZER_TEST_DIR: components/lwip/test_afl_host
+    FUZZER_PARAMS: MODE=dhcp_server
 
 test_spiffs_on_host:
   extends: .host_test_template
   script:
-    - cd components/spiffs/test_spiffsgen/
+    - cd components/spiffs/test_spiffs_host/
+    - make test
+    - cd ../test_spiffsgen
     - ./test_spiffsgen.py
 
-test_fatfsgen_on_host:
-  extends: .host_test_template
-  script:
-    - cd components/fatfs/test_fatfsgen/
-    - ./test_fatfsgen.py
-    - ./test_wl_fatfsgen.py
-    - ./test_fatfsparse.py
-
 test_multi_heap_on_host:
   extends: .host_test_template
   script:
@@ -104,10 +123,54 @@ test_multi_heap_on_host:
 
 test_certificate_bundle_on_host:
   extends: .host_test_template
+  tags:
+    - build
   script:
     - cd components/mbedtls/esp_crt_bundle/test_gen_crt_bundle/
     - ./test_gen_crt_bundle.py
 
+test_confserver:
+  extends: .host_test_template
+  script:
+    - cd tools/kconfig_new/test/confserver
+    - ./test_confserver.py
+
+test_gen_kconfig_doc:
+  extends: .host_test_template
+  script:
+    - cd tools/kconfig_new/test/gen_kconfig_doc/
+    - ./test_target_visibility.py
+    - ./test_kconfig_out.py
+
+test_confgen:
+  extends: .host_test_template
+  script:
+    - cd tools/kconfig_new/test/confgen/
+    - ./test_confgen.py
+
+test_idf_monitor:
+  extends: .host_test_template
+  artifacts:
+    # save artifacts always in order to access results which were retried without consequent failure
+    when: always
+    paths:
+      - tools/test_idf_monitor/outputs/*
+    expire_in: 1 week
+  script:
+    - cd ${IDF_PATH}/tools/test_idf_monitor
+    - ./run_test_idf_monitor.py
+
+test_idf_size:
+  extends: .host_test_template
+  artifacts:
+    when: on_failure
+    paths:
+      - tools/test_idf_size/output
+      - tools/test_idf_size/.coverage
+    expire_in: 1 week
+  script:
+    - cd ${IDF_PATH}/tools/test_idf_size
+    - ./test.sh
 
 test_idf_py:
   extends: .host_test_template
@@ -116,30 +179,22 @@ test_idf_py:
   script:
     - cd ${IDF_PATH}/tools/test_idf_py
     - ./test_idf_py.py
-    - ./test_hints.py
 
-# Test for create virtualenv. It must be invoked from Python, not from virtualenv.
-# Use docker image system python without any extra dependencies
 test_idf_tools:
-  extends:
-    - .host_test_template
-    - .before_script_minimal
+  extends: .host_test_template
   artifacts:
     when: on_failure
     paths:
       - tools/tools.new.json
-      - tools/test_idf_tools/test_python_env_logs.txt
     expire_in: 1 week
-  image:
-    name: $ESP_ENV_IMAGE
-    entrypoint: [""]  # use system python3. no extra pip package installed
   script:
-    # Tools must be downloaded for testing
-    - python3 ${IDF_PATH}/tools/idf_tools.py download
+    # Remove Xtensa and ULP toolchains from the PATH, tests will expect a clean environment
+    - export PATH=$(p=$(echo $PATH | tr ":" "\n" | grep -v "/root/.espressif/tools\|/opt/espressif" | tr "\n" ":"); echo ${p%:})
     - cd ${IDF_PATH}/tools/test_idf_tools
-    - python3 -m pip install jsonschema
-    - python3 ./test_idf_tools.py
-    - python3 ./test_idf_tools_python_env.py
+    - ./test_idf_tools.py
+    # Test for create virtualenv. It must be invoked from Python, not from virtualenv.
+    - cd ${IDF_PATH}/tools
+    - python3 ./idf_tools.py install-python-env
 
 .test_efuse_table_on_host_template:
   extends: .host_test_template
@@ -153,7 +208,7 @@ test_idf_tools:
   script:
     - cd ${IDF_PATH}/components/efuse/
     - ./efuse_table_gen.py -t "${IDF_TARGET}" ${IDF_PATH}/components/efuse/${IDF_TARGET}/esp_efuse_table.csv
-    - git diff --exit-code -- ${IDF_TARGET}/esp_efuse_table.c || { echo 'Differences found for ${IDF_TARGET} target. Please run idf.py efuse-common-table and commit the changes.'; exit 1; }
+    - git diff --exit-code -- ${IDF_TARGET}/esp_efuse_table.c || { echo 'Differences found for ${IDF_TARGET} target. Please run make efuse_common_table or idf.py efuse-common-table and commit the changes.'; exit 1; }
     - cd ${IDF_PATH}/components/efuse/test_efuse_host
     - ./efuse_tests.py
 
@@ -180,10 +235,23 @@ test_efuse_table_on_host_esp32h2:
   variables:
     IDF_TARGET: esp32h2
 
-test_efuse_table_on_host_esp32c6:
-  extends: .test_efuse_table_on_host_template
+test_espcoredump:
+  extends: .host_test_template
+  artifacts:
+    when: always
+    paths:
+      - components/espcoredump/test/**/.coverage
+      - components/espcoredump/test/**/output
+    expire_in: 1 week
   variables:
-    IDF_TARGET: esp32c6
+    IDF_COREDUMP_ELF_REPO: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/idf/idf-coredump-elf.git"
+    IDF_COREDUMP_ELF_TAG: idf-20210915
+    # install CMake version specified in tools.json
+    SETUP_TOOLS_LIST: "all"
+  script:
+    - retry_failed git clone ${IDF_COREDUMP_ELF_REPO} -b $IDF_COREDUMP_ELF_TAG
+    - cd ${IDF_PATH}/components/espcoredump/test/
+    - ./test_espcoredump.sh ${CI_PROJECT_DIR}/idf-coredump-elf
 
 test_logtrace_proc:
   extends: .host_test_template
@@ -224,8 +292,8 @@ test_mkuf2:
     - ./test_mkuf2.py
 
 test_autocomplete:
-  extends:
-    - .host_test_template
+  extends: .host_test_template
+  image: $CI_DOCKER_REGISTRY/linux-shells:1
   artifacts:
     when: on_failure
     paths:
@@ -235,8 +303,8 @@ test_autocomplete:
     - ${IDF_PATH}/tools/ci/test_autocomplete.py
 
 test_detect_python:
-  extends:
-    - .host_test_template
+  extends: .host_test_template
+  image: $CI_DOCKER_REGISTRY/linux-shells:1
   script:
     - cd ${IDF_PATH}
     - shellcheck -s sh tools/detect_python.sh
@@ -247,43 +315,33 @@ test_detect_python:
     - "zsh -c '. tools/detect_python.sh && echo Our Python: ${ESP_PYTHON?Python is not set}'"
     - "fish -c 'source tools/detect_python.fish && echo Our Python: $ESP_PYTHON'"
 
-test_split_path_by_spaces:
+test_nvs_page:
   extends: .host_test_template
   script:
-    - cd ${IDF_PATH}/tools
-    - python -m unittest split_paths_by_spaces.py
+    - cd ${IDF_PATH}/components/nvs_flash/host_test/nvs_page_test
+    - idf.py build
+    - build/test_nvs_page_host.elf
 
-test_mqtt_on_host:
+test_log:
   extends: .host_test_template
   script:
-    - cd ${IDF_PATH}/components/mqtt/esp-mqtt/host_test
+    - cd ${IDF_PATH}/components/log/host_test/log_test
     - idf.py build
-    - LSAN_OPTIONS=verbosity=1:log_threads=1 build/host_mqtt_client_test.elf
+    - build/test_log_host.elf
 
-test_transport_on_host:
+test_esp_event:
   extends: .host_test_template
   script:
-    - cd ${IDF_PATH}/components/tcp_transport/host_test
+    - cd ${IDF_PATH}/components/esp_event/host_test/esp_event_unit_test
     - idf.py build
-    - LSAN_OPTIONS=verbosity=1:log_threads=1 build/host_tcp_transport_test.elf
+    - build/test_esp_event_host.elf
 
-test_sockets_on_host:
+test_esp_timer_cxx:
   extends: .host_test_template
   script:
-    # test the tcp-client example with system sockets
-    - cd ${IDF_PATH}/examples/protocols/sockets/tcp_client
-    - echo 'CONFIG_EXAMPLE_IPV4_ADDR="127.0.0.1"' >> sdkconfig.defaults
-    - idf.py --preview set-target linux
+    - cd ${IDF_PATH}/examples/cxx/experimental/experimental_cpp_component/host_test/esp_timer
     - idf.py build
-    - timeout 5 ./build/tcp_client.elf >test.log || true
-    - grep "Socket unable to connect" test.log
-    # test the udp-client example with lwip sockets
-    - cd ${IDF_PATH}/examples/protocols/sockets/udp_client
-    - echo 'CONFIG_EXAMPLE_IPV4_ADDR="127.0.0.1"' >> sdkconfig.defaults
-    - idf.py --preview set-target linux
-    - idf.py build
-    - timeout 5 ./build/udp_client.elf >test.log || true
-    - grep "Message sent" test.log
+    - build/test_esp_timer_cxx_host.elf
 
 test_eh_frame_parser:
   extends: .host_test_template
@@ -292,55 +350,24 @@ test_eh_frame_parser:
     - make
     - ./eh_frame_test
 
-test_gen_soc_caps_kconfig:
+test_rom_on_linux_works:
   extends: .host_test_template
   script:
-    - cd ${IDF_PATH}/tools/gen_soc_caps_kconfig/
-    - ./test/test_gen_soc_caps_kconfig.py
+    - cd ${IDF_PATH}/components/esp_rom/host_test/rom_test
+    - idf.py build
+    - build/test_rom_host.elf
 
-test_pytest_qemu:
-  extends:
-    - .host_test_template
-    - .before_script_build_jobs
-  image: $QEMU_IMAGE
-  artifacts:
-    when: always
-    paths:
-      - XUNIT_RESULT.xml
-      - pytest_embedded_log/
-    reports:
-      junit: XUNIT_RESULT.xml
-    expire_in: 1 week
+test_cxx_gpio:
+  extends: .host_test_template
   script:
-    - run_cmd python tools/ci/ci_build_apps.py . -vv
-      --target esp32
-      --pytest-apps
-      -m qemu
-    - retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases
-    - pytest
-      --target esp32
-      -m qemu
-      --embedded-services idf,qemu
-      --junitxml=XUNIT_RESULT.xml
-      --known-failure-cases-file known_failure_cases/known_failure_cases.txt
+    - cd ${IDF_PATH}/examples/cxx/experimental/experimental_cpp_component/host_test/gpio
+    - idf.py build
+    - build/test_gpio_cxx_host.elf
 
-test_pytest_linux:
-  extends:
-    - .host_test_template
-    - .before_script_build_jobs
-  artifacts:
-    when: always
-    paths:
-      - XUNIT_RESULT.xml
-      - pytest_embedded_log/
-    reports:
-      junit: XUNIT_RESULT.xml
-    expire_in: 1 week
+test_linux_example:
+  extends: .host_test_template
   script:
-    - run_cmd python tools/ci/ci_build_apps.py components examples tools/test_apps -vv
-      --target linux
-      --pytest-apps
-      -m host_test
-    - retry_failed git clone $KNOWN_FAILURE_CASES_REPO known_failure_cases
-    - run_cmd pytest --target linux -m host_test --junitxml=XUNIT_RESULT.xml
-      --known-failure-cases-file known_failure_cases/known_failure_cases.txt
+    - cd ${IDF_PATH}/examples/build_system/cmake/linux_host_app
+    - idf.py build
+    - timeout 5 ./build/linux_host_app.elf >test.log || true
+    - grep "Restarting" test.log

.gitlab/ci/pre_check.yml

@@ -1,15 +1,22 @@
-.pre_check_template:
+.pre_check_base_template:
   stage: pre_check
   image: $ESP_ENV_IMAGE
   tags:
     - host_test
   dependencies: []
 
-.check_pre_commit_template:
+.pre_check_job_template:
   extends:
-    - .pre_check_template
-    - .before_script_minimal
-  image: $PRE_COMMIT_IMAGE
+    - .pre_check_base_template
+    - .before_script_no_sync_submodule
+
+.check_pre_commit_template:
+  extends: .pre_check_job_template
+  image: "$CI_DOCKER_REGISTRY/esp-idf-pre-commit:1"
+  before_script:
+    - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
+    - export PYTHONPATH="$CI_PROJECT_DIR/tools:$CI_PROJECT_DIR/tools/ci/python_packages:$PYTHONPATH"
 
 check_pre_commit_master_release:
   extends:
@@ -25,42 +32,45 @@ check_pre_commit_MR:
   script:
     - python ${CI_PROJECT_DIR}/tools/ci/ci_get_mr_info.py files ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} | xargs pre-commit run --files
 
-check_MR_style_dangerjs:
-  extends:
-    - .pre_check_template
-  image: node:14.18.0-alpine3.14
-  variables:
-    DANGER_GITLAB_API_TOKEN: ${ESPCI_TOKEN}
-    DANGER_GITLAB_HOST: ${GITLAB_HTTP_SERVER}
-    DANGER_GITLAB_API_BASE_URL: ${GITLAB_HTTP_SERVER}/api/v4
-    DANGER_JIRA_USER: ${DANGER_JIRA_USER}
-    DANGER_JIRA_PASSWORD: ${DANGER_JIRA_PASSWORD}
-  before_script:
-    - npm install -g danger@11.2.3 --silent --no-progress > /dev/null
-    - npm install axios@1.3.3 --silent --no-progress > /dev/null
-  script:
-    - danger ci --dangerfile=".gitlab/dangerjs/dangerfile.js" --failOnErrors -v
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-
 check_version:
   # Don't run this for feature/bugfix branches, so that it is possible to modify
   # esp_idf_version.h in a branch before tagging the next version.
   extends:
-    - .pre_check_template
+    - .pre_check_job_template
     - .rules:protected
   script:
     - export IDF_PATH=$PWD
     - tools/ci/check_idf_version.sh
 
+check_examples_cmake_make:
+  extends: .pre_check_job_template
+  script:
+  - python ${IDF_PATH}/tools/ci/check_examples_cmake_make.py
+
 check_rom_api_header:
-  extends: .pre_check_template
+  extends: .pre_check_job_template
   script:
     - tools/ci/check_examples_rom_header.sh
     - tools/ci/check_api_violation.sh
 
+check_python_style:
+  extends:
+    - .pre_check_base_template
+    - .rules:patterns:python-files
+  variables:
+    PYTHON_VER: 3.6.13
+  artifacts:
+    when: on_failure
+    paths:
+      - flake8_output.txt
+    expire_in: 1 week
+  script:
+    - python -m flake8 --config=$IDF_PATH/.flake8 --output-file=flake8_output.txt --tee --benchmark $IDF_PATH
+
 test_check_kconfigs:
-  extends: .pre_check_template
+  extends: .pre_check_job_template
+  variables:
+    PYTHON_VER: 3.6.13
   artifacts:
     when: on_failure
     paths:
@@ -75,60 +85,55 @@ test_check_kconfigs:
     - python ${IDF_PATH}/tools/ci/test_check_kconfigs.py
 
 check_blobs:
-  extends: .pre_check_template
+  extends: .pre_check_base_template
+  tags:
+    - build
   variables:
-    SUBMODULES_TO_FETCH: "components/esp_wifi/lib;components/esp_phy/lib;components/esp_coex/lib"
+    SUBMODULES_TO_FETCH: "components/esp_wifi/lib;components/esp_phy/lib"
   script:
     # Check if Wi-Fi library header files match between IDF and the version used when compiling the libraries
     - IDF_TARGET=esp32 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
     - IDF_TARGET=esp32s2 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
     - IDF_TARGET=esp32s3 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c2 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
     - IDF_TARGET=esp32c3 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c6 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh
-    # Check if Coexistence library header files match between IDF and the version used when compiling the libraries
-    - IDF_TARGET=esp32 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32s2 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32s3 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c2 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c3 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32c6 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
-    - IDF_TARGET=esp32h2 $IDF_PATH/components/esp_coex/test_md5/test_md5.sh
     # Check if Wi-Fi, PHY, BT blobs contain references to specific symbols
     - bash $IDF_PATH/tools/ci/check_blobs.sh
 
+check_fuzzer_compilation:
+   extends: .pre_check_base_template
+   image: $AFL_FUZZER_TEST_IMAGE
+   script:
+     - cd ${IDF_PATH}/components/lwip/test_afl_host
+     - make MODE=dhcp_server
+     - make MODE=dhcp_client
+     - make MODE=dns
+     - cd ${IDF_PATH}/components/mdns/test_afl_fuzz_host
+     - make
+
 check_public_headers:
   extends:
-    - .pre_check_template
+    - .pre_check_base_template
     - .rules:build
+  tags:
+    - build
   script:
-    - IDF_TARGET=esp32 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32-elf-
-    - IDF_TARGET=esp32s2 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32s2-elf-
-    - IDF_TARGET=esp32s3 python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32s3-elf-
-    - IDF_TARGET=esp32c3 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32c2 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32c6 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
-    - IDF_TARGET=esp32h2 python tools/ci/check_public_headers.py --jobs 4 --prefix riscv32-esp-elf-
+    - python tools/ci/check_public_headers.py --jobs 4 --prefix xtensa-esp32-elf-
 
-check_chip_support_components:
+check_soc_struct_headers:
   extends:
-    - .pre_check_template
+    - .pre_check_base_template
     - .rules:build
-  artifacts:
-    when: on_failure
-    paths:
-      - esp_hw_support_part.h
-      - bootloader_support_part.h
-    expire_in: 1 week
+  tags:
+    - build
   script:
-    - python tools/ci/check_soc_headers_leak.py
     - find ${IDF_PATH}/components/soc/*/include/soc/ -name "*_struct.h" -print0 | xargs -0 -n1 ./tools/ci/check_soc_struct_headers.py
-    - tools/ci/check_esp_memory_utils_headers.sh
 
 check_esp_err_to_name:
   extends:
-    - .pre_check_template
+    - .pre_check_base_template
     - .rules:build
+  tags:
+    - build
   artifacts:
     when: on_failure
     paths:
@@ -139,41 +144,62 @@ check_esp_err_to_name:
     - ./gen_esp_err_to_name.py
     - git diff --exit-code -- ../components/esp_common/src/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
 
-check_esp_system:
+scan_tests:
   extends:
-    - .pre_check_template
-    - .rules:build
+    - .pre_check_base_template
+    - .rules:build:target_test
+  image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG
+  tags:
+    - assign_test
+  artifacts:
+    paths:
+      - $EXAMPLE_TEST_OUTPUT_DIR
+      - $TEST_APPS_OUTPUT_DIR
+      - $COMPONENT_UT_OUTPUT_DIR
+  variables:
+    EXAMPLE_TEST_DIR: ${CI_PROJECT_DIR}/examples
+    EXAMPLE_TEST_OUTPUT_DIR: ${CI_PROJECT_DIR}/examples/test_configs
+    TEST_APPS_TEST_DIR: ${CI_PROJECT_DIR}/tools/test_apps
+    TEST_APPS_OUTPUT_DIR: ${CI_PROJECT_DIR}/tools/test_apps/test_configs
+    COMPONENT_UT_OUTPUT_DIR: ${CI_PROJECT_DIR}/component_ut/test_configs
+    CI_SCAN_TESTS_PY: ${CI_PROJECT_DIR}/tools/ci/python_packages/ttfw_idf/CIScanTests.py
+    EXTRA_TEST_DIRS: >-
+      examples/bluetooth/esp_ble_mesh/ble_mesh_console
+      examples/bluetooth/hci/controller_hci_uart_esp32
+      examples/wifi/iperf
   script:
-    - python components/esp_system/check_system_init_priorities.py
+    - set_component_ut_vars
+    - run_cmd python $CI_SCAN_TESTS_PY example_test $EXAMPLE_TEST_DIR -b make --exclude examples/build_system/idf_as_lib -c $CI_TARGET_TEST_CONFIG_FILE -o $EXAMPLE_TEST_OUTPUT_DIR
+    - run_cmd python $CI_SCAN_TESTS_PY example_test $EXAMPLE_TEST_DIR -b cmake --exclude examples/build_system/idf_as_lib -c $CI_TARGET_TEST_CONFIG_FILE -o $EXAMPLE_TEST_OUTPUT_DIR --extra_test_dirs $EXTRA_TEST_DIRS
+    - run_cmd python $CI_SCAN_TESTS_PY test_apps $TEST_APPS_TEST_DIR -c $CI_TARGET_TEST_CONFIG_FILE -o $TEST_APPS_OUTPUT_DIR
+    - run_cmd python $CI_SCAN_TESTS_PY component_ut $COMPONENT_UT_DIRS --exclude $COMPONENT_UT_EXCLUDES -c $CI_TARGET_TEST_CONFIG_FILE -o $COMPONENT_UT_OUTPUT_DIR
 
 # For release tag pipelines only, make sure the tag was created with 'git tag -a' so it will update
 # the version returned by 'git describe'
 check_version_tag:
   extends:
-    - .pre_check_template
+    - .pre_check_job_template
     - .rules:tag:release
   script:
     - (git cat-file -t $CI_COMMIT_REF_NAME | grep tag) || (echo "ESP-IDF versions must be annotated tags." && exit 1)
 
+check_ut_cmake_make:
+  extends: .pre_check_job_template
+  tags:
+    - build
+  script:
+    - tools/ci/check_ut_cmake_make.sh
+
 check_artifacts_expire_time:
-  extends: .pre_check_template
+  extends: .pre_check_job_template
   script:
     # check if we have set expire time for all artifacts
     - python tools/ci/check_artifacts_expire_time.py
 
-check_test_scripts_build_test_rules:
-  extends:
-    - .pre_check_template
-    - .before_script_build_jobs
+check_commit_msg:
+  extends: .pre_check_job_template
   script:
-    # required pytest related packages
-    - run_cmd bash install.sh --enable-pytest
-    - python tools/ci/check_build_test_rules.py check-test-scripts examples/ tools/test_apps components
-
-check_configure_ci_environment_parsing:
-  extends:
-    - .pre_check_template
-    - .before_script_build_jobs
-  script:
-    - cd tools/ci
-    - python -m unittest ci_build_apps.py
+    - git status
+    - git log -n10 --oneline ${PIPELINE_COMMIT_SHA}
+    # commit start with "WIP: " need to be squashed before merge
+    - 'git log --pretty=%s origin/master..${PIPELINE_COMMIT_SHA} -- | grep -i "^WIP:" && exit 1 || exit 0'

.gitlab/ci/static-code-analysis.yml

@@ -1,19 +1,21 @@
 # pre_check stage
 clang_tidy_check:
   extends:
-    - .pre_check_template
+    - .pre_check_base_template
     - .rules:patterns:clang_tidy
+  image: ${CLANG_STATIC_ANALYSIS_IMAGE}
   artifacts:
     paths:
       - $OUTPUT_DIR
     when: always
     expire_in: 1 day
   variables:
+    CLANG_TIDY_RUNNER_PROJ: 2107  # idf/clang-tidy-runner
     CLANG_TIDY_DIRS_TXT: ${CI_PROJECT_DIR}/tools/ci/clang_tidy_dirs.txt
     RULES_FILE: ${CI_PROJECT_DIR}/tools/ci/static-analysis-rules.yml
     OUTPUT_DIR: ${CI_PROJECT_DIR}/clang_tidy_reports
-    IDF_TOOLCHAIN: clang
   script:
+    - python -m pip install -U pip
     - internal_pip_install $CLANG_TIDY_RUNNER_PROJ pyclang
     - export PATH=$PATH:$(python -c "import sys; print(sys.executable.rsplit('/', 1)[0])")
     - dirs=$(cat ${CLANG_TIDY_DIRS_TXT} | while read line; do echo ${CI_PROJECT_DIR}/${line}; done | xargs)
@@ -21,11 +23,11 @@ clang_tidy_check:
       --output-path ${OUTPUT_DIR}
       --limit-file ${RULES_FILE}
       --xtensa-include-dir
-      --run-clang-tidy-py run-clang-tidy
+      --run-clang-tidy-py ${RUN_CLANG_TIDY_PY}
 
 check_pylint:
   extends:
-    - .pre_check_template
+    - .pre_check_base_template
     - .rules:patterns:python-files
     - .before_script_minimal
   image: $SONARQUBE_SCANNER_IMAGE
@@ -59,11 +61,11 @@ check_pylint:
 # sonarqube server ASAP, in order to avoid reporting unrelated code issues
 .sonar_scan_template:
   stage: build
-  extends: .pre_check_template
   image:
     name: $SONARQUBE_SCANNER_IMAGE
   before_script:
     - source tools/ci/utils.sh
+    - is_based_on_commits $REQUIRED_ANCESTOR_COMMITS
     - export PYTHONPATH="$CI_PROJECT_DIR/tools:$CI_PROJECT_DIR/tools/ci/python_packages:$PYTHONPATH"
     - fetch_submodules
     # Exclude the submodules, all paths ends with /**
@@ -73,6 +75,7 @@ check_pylint:
     # Exclude the report dir as well
     - export EXCLUSIONS="$custom_excludes,$submodules"
     - export SONAR_SCANNER_OPTS="-Xmx2048m"
+
   variables:
     GIT_DEPTH: 0
     REPORT_PATTERN: clang_tidy_reports/*.txt
@@ -80,7 +83,8 @@ check_pylint:
     when: always
     paths:
       - $REPORT_PATTERN
-    expire_in: 1 week
+  tags:
+    - host_test
   dependencies:  # Here is not a hard dependency relationship, could be skipped when only python files changed. so we do not use "needs" here.
     - clang_tidy_check
     - check_pylint

.gitlab/ci/upload_cache.yml

@@ -1,50 +0,0 @@
-# pull only for most of the use cases for cache
-# only set "push" policy for the jobs under this file.
-# The cache would be updated when files matched specified patterns changes.
-
-.upload_cache_template:
-  stage: upload_cache
-  image: $ESP_ENV_IMAGE
-
-upload-pip-cache:
-  extends:
-    - .upload_cache_template
-    - .before_script_minimal
-    - .rules:patterns:python-cache
-  tags:
-    - $GEO
-    - cache
-  cache:
-    key: pip-cache
-    paths:
-      - .cache/pip
-    policy: push
-  script:
-    - rm -rf .cache/pip  # clear old packages
-    - bash install.sh --enable-ci --enable-pytest
-  parallel:
-    matrix:
-      - GEO: [ 'shiny',  'brew' ]
-
-upload-submodules-cache:
-  extends:
-    - .upload_cache_template
-    - .before_script_minimal
-    - .rules:patterns:submodule
-  tags:
-    - $GEO
-    - cache
-  cache:
-    key: submodule-cache
-    paths:
-      - .cache/submodule_archives
-    policy: push
-  script:
-    # use the default gitlab server
-    - unset LOCAL_GITLAB_HTTPS_HOST
-    - rm -rf .cache/submodule_archives  # clear old submodule archives
-    - add_gitlab_ssh_keys
-    - fetch_submodules
-  parallel:
-    matrix:
-      - GEO: [ 'shiny',  'brew' ]

.gitlab/dangerjs/dangerfile.js

@@ -1,44 +0,0 @@
-/*
- * Modules with checks are stored in ".gitlab/dangerjs/<module_name>". To import them, use path relative to "dangerfile.js"
- */
-
-async function runChecks() {
-    // Checks for merge request title
-    require("./mrTitleNoDraftOrWip.js")();
-
-    // Checks for merge request description
-    require("./mrDescriptionLongEnough.js")();
-    require("./mrDescriptionHasReleaseNotes.js")();
-    await require("./mrDescriptionJiraLinks.js")();
-
-    // Checks for documentation
-    require("./mrDocsTranslation.js")();
-
-    // Checks for MR commits
-    require("./mrCommitsTooManyCommits.js")();
-    require("./mrCommitsCommitMessage.js")();
-    require("./mrCommitsEmail.js")();
-
-    // Checks for MR code
-    require("./mrSizeTooLarge.js")();
-
-    // Checks for MR area labels
-    await require("./mrAreaLabels.js")();
-
-    // Add success log if no issues
-    if (
-        results.fails.length === 0 &&
-        results.warnings.length === 0 &&
-        results.messages.length === 0
-    ) {
-        return message("Good Job! All checks are passing!");
-    }
-}
-
-runChecks();
-
-// Add retry link
-const retryLink = `${process.env.DANGER_GITLAB_HOST}/${process.env.CI_PROJECT_PATH}/-/jobs/${process.env.CI_JOB_ID}`;
-markdown(
-    `***\n#### :repeat: You can enforce automatic MR checks by retrying the [DangerJS job](${retryLink})\n***`
-);

.gitlab/dangerjs/mrAreaLabels.js

@@ -1,20 +0,0 @@
-/**
- * Check if MR has area labels (light blue labels)
- *
- * @dangerjs WARN
- */
-module.exports = async function () {
-    const projectId = 103; // ESP-IDF
-    const areaLabelColor = /^#d2ebfa$/i; // match color code (case-insensitive)
-    const projectLabels = await danger.gitlab.api.Labels.all(projectId); // Get all project labels
-    const areaLabels = projectLabels
-        .filter((label) => areaLabelColor.test(label.color))
-        .map((label) => label.name); // Filter only area labels
-    const mrLabels = danger.gitlab.mr.labels; // Get MR labels
-
-    if (!mrLabels.some((label) => areaLabels.includes(label))) {
-        warn(
-            `Please add some [area labels](${process.env.DANGER_GITLAB_HOST}/espressif/esp-idf/-/labels) to this MR.`
-        );
-    }
-};

.gitlab/dangerjs/mrCommitsCommitMessage.js

@@ -1,70 +0,0 @@
-/**
- * Check if commit messages are sufficiently descriptive (not too short).
- *
- * Search for commit messages that appear to be automatically generated by Gitlab or temporary messages and report them.
- *
- * @dangerjs WARN
- */
-
-module.exports = function () {
-    const mrCommits = danger.gitlab.commits;
-
-    const detectRegexes = [
-        /^Rebased.*onto.*/i, // Automatically generated message by Gitlab
-        /^Fast-forwarded.*to.*/i, // Automatically generated message by Gitlab
-        /^Applied suggestion to.*/i, // Automatically generated message by Gitlab
-        /^Suggestion applied for line.*/i, // Automatically generated message by Gitlab
-        /^Opened merge request/i, // Automatically generated message by Gitlab
-        /^Merged.*/i, // Automatically generated message by Gitlab
-        /^Opened issue #\d+:.*/i, // Automatically generated message by Gitlab
-        /^Closed issue #\d+:.*/i, // Automatically generated message by Gitlab
-        /^Tagged.*as.*/i, // Automatically generated message by Gitlab
-        /^Deleted tag.*/i, // Automatically generated message by Gitlab
-        /^WIP.*/i, // Message starts with prefix "WIP"
-        /^Cleaned.*/i, // Message starts "Cleaned"
-        /clean ?up/i, // Message contains "clean up"
-        /^[^A-Za-z0-9\s].*/, // Message starts with special characters
-    ];
-
-    // Search for the messages in each commit
-    let partMessages = [];
-    for (const commit of mrCommits) {
-        const commitMessage = commit.message;
-        const commitMessageTitle = commit.title;
-
-        // Check if the commit message contains any Jira ticket references
-        const jiraTicketRegex = /[A-Z0-9]+-[0-9]+/g;
-        const jiraTicketMatches = commitMessage.match(jiraTicketRegex);
-        if (jiraTicketMatches) {
-            const jiraTicketNames = jiraTicketMatches.join(", ");
-            partMessages.push(
-                `- the commit message \`${commitMessageTitle}\` probably contains Jira ticket reference (\`${jiraTicketNames}\`). Please remove Jira tickets from commit messages.`
-            );
-            continue;
-        }
-
-        // Check if the commit message matches any regex from "detectRegexes"
-        if (detectRegexes.some((regex) => commitMessage.match(regex))) {
-            partMessages.push(
-                `- the commit message \`${commitMessageTitle}\` appears to be a temporary or automatically generated message`
-            );
-            continue;
-        }
-
-        // Check if the commit message is not too short
-        const shortCommitMessageThreshold = 20; // commit message is considered too short below this number of characters
-        if (commitMessage.length < shortCommitMessageThreshold) {
-            partMessages.push(
-                `- the commit message \`${commitMessageTitle}\` may not be sufficiently descriptive`
-            );
-        }
-    }
-
-	// Create report
-	if (partMessages.length) {
-		partMessages.sort();
-		let dangerMessage = `\nSome issues found for the commit messages in this MR:\n${partMessages.join('\n')}
-		\nPlease consider updating these commit messages. It is recommended to follow this [commit messages guide](https://gitlab.espressif.cn:6688/espressif/esp-idf/-/wikis/dev-proc/Commit-messages)`;
-		warn(dangerMessage);
-	}
-};

.gitlab/dangerjs/mrCommitsEmail.js

@@ -1,16 +0,0 @@
-/**
- * Check if the author is accidentally making a commit using a personal email
- *
- * @dangerjs INFO
- */
-module.exports = function () {
-    const mrCommitAuthorEmails = danger.gitlab.commits.map(commit => commit.author_email);
-    const mrCommitCommitterEmails = danger.gitlab.commits.map(commit => commit.committer_email);
-	const emailPattern = /.*@espressif\.com/;
-	const filteredEmails = [...mrCommitAuthorEmails, ...mrCommitCommitterEmails].filter((email) => !emailPattern.test(email));
-	if (filteredEmails.length) {
-		return message(
-			`Some of the commits were authored or committed by developers outside Espressif: ${filteredEmails.join(', ')}. Please check if this is expected.`
-		);
-	}
-};

.gitlab/dangerjs/mrCommitsTooManyCommits.js

@@ -1,15 +0,0 @@
-/**
- * Check if MR has not an excessive numbers of commits (if squashed)
- *
- * @dangerjs INFO
- */
-module.exports = function () {
-    const tooManyCommitThreshold = 2; // above this number of commits, squash commits is suggested
-    const mrCommits = danger.gitlab.commits;
-
-    if (mrCommits.length > tooManyCommitThreshold) {
-        return message(
-            `You might consider squashing your ${mrCommits.length} commits (simplifying branch history).`
-        );
-    }
-};

.gitlab/dangerjs/mrDescriptionHasReleaseNotes.js

@@ -1,28 +0,0 @@
-/**
- * Check if MR Description contains mandatory section "Release notes"
- *
- * Extracts the content of the "Release notes" section from the GitLab merge request description.
- *
- * @dangerjs WARN (if section missing, is empty or wrong markdown format)
- */
-module.exports = function () {
-    const mrDescription = danger.gitlab.mr.description;
-    const regexSectionReleaseNotes = /## Release notes([\s\S]*?)(?=## |$)/;
-    const sectionReleaseNotes = mrDescription.match(regexSectionReleaseNotes);
-
-    if (!sectionReleaseNotes) {
-        warn(
-            'The `Release Notes` section seems to be missing. Please check if the section header in MR description is present and in the correct markdown format ("## Release Notes")\n'
-        );
-        return null;
-    }
-
-    let content = sectionReleaseNotes[1].replace(/(\r\n|\n|\r)/gm, "").trim(); // Remove empty lines and whitespace
-
-    if (!content.length) {
-        warn(
-            "The `Release Notes` section seems to be empty (no section content)\n"
-        );
-        return null;
-    }
-};

.gitlab/dangerjs/mrDescriptionJiraLinks.js

@@ -1,230 +0,0 @@
-/** Check that there are valid JIRA links in MR description.
- *
- * This check extracts the "Related" section from the MR description and
- * searches for JIRA ticket references in the format "Closes [JIRA ticket key]".
- *
- * It then extracts the closing GitHub links from the corresponding JIRA tickets and
- * checks if the linked GitHub issues are still in open state.
- *
- * Finally, it checks if the required GitHub closing links are present in the MR's commit messages.
- *
- */
-module.exports = async function () {
-    const axios = require("axios");
-    const mrDescription = danger.gitlab.mr.description;
-    const mrCommitMessages = danger.gitlab.commits.map(
-        (commit) => commit.message
-    );
-    const jiraTicketRegex = /[A-Z0-9]+-[0-9]+/;
-
-    let partMessages = []; // Create a blank field for future records of individual issues
-
-    // Parse section "Related" from MR Description
-    const sectionRelated = extractSectionRelated(mrDescription);
-
-    if (
-        !sectionRelated.header || // No section Related in MR description or ...
-        !jiraTicketRegex.test(sectionRelated.content) // no Jira links in section Related
-    ) {
-        return message(
-            "Please consider adding references to JIRA issues in the `Related` section of the MR description."
-        );
-    }
-
-    // Get closing (only) JIRA tickets
-    const jiraTickets = findClosingJiraTickets(sectionRelated.content);
-
-    for (const ticket of jiraTickets) {
-        ticket.jiraUIUrl = `https://jira.espressif.com:8443/browse/${ticket.ticketName}`;
-
-        if (!ticket.correctFormat) {
-            partMessages.push(
-                `- closing ticket \`${ticket.record}\` seems to be in the wrong format (or inaccessible to Jira DangerBot).. The correct format is for example \`- Closes JIRA-123\`.`
-            );
-        }
-
-        // Get closing GitHub issue links from JIRA tickets
-        const closingGithubLink = await getGitHubClosingLink(ticket.ticketName);
-        if (closingGithubLink) {
-            ticket.closingGithubLink = closingGithubLink;
-        } else if (closingGithubLink === null) {
-            partMessages.push(
-                `- the Jira issue number [\`${ticket.ticketName}\`](${ticket.jiraUIUrl}) seems to be invalid (please check if the ticket number is correct)`
-            );
-            continue; // Handle unreachable JIRA tickets; skip the following checks
-        } else {
-            continue; // Jira ticket have no GitHub closing link; skip the following checks
-        }
-
-        // Get still open GitHub issues
-        const githubIssueStatusOpen = await isGithubIssueOpen(
-            ticket.closingGithubLink
-        );
-        ticket.isOpen = githubIssueStatusOpen;
-        if (githubIssueStatusOpen === null) {
-            // Handle unreachable GitHub issues
-            partMessages.push(
-                `- the GitHub issue [\`${ticket.closingGithubLink}\`](${ticket.closingGithubLink}) does not seem to exist on GitHub (referenced from JIRA ticket [\`${ticket.ticketName}\`](${ticket.jiraUIUrl}) )`
-            );
-            continue; // skip the following checks
-        }
-
-        // Search in commit message if there are all GitHub closing links (from Related section) for still open GH issues
-        if (ticket.isOpen) {
-            if (
-                !mrCommitMessages.some((item) =>
-                    item.includes(`Closes ${ticket.closingGithubLink}`)
-                )
-            ) {
-                partMessages.push(
-                    `- please add \`Closes ${ticket.closingGithubLink}\` to the commit message`
-                );
-            }
-        }
-    }
-
-    // Create report / DangerJS check feedback if issues with Jira links found
-    if (partMessages.length) {
-        createReport();
-    }
-
-    // ---------------------------------------------------------------
-
-    /**
-     * This function takes in a string mrDescription which contains a Markdown-formatted text
-     * related to a Merge Request (MR) in a GitLab repository. It searches for a section titled "Related"
-     * and extracts the content of that section. If the section is not found, it returns an object
-     * indicating that the header and content are null. If the section is found but empty, it returns
-     * an object indicating that the header is present but the content is null. If the section is found
-     * with content, it returns an object indicating that the header is present and the content of the
-     * "Related" section.
-     *
-     * @param {string} mrDescription - The Markdown-formatted text related to the Merge Request.
-     * @returns {{
-     *  header: string | boolean | null,
-     * 	content: string | null
-     * 	}} - An object containing the header and content of the "Related" section, if present.
-     */
-
-    function extractSectionRelated(mrDescription) {
-        const regexSectionRelated = /## Related([\s\S]*?)(?=## |$)/;
-        const sectionRelated = mrDescription.match(regexSectionRelated);
-        if (!sectionRelated) {
-            return { header: null, content: null }; // Section "Related" is missing
-        }
-
-        const content = sectionRelated[1].replace(/(\r\n|\n|\r)/gm, ""); // Remove empty lines
-        if (!content.length) {
-            return { header: true, content: null }; // Section "Related" is present, but empty
-        }
-
-        return { header: true, content: sectionRelated[1] }; // Found section "Related" with content
-    }
-
-    /**
-     * Finds all JIRA tickets that are being closed in the given sectionRelatedcontent.
-     * The function searches for lines that start with - Closes and have the format Closes [uppercase letters]-[numbers].
-     * @param {string} sectionRelatedcontent - A string that contains lines with mentions of JIRA tickets
-     * @returns {Array} An array of objects with ticketName property that has the correct format
-     */
-
-    function findClosingJiraTickets(sectionRelatedcontent) {
-        let closingTickets = [];
-        const lines = sectionRelatedcontent.split("\n");
-        for (const line of lines) {
-            if (!line.startsWith("- Closes")) {
-                continue; // Not closing-type ticket, skip
-            }
-
-            const correctJiraClosingLinkFormat = new RegExp(
-                `^- Closes ${jiraTicketRegex.source}$`
-            );
-            const matchedJiraTicket = line.match(jiraTicketRegex);
-            if (matchedJiraTicket) {
-                if (!correctJiraClosingLinkFormat.test(line)) {
-                    closingTickets.push({
-                        record: line,
-                        ticketName: matchedJiraTicket[0],
-                        correctFormat: false,
-                    });
-                } else {
-                    closingTickets.push({
-                        record: line,
-                        ticketName: matchedJiraTicket[0],
-                        correctFormat: true,
-                    });
-                }
-            }
-        }
-        return closingTickets;
-    }
-
-    /**
-     * This function takes a JIRA issue key and retrieves the description from JIRA's API.
-     * It then searches the description for a GitHub closing link in the format "Closes https://github.com/owner/repo/issues/123".
-     * If a GitHub closing link is found, it is returned. If no GitHub closing link is found, it returns null.
-     * @param {string} jiraIssueKey - The key of the JIRA issue to search for the GitHub closing link.
-     * @returns {Promise<string|null>} - A promise that resolves to a string containing the GitHub closing link if found,
-     * or null if not found.
-     */
-    async function getGitHubClosingLink(jiraIssueKey) {
-        let jiraDescription = "";
-
-        // Get JIRA ticket description content
-        try {
-            const response = await axios({
-                url: `https://jira.espressif.com:8443/rest/api/latest/issue/${jiraIssueKey}`,
-                auth: {
-                    username: process.env.DANGER_JIRA_USER,
-                    password: process.env.DANGER_JIRA_PASSWORD,
-                },
-            });
-            jiraDescription = response.data.fields.description
-                ? response.data.fields.description
-                : ""; // if the Jira ticket has an unfilled Description, the ".description" property is missing in API response - in that case set "jiraDescription" to an empty string
-        } catch (error) {
-            return null;
-        }
-
-        // Find GitHub closing link in description
-        const regexClosingGhLink =
-            /Closes\s+(https:\/\/github.com\/\S+\/\S+\/issues\/\d+)/;
-        const closingGithubLink = jiraDescription.match(regexClosingGhLink);
-
-        if (closingGithubLink) {
-            return closingGithubLink[1];
-        } else {
-            return false; // Jira issue has no GitHub closing link in description
-        }
-    }
-
-    /**
-     * Check if a GitHub issue linked in a merge request is still open.
-     *
-     * @param {string} link - The link to the GitHub issue.
-     * @returns {Promise<boolean>} A promise that resolves to a boolean indicating if the issue is open.
-     * @throws {Error} If the link is invalid or if there was an error fetching the issue.
-     */
-    async function isGithubIssueOpen(link) {
-        const parsedUrl = new URL(link);
-        const [owner, repo] = parsedUrl.pathname.split("/").slice(1, 3);
-        const issueNumber = parsedUrl.pathname.split("/").slice(-1)[0];
-
-        try {
-            const response = await axios.get(
-                `https://api.github.com/repos/${owner}/${repo}/issues/${issueNumber}`
-            );
-            return response.data.state === "open"; // return True if GitHub issue is open
-        } catch (error) {
-            return null; // GET request to issue fails
-        }
-    }
-
-    function createReport() {
-        partMessages.sort();
-        let dangerMessage = `Some issues found for the related JIRA tickets in this MR:\n${partMessages.join(
-            "\n"
-        )}`;
-        warn(dangerMessage);
-    }
-};

.gitlab/dangerjs/mrDescriptionLongEnough.js

@@ -1,17 +0,0 @@
-/**
- * Check if MR Description has accurate description".
- *
- * @dangerjs WARN
- */
-module.exports = function () {
-    const mrDescription = danger.gitlab.mr.description;
-    const descriptionChunk = mrDescription.match(/^([^#]*)/)[1].trim(); // Extract all text before the first section header (i.e., the text before the "## Release notes")
-
-    const shortMrDescriptionThreshold = 50; // Description is considered too short below this number of characters
-
-    if (descriptionChunk.length < shortMrDescriptionThreshold) {
-        return warn(
-            "The MR description looks very brief, please check if more details can be added."
-        );
-    }
-};

.gitlab/dangerjs/mrDocsTranslation.js

@@ -1,33 +0,0 @@
-/**
- * Check if documentation needs translation labels
- *
- * #TODO: this simple logic will be improved in future MRs - Jira IDF-6855.
- *
- * @dangerjs WARN
- */
-module.exports = function () {
-    const mrLabels = danger.gitlab.mr.labels;
-    const changesInDocsEN = /docs\/en/.test(
-        danger.git.modified_files ? danger.git.modified_files[0] : ""
-    ); // Test if changes in directory "docs/EN"
-    const changesInDocsCH = /docs\/zh_CN/.test(
-        danger.git.modified_files ? danger.git.modified_files[0] : ""
-    ); // Test if changes in directory "docs/CH"
-
-    // Only English docs has been changed
-    if (changesInDocsEN && !changesInDocsCH) {
-        if (!mrLabels.includes("needs translation: CN")) {
-            return warn(
-                "The updated documentation will need to be translated into Chinese, please add the MR label `needs translation: CN`"
-            );
-        }
-    }
-    // Only Chineese docs has been changed
-    if (!changesInDocsEN && changesInDocsCH) {
-        if (!mrLabels.includes("needs translation: EN")) {
-            return warn(
-                "The updated documentation will need to be translated into English, please add the MR label `needs translation: EN`"
-            );
-        }
-    }
-};

.gitlab/dangerjs/mrSizeTooLarge.js

@@ -1,15 +0,0 @@
-/**
- * Check if MR is too large (more than 1000 lines of changes)
- *
- * @dangerjs INFO
- */
-module.exports = async function () {
-    const bigMrLinesOfCodeThreshold = 1000;
-    const totalLines = await danger.git.linesOfCode();
-
-    if (totalLines > bigMrLinesOfCodeThreshold) {
-        return message(
-            `This MR seems to be quite large (total lines of code: ${totalLines}), you might consider splitting it into smaller MRs`
-        );
-    }
-};

.gitlab/dangerjs/mrTitleNoDraftOrWip.js

@@ -1,22 +0,0 @@
-/**
- * Check if MR Title contains prefix "WIP: ...".
- *
- * @dangerjs WARN
- */
-module.exports = function () {
-	const mrTitle = danger.gitlab.mr.title;
-    const regexes = [
-        { prefix: 'WIP', regex: /^WIP:/i },
-        { prefix: 'W.I.P', regex: /^W\.I\.P/i },
-        { prefix: '[WIP]', regex: /^\[WIP/i },
-        { prefix: '[W.I.P]', regex: /^\[W\.I\.P/i },
-        { prefix: '(WIP)', regex: /^\(WIP/i },
-        { prefix: '(W.I.P)', regex: /^\(W\.I\.P/i },
-    ];
-
-	for (const item of regexes) {
-		if (item.regex.test(mrTitle)) {
-			return warn(`Please remove the \`${item.prefix}\` prefix from the MR name before merging this MR.`);
-		}
-	}
-};

.gitlab/merge_request_templates/Minimal_Template.md

@@ -1,15 +0,0 @@
-<!-- This Template states the absolute minimum for an MR.
-    If you want to have a more elaborate template or know why we have this structure,
-    please use the "Mixed Template" or consult the Wiki. -->
-<!-- Add the CI labels to trigger the appropriate tests (e.g. "unit_test_esp32") --><!-- Mandatory -->
-<!-- Make sure the commit message follows the Wiki about "Commit Messages" --><!-- Mandatory -->
-
-<!-- Add description of the change here --><!-- Mandatory -->
-
-## Related <!-- Optional -->
-<!-- Related Jira issues and Github issues or write "No related issues"-->
-
-## Release notes <!-- Mandatory -->
-<!-- Either state release notes or write "No release notes" -->
-
-<!-- ## Breaking change notes --><!-- Optional -->

.gitmodules

@@ -3,14 +3,30 @@
 # For Espressif's public projects please use '../../espressif/proj', not a '../proj'
 #
 
+[submodule "components/esptool_py/esptool"]
+	path = components/esptool_py/esptool
+	url = ../../espressif/esptool.git
+
 [submodule "components/bt/controller/lib_esp32"]
 	path = components/bt/controller/lib_esp32
-	url = ../../espressif/esp32-bt-lib.git
+        url = ../../espressif/esp32-bt-lib.git
 
 [submodule "components/bootloader/subproject/components/micro-ecc/micro-ecc"]
 	path = components/bootloader/subproject/components/micro-ecc/micro-ecc
 	url = ../../kmackay/micro-ecc.git
 
+[submodule "components/coap/libcoap"]
+	path = components/coap/libcoap
+	url = ../../obgm/libcoap.git
+
+[submodule "components/nghttp/nghttp2"]
+	path = components/nghttp/nghttp2
+	url = ../../nghttp2/nghttp2.git
+
+[submodule "components/libsodium/libsodium"]
+	path = components/libsodium/libsodium
+	url = ../../jedisct1/libsodium.git
+
 [submodule "components/spiffs/spiffs"]
 	path = components/spiffs/spiffs
 	url = ../../pellepl/spiffs.git
@@ -23,6 +39,14 @@
 	path = components/mbedtls/mbedtls
 	url = ../../espressif/mbedtls.git
 
+[submodule "components/asio/asio"]
+	path = components/asio/asio
+	url = ../../espressif/asio.git
+
+[submodule "components/expat/expat"]
+	path = components/expat/expat
+	url = ../../libexpat/libexpat.git
+
 [submodule "components/lwip/lwip"]
 	path = components/lwip/lwip
 	url = ../../espressif/esp-lwip.git
@@ -39,14 +63,30 @@
 	path = components/unity/unity
 	url = ../../ThrowTheSwitch/Unity.git
 
+[submodule "examples/build_system/cmake/import_lib/main/lib/tinyxml2"]
+	path = examples/build_system/cmake/import_lib/main/lib/tinyxml2
+	url = ../../leethomason/tinyxml2.git
+
 [submodule "components/bt/host/nimble/nimble"]
 	path = components/bt/host/nimble/nimble
 	url = ../../espressif/esp-nimble.git
 
+[submodule "components/cbor/tinycbor"]
+	path = components/cbor/tinycbor
+	url = ../../intel/tinycbor.git
+
 [submodule "components/esp_wifi/lib"]
 	path = components/esp_wifi/lib
 	url = ../../espressif/esp32-wifi-lib.git
 
+[submodule "components/tinyusb/tinyusb"]
+	path = components/tinyusb/tinyusb
+	url = ../../espressif/tinyusb.git
+
+[submodule "examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib"]
+	path = examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib
+	url = ../../espressif/esp-cryptoauthlib.git
+
 [submodule "components/cmock/CMock"]
 	path = components/cmock/CMock
 	url = ../../ThrowTheSwitch/CMock.git
@@ -70,23 +110,3 @@
 [submodule "components/ieee802154/lib"]
 	path = components/ieee802154/lib
 	url = ../../espressif/esp-ieee802154-lib.git
-
-[submodule "components/bt/controller/lib_esp32h2/esp32h2-bt-lib"]
-	path = components/bt/controller/lib_esp32h2/esp32h2-bt-lib
-	url = ../../espressif/esp32h2-bt-lib.git
-
-[submodule "components/bt/controller/lib_esp32c2/esp32c2-bt-lib"]
-	path = components/bt/controller/lib_esp32c2/esp32c2-bt-lib
-	url = ../../espressif/esp32c2-bt-lib.git
-
-[submodule "components/bt/controller/lib_esp32c6/esp32c6-bt-lib"]
-	path = components/bt/controller/lib_esp32c6/esp32c6-bt-lib
-	url = ../../espressif/esp32c6-bt-lib.git
-
-[submodule "components/heap/tlsf"]
-	path = components/heap/tlsf
-	url = ../../espressif/tlsf.git
-
-[submodule "components/esp_coex/lib"]
-	path = components/esp_coex/lib
-	url = ../../espressif/esp-coex-lib.git

.pre-commit-config.yaml

@@ -11,16 +11,17 @@ repos:
         # 1 - some file extensions
         # 2 - any file matching *test*/*expected* (for host tests, if possible use this naming pattern always)
         # 3 - any directory named 'testdata'
-        # 4 - protobuf auto-generated files
+        # 4 - IDF monitor test data
+        # 5 - protobuf auto-generated files
         exclude: &whitespace_excludes |
           (?x)^(
             .+\.(md|rst|map|bin)|
             .+test.*\/.*expected.*|
             .+\/testdata\/.+|
+            .+test_idf_monitor\/tests\/.+|
             .*_pb2.py|
             .*.pb-c.h|
-            .*.pb-c.c|
-            .*.yuv
+            .*.pb-c.c
           )$
       - id: end-of-file-fixer
         exclude: *whitespace_excludes
@@ -28,13 +29,13 @@ repos:
       - id: mixed-line-ending
         args: ['-f=lf']
       - id: double-quote-string-fixer
-  - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
     hooks:
       - id: flake8
         args: ['--config=.flake8', '--tee', '--benchmark']
   - repo: https://github.com/pycqa/isort
-    rev: 5.11.5  # python 3.7 compatible
+    rev: 5.9.3
     hooks:
       - id: isort
         name: isort (python)
@@ -42,6 +43,7 @@ repos:
           (?x)^(
               .*_pb2.py
           )$
+
   - repo: local
     hooks:
       - id: check-executables
@@ -78,22 +80,21 @@ repos:
         name: Validate Codeowner File
         entry: tools/ci/check_codeowners.py ci-check
         language: python
-        always_run: true
         files: '\.gitlab/CODEOWNERS'
         pass_filenames: false
       - id: check-rules-yml
         name: Check rules.yml all rules have at lease one job applied, all rules needed exist
         entry: tools/ci/check_rules_yml.py
         language: python
-        files: '\.gitlab/ci/.+\.yml|\.gitlab-ci.yml|\.gitmodules'
+        files: '\.gitlab/ci/.+\.yml|\.gitlab-ci.yml'
         pass_filenames: false
         additional_dependencies:
           - PyYAML == 5.3.1
       - id: check-generated-rules
         name: Check rules are generated (based on .gitlab/ci/dependencies/dependencies.yml)
-        entry: tools/ci/generate_rules.py
+        entry: .gitlab/ci/dependencies/generate_rules.py
         language: python
-        files: '\.gitlab/ci/dependencies/.+|\.gitlab/ci/.*\.yml'
+        files: '\.gitlab/ci/dependencies/.+|\.gitlab/ci/rules\.yml'
         pass_filenames: false
         additional_dependencies:
           - PyYAML == 5.3.1
@@ -101,24 +102,14 @@ repos:
         name: Check type annotations in python files
         entry: tools/ci/check_type_comments.py
         additional_dependencies:
-          - 'mypy==0.940'
+          - 'mypy==0.800'
           - 'mypy-extensions==0.4.3'
-          - 'types-setuptools==57.4.14'
-          - 'types-PyYAML==0.1.9'
         exclude: >
           (?x)^(
               .*_pb2.py
           )$
         language: python
         types: [python]
-      - id: check-requirement-files
-        name: Check requirement files
-        entry: tools/ci/check_requirement_files.py
-        additional_dependencies:
-          - 'jsonschema'
-        language: python
-        files: 'tools/requirements.+|tools/requirements/.+'
-        pass_filenames: false
       - id: check-tools-files-patterns
         name: Check tools dir files patterns
         entry: tools/ci/check_tools_files_patterns.py
@@ -127,38 +118,8 @@ repos:
         additional_dependencies:
           - PyYAML == 5.3.1
         pass_filenames: false
-      - id: check-generated-soc-caps-kconfig
-        name: Check soc caps kconfig files are generated (based on components/soc/IDF_TARGET/include/soc/soc_caps.h)
-        entry: tools/gen_soc_caps_kconfig/gen_soc_caps_kconfig.py -d 'components/soc/*/include/soc/' 'components/esp_rom/*/' 'components/spi_flash/*/'
-        language: python
-        files: 'components/soc/.+/include/soc/.+_caps\.h|components/esp_rom/.+/.+_caps\.h|kconfig\.soc_caps.in|components/spi_flash/.+/.+_caps\.h'
-        pass_filenames: false
-        additional_dependencies:
-          - pyparsing
-      - id: check-all-apps-readmes
-        name: Check if all apps readme files match given .build-test-rules.yml files. Modify the supported target tables
-        entry: tools/ci/check_build_test_rules.py check-readmes
-        language: python
-        files: 'tools/test_apps/.+|examples/.+|components/.+|tools/idf_py_actions/constants.py|tools/ci/check_build_test_rules.py'
-        require_serial: true
-        additional_dependencies:
-          - PyYAML == 5.3.1
-          - idf_build_apps
-      - id: sort-build-test-rules-ymls
-        name: sort .build-test-rules.yml files
-        entry: tools/ci/check_build_test_rules.py sort-yaml
-        language: python
-        files: '\.build-test-rules\.yml'
-        additional_dependencies:
-          - PyYAML == 5.3.1
-          - ruamel.yaml
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks:
       - id: file-contents-sorter
-        files: 'tools\/ci\/(executable-list\.txt|mypy_ignore_list\.txt|check_copyright_ignore\.txt)'
-  - repo: https://github.com/espressif/check-copyright/
-    rev: v1.0.1
-    hooks:
-      - id: check-copyright
-        args: ['--ignore', 'tools/ci/check_copyright_ignore.txt', '--config', 'tools/ci/check_copyright_config.yaml']
+        files: 'tools\/ci\/(executable-list\.txt|mypy_ignore_list\.txt)'

.pylintrc

@@ -150,9 +150,6 @@ disable=print-statement,
         too-many-nested-blocks,
         too-many-branches,
         too-many-statements,
-        ungrouped-imports,  # since we have isort in pre-commit
-        no-name-in-module,  # since we have flake8 to check this
-        too-many-instance-attributes,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.5)
 project(esp-idf C CXX ASM)
 
 if(CMAKE_CURRENT_LIST_DIR STREQUAL CMAKE_SOURCE_DIR)
@@ -62,6 +62,23 @@ if(CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS)
     list(APPEND compile_options "-msave-restore")
 endif()
 
+if(CONFIG_COMPILER_DISABLE_GCC8_WARNINGS)
+    list(APPEND compile_options "-Wno-parentheses"
+                                "-Wno-sizeof-pointer-memaccess"
+                                "-Wno-clobbered")
+
+    list(APPEND compile_options "-Wno-format-overflow"
+                                "-Wno-stringop-truncation"
+                                "-Wno-misleading-indentation"
+                                "-Wno-cast-function-type"
+                                "-Wno-implicit-fallthrough"
+                                "-Wno-unused-const-variable"
+                                "-Wno-switch-unreachable"
+                                "-Wno-format-truncation"
+                                "-Wno-memset-elt-size"
+                                "-Wno-int-in-bool-context")
+endif()
+
 if(CMAKE_C_COMPILER_ID MATCHES "GNU")
     list(APPEND c_compile_options "-Wno-old-style-declaration")
 endif()
@@ -102,19 +119,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
     # Disable Clang warnings for atomic operations with access size
     # more then 4 bytes
     list(APPEND compile_options "-Wno-atomic-alignment")
-    # several warnings in wpa_supplicant component
-    list(APPEND compile_options "-Wno-unused-but-set-variable")
     # Clang also produces many -Wunused-function warnings which GCC doesn't.
-    list(APPEND compile_options "-Wno-unused-function")
-    # many warnings in bluedroid code
-    # warning: field 'hdr' with variable sized type 'BT_HDR' not at the end of a struct or class is a GNU extension
-    list(APPEND compile_options "-Wno-gnu-variable-sized-type-not-at-end")
-    # several warnings in bluedroid code
-    list(APPEND compile_options "-Wno-constant-logical-operand")
-    # warning: '_Static_assert' with no message is a C2x extension
-    list(APPEND compile_options "-Wno-c2x-extensions")
-    # warning on xMPU_SETTINGS for esp32s2 has size 0 for C and 1 for C++
-    list(APPEND compile_options "-Wno-extern-c-compat")
+    # However these aren't treated as errors.
 endif()
 # More warnings may exist in unit tests and example projects.
 
@@ -141,52 +147,14 @@ endif()
 if(NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS 8.0.0)
     if(CONFIG_COMPILER_HIDE_PATHS_MACROS)
         list(APPEND compile_options "-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=.")
-        list(APPEND compile_options "-fmacro-prefix-map=${IDF_PATH}=/IDF")
+        list(APPEND compile_options "-fmacro-prefix-map=${IDF_PATH}=IDF")
     endif()
-
-    if(CONFIG_APP_REPRODUCIBLE_BUILD)
-        idf_build_set_property(DEBUG_PREFIX_MAP_GDBINIT "${BUILD_DIR}/prefix_map_gdbinit")
-
-        list(APPEND compile_options "-fdebug-prefix-map=${IDF_PATH}=/IDF")
-        list(APPEND compile_options "-fdebug-prefix-map=${PROJECT_DIR}=/IDF_PROJECT")
-        list(APPEND compile_options "-fdebug-prefix-map=${BUILD_DIR}=/IDF_BUILD")
-
-        # component dirs
-        idf_build_get_property(python PYTHON)
-        idf_build_get_property(idf_path IDF_PATH)
-        idf_build_get_property(component_dirs BUILD_COMPONENT_DIRS)
-
-        execute_process(
-            COMMAND ${python}
-                "${idf_path}/tools/generate_debug_prefix_map.py"
-                "${BUILD_DIR}"
-                "${component_dirs}"
-            OUTPUT_VARIABLE result
-            RESULT_VARIABLE ret
-        )
-        if(NOT ret EQUAL 0)
-            message(FATAL_ERROR "This is a bug. Please report to https://github.com/espressif/esp-idf/issues")
-        endif()
-
-        spaces2list(result)
-        list(LENGTH component_dirs length)
-        math(EXPR max_index "${length} - 1")
-        foreach(index RANGE ${max_index})
-            list(GET component_dirs ${index} folder)
-            list(GET result ${index} after)
-            list(APPEND compile_options "-fdebug-prefix-map=${folder}=${after}")
-        endforeach()
-    endif()
-endif()
-
-if(CONFIG_COMPILER_DISABLE_GCC12_WARNINGS)
-    list(APPEND compile_options "-Wno-address"
-                                "-Wno-use-after-free")
 endif()
 
 # GCC-specific options
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     list(APPEND compile_options "-fstrict-volatile-bitfields"
+                                "-Wno-error=unused-but-set-variable"
                                 )
 endif()
 
@@ -197,20 +165,6 @@ endif()
 
 list(APPEND link_options "-fno-lto")
 
-if(CONFIG_IDF_TARGET_LINUX AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-    list(APPEND link_options "-Wl,-dead_strip")
-    list(APPEND link_options "-Wl,-warn_commons")
-else()
-    list(APPEND link_options "-Wl,--gc-sections")
-    list(APPEND link_options "-Wl,--warn-common")
-endif()
-
-# SMP FreeRTOS user provided minimal idle hook. This allows the user to provide
-# their own copy of vApplicationMinimalIdleHook()
-if(CONFIG_FREERTOS_USE_MINIMAL_IDLE_HOOK)
-    list(APPEND link_options "-Wl,--wrap=vApplicationMinimalIdleHook")
-endif()
-
 # Placing jump tables in flash would cause issues with code that required
 # to be placed in IRAM
 list(APPEND compile_options "-fno-jump-tables")
@@ -220,20 +174,10 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
     list(APPEND compile_options "-fno-tree-switch-conversion")
 endif()
 
-if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+if(CMAKE_C_COMPILER_ID MATCHES "LLVM")
     list(APPEND compile_options "-fno-use-cxa-atexit")
 endif()
 
-# For the transition period from 32-bit time_t to 64-bit time_t,
-# auto-detect the size of this type and set corresponding variable.
-include(CheckTypeSize)
-check_type_size("time_t" TIME_T_SIZE)
-if(TIME_T_SIZE)
-    idf_build_set_property(TIME_T_SIZE ${TIME_T_SIZE})
-else()
-    message(FATAL_ERROR "Failed to determine sizeof(time_t)")
-endif()
-
 idf_build_set_property(COMPILE_OPTIONS "${compile_options}" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "${c_compile_options}" APPEND)
 idf_build_set_property(CXX_COMPILE_OPTIONS "${cxx_compile_options}" APPEND)

CONTRIBUTING.md

@@ -1,6 +0,0 @@
-# Contributing to ESP-IDF
-
-Contributions to ESP-IDF - fixing bugs, adding features, adding documentation - are welcome! We accept contributions via Github Pull Requests.
-
-Please see the [Contributions Guide](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/contribute/index.html) for more information.
-

CONTRIBUTING.rst

@@ -0,0 +1,61 @@
+Contributions Guide
+===================
+
+We welcome contributions to the esp-idf project!
+
+How to Contribute
+-----------------
+
+Contributions to esp-idf - fixing bugs, adding features, adding documentation - are welcome. We accept contributions via `Github Pull Requests <https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests>`_.
+
+Before Contributing
+-------------------
+
+Before sending us a Pull Request, please consider this list of points:
+
+* Is the contribution entirely your own work, or already licensed under an Apache License 2.0 compatible Open Source License? If not then we unfortunately cannot accept it.
+
+* Does any new code conform to the esp-idf :doc:`Style Guide <style-guide>`?
+
+* Have you installed the :doc:`pre-commit hook <install-pre-commit-hook>` for esp-idf project?
+
+* Does the code documentation follow requirements in :doc:`documenting-code`?
+
+* Is the code adequately commented for people to understand how it is structured?
+
+* Is there documentation or examples that go with code contributions? There are additional suggestions for writing good examples in :idf:`examples` readme.
+
+* Are comments and documentation written in clear English, with no spelling or grammar errors?
+
+* Example contributions are also welcome. Please check the :doc:`creating-examples` guide for these.
+
+* If the contribution contains multiple commits, are they grouped together into logical changes (one major change per pull request)? Are any commits with names like "fixed typo" `squashed into previous commits <https://eli.thegreenplace.net/2014/02/19/squashing-github-pull-requests-into-a-single-commit/>`_?
+
+* If you're unsure about any of these points, please open the Pull Request anyhow and then ask us for feedback.
+
+Pull Request Process
+--------------------
+
+After you open the Pull Request, there will probably be some discussion in the comments field of the request itself.
+
+Once the Pull Request is ready to merge, it will first be merged into our internal git system for in-house automated testing.
+
+If this process passes, it will be merged onto the public github repository.
+
+Legal Part
+----------
+
+Before a contribution can be accepted, you will need to sign our :doc:`contributor-agreement`. You will be prompted for this automatically as part of the Pull Request process.
+
+Related Documents
+-----------------
+
+.. toctree::
+    :maxdepth: 1
+
+    style-guide
+    install-pre-commit-hook
+    documenting-code
+    creating-examples
+    ../api-reference/template
+    contributor-agreement

Kconfig

@@ -1,24 +1,18 @@
 #
-# Please run the following command for opening a page with more information about this configuration file:
-# idf.py docs -sp api-reference/kconfig.html
+# For a description of the syntax of this configuration file,
+# see kconfig/kconfig-language.txt.
 #
 mainmenu "Espressif IoT Development Framework Configuration"
 
-    orsource "./components/soc/$IDF_TARGET/include/soc/Kconfig.soc_caps.in"
-
     config IDF_CMAKE
         bool
-        default "y"
+        option env="IDF_CMAKE"
 
     config IDF_ENV_FPGA
         # This option is for internal use only
         bool
         option env="IDF_ENV_FPGA"
 
-    config IDF_CI_BUILD
-        bool
-        default y if "$(IDF_CI_BUILD)" = "y" || "$(IDF_CI_BUILD)" = 1
-
     config IDF_TARGET_ARCH_RISCV
         bool
         default "n"
@@ -27,11 +21,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         bool
         default "n"
 
-    config IDF_TARGET_ARCH
-        string
-        default "riscv" if IDF_TARGET_ARCH_RISCV
-        default "xtensa" if IDF_TARGET_ARCH_XTENSA
-
     config IDF_TARGET
         # This option records the IDF target when sdkconfig is generated the first time.
         # It is not updated if environment variable $IDF_TARGET changes later, and
@@ -40,10 +29,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         string
         default "$IDF_TARGET"
 
-    config IDF_TARGET_LINUX
-        bool
-        default "y" if IDF_TARGET="linux"
-
     config IDF_TARGET_ESP32
         bool
         default "y" if IDF_TARGET="esp32"
@@ -66,18 +51,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         select FREERTOS_UNICORE
         select IDF_TARGET_ARCH_RISCV
 
-    config IDF_TARGET_ESP32C2
-        bool
-        default "y" if IDF_TARGET="esp32c2"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-
-    config IDF_TARGET_ESP32C6
-        bool
-        default "y" if IDF_TARGET="esp32c6"
-        select FREERTOS_UNICORE
-        select IDF_TARGET_ARCH_RISCV
-
     config IDF_TARGET_ESP32H2
         bool
         default "y" if IDF_TARGET="esp32h2"
@@ -94,11 +67,62 @@ mainmenu "Espressif IoT Development Framework Configuration"
         default 0x0002 if IDF_TARGET_ESP32S2
         default 0x0005 if IDF_TARGET_ESP32C3
         default 0x0009 if IDF_TARGET_ESP32S3
-        default 0x000C if IDF_TARGET_ESP32C2
-        default 0x000D if IDF_TARGET_ESP32C6
-        default 0x0010 if IDF_TARGET_ESP32H2
+        default 0x000A if IDF_TARGET_ESP32H2 # ESP32H2-TODO: IDF-3475
         default 0xFFFF
 
+    menu "SDK tool configuration"
+        config SDK_TOOLPREFIX
+            string "Compiler toolchain path/prefix"
+            default "xtensa-esp32-elf-" if IDF_TARGET_ESP32
+            default "xtensa-esp32s2-elf-" if IDF_TARGET_ESP32S2
+            default "xtensa-esp32s3-elf-" if IDF_TARGET_ESP32S3
+            default "riscv32-esp-elf-" if IDF_TARGET_ESP32C3
+            default "riscv32-esp-elf-" if IDF_TARGET_ESP32H2
+
+            help
+                The prefix/path that is used to call the toolchain. The default setting assumes
+                a crosstool-ng gcc setup that is in your PATH.
+
+        config SDK_PYTHON
+            string "Python interpreter"
+            depends on !IDF_CMAKE
+            default "python"
+            help
+                The executable name/path that is used to run python.
+
+                (Note: This option is used with the legacy GNU Make build system only.)
+
+        config SDK_MAKE_WARN_UNDEFINED_VARIABLES
+            bool "'make' warns on undefined variables"
+            depends on !IDF_CMAKE
+            default "y"
+            help
+                Adds --warn-undefined-variables to MAKEFLAGS. This causes make to
+                print a warning any time an undefined variable is referenced.
+
+                This option helps find places where a variable reference is misspelled
+                or otherwise missing, but it can be unwanted if you have Makefiles which
+                depend on undefined variables expanding to an empty string.
+
+                (Note: this option is used with the legacy GNU Make build system only.)
+
+        config SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS
+            bool "Toolchain supports time_t wide 64-bits"
+            default n
+            help
+                Enable this option in case you have a custom toolchain which supports time_t wide 64-bits.
+                This option checks time_t is 64-bits and disables ROM time functions
+                to use the time functions from the toolchain instead.
+                This option allows resolving the Y2K38 problem.
+                See "Setup Linux Toolchain from Scratch" to build
+                a custom toolchain which supports 64-bits time_t.
+
+                Note: ESP-IDF does not currently come with any pre-compiled toolchain
+                that supports 64-bit wide time_t.
+                This will change in a future major release,
+                but currently 64-bit time_t requires a custom built toolchain.
+
+    endmenu  # SDK tool configuration
 
     menu "Build type"
 
@@ -115,15 +139,13 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                 Another option, useful for only very small and limited applications, is to only link
                 the .elf file of the application, such that it can be loaded directly into RAM over
-                JTAG or UART. Note that since IRAM and DRAM sizes are very limited, it is not possible
-                to build any complex application this way. However for some kinds of testing and debugging,
+                JTAG. Note that since IRAM and DRAM sizes are very limited, it is not possible to
+                build any complex application this way. However for kinds of testing and debugging,
                 this option may provide faster iterations, since the application does not need to be
                 written into flash.
-
-                Note: when APP_BUILD_TYPE_RAM is selected and loaded with JTAG, ESP-IDF does not contain
-                all the startup code required to initialize the CPUs and ROM memory (data/bss).
-                Therefore it is necessary to execute a bit of ROM code prior to executing the application.
-                A gdbinit file may look as follows (for ESP32):
+                Note that at the moment, ESP-IDF does not contain all the startup code required to
+                initialize the CPUs and ROM memory (data/bss). Therefore it is necessary to execute
+                a bit of ROM code prior to executing the application. A gdbinit file may look as follows (for ESP32):
 
                     # Connect to a running instance of OpenOCD
                     target remote :3333
@@ -145,18 +167,11 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                 Example gdbinit files for other targets can be found in tools/test_apps/system/gdb_loadable_elf/
 
-                When loading the BIN with UART, the ROM will jump to ram and run the app after finishing the ROM
-                startup code, so there's no additional startup initialization required. You can use the
-                `load_ram` in esptool.py to load the generated .bin file into ram and execute.
-
-                Example:
-                    esptool.py --chip {chip} -p {port} -b {baud} --no-stub load_ram {app.bin}
-
                 Recommended sdkconfig.defaults for building loadable ELF files is as follows.
-                CONFIG_APP_BUILD_TYPE_RAM is required, other options help reduce application
+                CONFIG_APP_BUILD_TYPE_ELF_RAM is required, other options help reduce application
                 memory footprint.
 
-                    CONFIG_APP_BUILD_TYPE_RAM=y
+                    CONFIG_APP_BUILD_TYPE_ELF_RAM=y
                     CONFIG_VFS_SUPPORT_TERMIOS=
                     CONFIG_NEWLIB_NANO_FORMAT=y
                     CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
@@ -167,16 +182,13 @@ mainmenu "Espressif IoT Development Framework Configuration"
             config APP_BUILD_TYPE_APP_2NDBOOT
                 bool
                 prompt "Default (binary application + 2nd stage bootloader)"
-                depends on !IDF_TARGET_LINUX
                 select APP_BUILD_GENERATE_BINARIES
                 select APP_BUILD_BOOTLOADER
                 select APP_BUILD_USE_FLASH_SECTIONS
 
-            config APP_BUILD_TYPE_RAM
+            config APP_BUILD_TYPE_ELF_RAM
                 bool
-                prompt "Build app runs entirely in RAM (EXPERIMENTAL)"
-                select APP_BUILD_GENERATE_BINARIES
-
+                prompt "ELF file, loadable into RAM (EXPERIMENTAL))"
         endchoice # APP_BUILD_TYPE
 
         # Hidden options, set according to the choice above
@@ -186,76 +198,9 @@ mainmenu "Espressif IoT Development Framework Configuration"
         config APP_BUILD_BOOTLOADER
             bool # Whether to build the bootloader
 
-        config APP_BUILD_TYPE_PURE_RAM_APP
-            bool
-            prompt "Build app without SPI_FLASH/PSRAM support (saves ram)"
-            depends on APP_BUILD_TYPE_RAM
-            help
-                If this option is enabled, external memory and related peripherals, such as Cache, MMU,
-                Flash and PSRAM, won't be initialized. Corresponding drivers won't be introduced either.
-                Components that depend on the spi_flash component will also be unavailable, such as
-                app_update, etc. When this option is enabled, about 26KB of RAM space can be saved.
-
         config APP_BUILD_USE_FLASH_SECTIONS
             bool # Whether to place code/data into memory-mapped flash sections
 
-        config APP_REPRODUCIBLE_BUILD
-            bool "Enable reproducible build"
-            default n
-            select COMPILER_HIDE_PATHS_MACROS
-            help
-                If enabled, all date, time, and path information would be eliminated. A .gdbinit file would be create
-                automatically. (or will be append if you have one already)
-
-        config APP_NO_BLOBS
-            bool "No Binary Blobs"
-            default n
-            help
-                If enabled, this disables the linking of binary libraries in the application build. Note
-                that after enabling this Wi-Fi/Bluetooth will not work.
-
-        config APP_COMPATIBLE_PRE_V2_1_BOOTLOADERS
-            bool "App compatible with bootloaders before ESP-IDF v2.1"
-            select APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS
-            depends on IDF_TARGET_ESP32
-            default n
-            help
-                Bootloaders before ESP-IDF v2.1 did less initialisation of the
-                system clock. This setting needs to be enabled to build an app
-                which can be booted by these older bootloaders.
-
-                If this setting is enabled, the app can be booted by any bootloader
-                from IDF v1.0 up to the current version.
-
-                If this setting is disabled, the app can only be booted by bootloaders
-                from IDF v2.1 or newer.
-
-                Enabling this setting adds approximately 1KB to the app's IRAM usage.
-
-        config APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS
-            bool "App compatible with bootloader and partition table before ESP-IDF v3.1"
-            depends on IDF_TARGET_ESP32
-            default n
-            help
-                Partition tables before ESP-IDF V3.1 do not contain an MD5 checksum
-                field, and the bootloader before ESP-IDF v3.1 cannot read a partition
-                table that contains an MD5 checksum field.
-
-                Enable this option only if your app needs to boot on a bootloader and/or
-                partition table that was generated from a version *before* ESP-IDF v3.1.
-
-                If this option and Flash Encryption are enabled at the same time, and any
-                data partitions in the partition table are marked Encrypted, then the
-                partition encrypted flag should be manually verified in the app before accessing
-                the partition (see CVE-2021-27926).
-
-        config APP_INIT_CLK
-            bool
-            depends on IDF_TARGET_ESP32
-            default y if APP_COMPATIBLE_PRE_V2_1_BOOTLOADERS
-            default y if APP_BUILD_TYPE_RAM
-
-
     endmenu # Build type
 
     source "$COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE"
@@ -333,26 +278,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
         endchoice # assertions
 
-        choice COMPILER_FLOAT_LIB_FROM
-            prompt "Compiler float lib source"
-            default COMPILER_FLOAT_LIB_FROM_RVFPLIB if ESP_ROM_HAS_RVFPLIB
-            default COMPILER_FLOAT_LIB_FROM_GCCLIB
-            help
-                In the soft-fp part of libgcc, riscv version is written in C,
-                and handles all edge cases in IEEE754, which makes it larger
-                and performance is slow.
-
-                RVfplib is an optimized RISC-V library for FP arithmetic on 32-bit
-                integer processors, for single and double-precision FP.
-                RVfplib is "fast", but it has a few exceptions from IEEE 754 compliance.
-
-            config COMPILER_FLOAT_LIB_FROM_GCCLIB
-                bool "libgcc"
-            config COMPILER_FLOAT_LIB_FROM_RVFPLIB
-                depends on ESP_ROM_HAS_RVFPLIB
-                bool "librvfp"
-        endchoice # COMPILER_FLOAT_LIB_FROM
-
         config COMPILER_OPTIMIZATION_ASSERTION_LEVEL
             int
             default 0 if COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE
@@ -372,6 +297,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
         menuconfig COMPILER_HIDE_PATHS_MACROS
             bool "Replace ESP-IDF and project paths in binaries"
             default y
+            depends on IDF_CMAKE
             help
                 When expanding the __FILE__ and __BASE_FILE__ macros, replace paths inside ESP-IDF
                 with paths relative to the placeholder string "IDF", and convert paths inside the
@@ -480,12 +406,12 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                 This option can be enabled for RISC-V targets only.
 
-        config COMPILER_DISABLE_GCC12_WARNINGS
-            bool "Disable new warnings introduced in GCC 12"
+        config COMPILER_DISABLE_GCC8_WARNINGS
+            bool "Disable new warnings introduced in GCC 6 - 8"
             default "n"
             help
-                Enable this option if use GCC 12 or newer, and want to disable warnings which don't appear with
-                GCC 11.
+                Enable this option if using GCC 6 or newer, and wanting to disable warnings which don't appear with
+                GCC 5.
 
         config COMPILER_DUMP_RTL_FILES
             bool "Dump RTL files during compilation"
@@ -493,17 +419,28 @@ mainmenu "Espressif IoT Development Framework Configuration"
                 If enabled, RTL files will be produced during compilation. These files
                 can be used by other tools, for example to calculate call graphs.
 
+
     endmenu # Compiler Options
 
     menu "Component config"
         source "$COMPONENT_KCONFIGS_SOURCE_FILE"
     endmenu
 
-    config IDF_EXPERIMENTAL_FEATURES
-        bool "Make experimental features visible"
-        default "n"
-        help
-            By enabling this option, ESP-IDF experimental feature options will be visible.
+    menu "Compatibility options"
+        config LEGACY_INCLUDE_COMMON_HEADERS
+            bool "Include headers across components as before IDF v4.0"
+            default n
+            help
+                Soc, esp32, and driver components, the most common
+                components. Some header of these components are included
+                implicitly by headers of other components before IDF v4.0.
+                It's not required for high-level components, but still
+                included through long header chain everywhere.
 
-            Note you should still enable a certain experimental feature option to use it, and you
-            should read the corresponding risk warning and known issue list carefully.
+                This is harmful to the modularity. So it's changed in IDF
+                v4.0.
+
+                You can still include these headers in a legacy way until it
+                is totally deprecated by enable this option.
+
+    endmenu #Compatibility options

README.md

@@ -4,26 +4,17 @@
 
 ESP-IDF is the development framework for Espressif SoCs supported on Windows, Linux and macOS.
 
-# ESP-IDF Release Support Schedule
-
-![Support Schedule](https://dl.espressif.com/dl/esp-idf/support-periods.svg)
-
-- Please read [the support policy](SUPPORT_POLICY.md) and [the documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html) for more information about ESP-IDF versions.
-- Please see the [End-of-Life Advisories](https://www.espressif.com/en/support/documents/advisories?keys=&field_type_of_advisory_tid%5B%5D=817) for information about ESP-IDF releases with discontinued support.
-
 # ESP-IDF Release and SoC Compatibility
 
-The following table shows ESP-IDF support of Espressif SoCs where ![alt text][preview] and ![alt text][supported] denote preview status and support, respectively. The preview support is usually limited in time and intended for beta versions of chips. Please use an ESP-IDF release where the desired SoC is already supported.
+The following table shows ESP-IDF support of Espressif SoCs where ![alt text][preview] and ![alt text][supported] denote preview status and support, respectively. In preview status the build is not yet enabled and some crucial parts could be missing (like documentation, datasheet). Please use an ESP-IDF release where the desired SoC is already supported.
 
-|Chip         |          v4.2          |         v4.3           |          v4.4          |          v5.0          |         v5.1           |                                                            |
-|:----------- | :---------------------:| :---------------------:| :---------------------:| :---------------------:| :--------------------: | :----------------------------------------------------------|
-|ESP32        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                            |
-|ESP32-S2     | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                            |
-|ESP32-C3     |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                            |
-|ESP32-S3     |                        |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_S3) |
-|ESP32-C2     |                        |                        |                        | ![alt text][supported] | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32-C2) |
-|ESP32-C6     |                        |                        |                        |                        | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_C6) |
-|ESP32-H2     |                        |                        |                        |                        | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_H2) |
+|Chip         |         v3.3           |          v4.0          |           v4.1         |          v4.2          |         v4.3           |          v4.4          |                                                            |
+|:----------- |:---------------------: | :---------------------:| :---------------------:| :---------------------:| :---------------------:| :---------------------:|:---------------------------------------------------------- |
+|ESP32        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                            |
+|ESP32-S2     |                        |                        |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                            |
+|ESP32-C3     |                        |                        |                        |                        | ![alt text][supported] | ![alt text][supported] |                                                            |
+|ESP32-S3     |                        |                        |                        |                        | ![alt text][preview]   | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_S3) |
+|ESP32-H2     |                        |                        |                        |                        |                        | ![alt text][preview]   | [Announcement](https://www.espressif.com/en/news/ESP32_H2) |
 
 [supported]: https://img.shields.io/badge/-supported-green "supported"
 [preview]: https://img.shields.io/badge/-preview-orange "preview"
@@ -40,9 +31,11 @@ See https://idf.espressif.com/ for links to detailed instructions on how to set
 
 ### Non-GitHub forks
 
-ESP-IDF uses relative locations as its submodules URLs ([.gitmodules](.gitmodules)). So they link to GitHub. If ESP-IDF is forked to a Git repository which is not on GitHub, you will need to run the script [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh) after git clone.
-
-The script sets absolute URLs for all submodules, allowing `git submodule update --init --recursive` to complete. If cloning ESP-IDF from GitHub, this step is not needed.
+ESP-IDF uses relative locations as its submodules URLs ([.gitmodules](.gitmodules)). So they link to GitHub.
+If ESP-IDF is forked to a Git repository which is not on GitHub, you will need to run the script
+[tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh) after git clone.
+The script sets absolute URLs for all submodules, allowing `git submodule update --init --recursive` to complete.
+If cloning ESP-IDF from GitHub, this step is not needed.
 
 ## Finding a Project
 
@@ -89,7 +82,7 @@ You don't need to run `idf.py build` before running `idf.py flash`, `idf.py flas
 
 ## Viewing Serial Output
 
-The `idf.py monitor` target uses the [esp-idf-monitor tool](https://github.com/espressif/esp-idf-monitor) to display serial output from Espressif SoCs. esp-idf-monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
+The `idf.py monitor` target uses the [idf_monitor tool](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html) to display serial output from Espressif SoCs. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
 
 Exit the monitor by typing Ctrl-].
 

README_CN.md

@@ -4,26 +4,17 @@
 
 ESP-IDF 是乐鑫官方推出的物联网开发框架，支持 Windows、Linux 和 macOS 操作系统。
 
-# ESP-IDF 版本支持期限
-
-![支持期限](https://dl.espressif.com/dl/esp-idf/support-periods.svg)
-
-- 请参考 [ESP-IDF 支持政策](SUPPORT_POLICY_CN.md) 以及 [相关文档](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/versions.html) 了解更多关于 ESP-IDF 版本的信息。
-- 请参考 [ESP-IDF 版本停止维护 (EOL) 公告](https://www.espressif.com/zh-hans/support/documents/advisories?keys=&field_type_of_advisory_tid%5B%5D=817)。
-
 # ESP-IDF 与乐鑫芯片
 
-下表总结了乐鑫芯片在 ESP-IDF 各版本中的支持状态，其中 ![alt text][supported] 代表已支持，![alt text][preview] 代表目前处于预览支持状态。预览支持状态通常有时间限制，而且仅适用于测试版芯片。请确保使用与芯片相匹配的 ESP-IDF 版本。
+下表总结了乐鑫芯片在 ESP-IDF 各版本中的支持状态，其中 ![alt text][supported] 代表已支持，![alt text][preview] 代表目前处于预览支持状态。在预览支持阶段，因为新芯片尚未完全添加到构建系统目录，所以一些重要的内容（如文档和技术规格书等）可能会缺失。请确保使用与芯片相匹配的 ESP-IDF 版本。
 
-|芯片         |         v4.2          |         v4.3           |          v4.4          |          v5.0          |          v5.1          |                                                                 |
-|:----------- |:---------------------:| :---------------------:| :---------------------:| :---------------------:| :--------------------: | :-------------------------------------------------------------- |
-|ESP32        |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                 |
-|ESP32-S2     |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                 |
-|ESP32-C3     |                       | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                 |
-|ESP32-S3     |                       |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_S3) |
-|ESP32-C2     |                       |                        |                        | ![alt text][supported] | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32-C2) |
-|ESP32-C6     |                       |                        |                        |                        | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_C6) |
-|ESP32-H2     |                       |                        |                        |                        | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/zh-hans/news/ESP32_H2) |
+|    芯片     |         v3.3           |          v4.0          |           v4.1         |          v4.2          |         v4.3           |          v4.4          |                                                            |
+|:----------- |:---------------------: | :---------------------:| :---------------------:| :---------------------:| :---------------------:| :---------------------:|:---------------------------------------------------------- |
+|ESP32        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                            |
+|ESP32-S2     |                        |                        |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                            |
+|ESP32-C3     |                        |                        |                        |                        | ![alt text][supported] | ![alt text][supported] |                                                            |
+|ESP32-S3     |                        |                        |                        |                        | ![alt text][preview]   | ![alt text][supported] | [芯片发布公告](https://www.espressif.com/en/news/ESP32_S3) |
+|ESP32-H2     |                        |                        |                        |                        |                        | ![alt text][preview]   | [芯片发布公告](https://www.espressif.com/en/news/ESP32_H2) |
 
 [supported]: https://img.shields.io/badge/-%E6%94%AF%E6%8C%81-green "supported"
 [preview]: https://img.shields.io/badge/-%E9%A2%84%E8%A7%88-orange "preview"
@@ -40,9 +31,11 @@ ESP-IDF 是乐鑫官方推出的物联网开发框架，支持 Windows、Linux
 
 ### 非 GitHub 分叉的 ESP-IDF 项目
 
-ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodules)），所以它们会指向 GitHub。 如果 ESP-IDF 被分叉到的仓库不在 GitHub 上，那么你需要在克隆结束后运行该脚本 [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh)。
+ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodules)），所以它们会指向 GitHub。
+如果 ESP-IDF 被分叉到的仓库不在 GitHub 上，那么你需要在克隆结束后运行该脚本 [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh)。
 
-这个脚本会为所有的子模块设置绝对路径，接着可以通过 `git submodule update --init --recursive` 完成子模块的更新。如果 ESP-IDF 是从 GitHub 上克隆得到，则不需要此步骤。
+这个脚本会为所有的子模块设置绝对路径，接着可以通过 `git submodule update --init --recursive` 完成子模块的更新。
+如果 ESP-IDF 是从 GitHub 上克隆得到，则不需要此步骤。
 
 ## 寻找项目
 
@@ -89,7 +82,7 @@ ESP-IDF 中的子模块采用相对路径（[详见 .gitmodules 文件](.gitmodu
 
 ## 观察串口输入
 
-`idf.py monitor` 会调用 [esp-idf-monitor 工具](https://github.com/espressif/esp-idf-monitor)来显示乐鑫芯片的串口输出。esp-idf-monitor 还包含一系列的功能来解析程序崩溃后的输出结果并与设备进行交互。更多详细内容，请参阅[文档](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
+`idf.py monitor` 会调用 [idf_monitor 工具](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html)来显示乐鑫芯片的串口输出。`idf_monitor` 还包含一系列的功能来解析程序崩溃后的输出结果并与设备进行交互。更多详细内容，请参阅[文档](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
 
 输入 `Ctrl-]` 可退出监视器。
 

SECURITY.md

@@ -1,9 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Please refer to https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html#support-periods for more details on ESP-IDF supported versions and support period policy.
-
-## Reporting a Vulnerability
-
-If you think you have found a security vulnerability in Espressif solutions (including ESP-IDF), then please send an email to our Bug Bounty team at bugbounty@espressif.com. Please do **NOT** create a public GitHub issue.

SUPPORT_POLICY.md

@@ -5,9 +5,12 @@ Support Period Policy
 
 * [中文版](./SUPPORT_POLICY_CN.md)
 
-Each ESP-IDF major and minor release (V4.1, V4.2, etc) is supported for 30 months after the initial stable release date.
+Each ESP-IDF major and minor release (V4.1, V4.2, etc) is supported for
+30 months after the initial stable release date.
 
-Supported means that the ESP-IDF team will continue to apply bug fixes, security fixes, etc to the release branch on GitHub, and periodically make new bugfix releases as needed.
+Supported means that the ESP-IDF team will continue to apply bug fixes,
+security fixes, etc to the release branch on GitHub, and periodically
+make new bugfix releases as needed.
 
 Support period is divided into "Service" and "Maintenance" period:
 
@@ -16,36 +19,58 @@ Support period is divided into "Service" and "Maintenance" period:
 | Service     | 12 months    | Yes                                   |
 | Maintenance | 18 months    | No                                    |
 
-During the Service period, bugfixes releases are more frequent. In some cases, support for new features may be added during the Service period (this is reserved for features which are needed to meet particular regulatory requirements or standards for new products, and which carry a very low risk of introducing regressions.)
+During the Service period, bugfixes releases are more frequent. In some cases,
+support for new features may be added during the Service period (this is
+reserved for features which are needed to meet particular regulatory
+requirements or standards for new products, and which carry a very low risk of
+introducing regressions.)
 
-During the Maintenance period, the version is still supported but only bugfixes for high severity issues or security issues will be applied.
+During the Maintenance period, the version is still supported but only bugfixes
+for high severity issues or security issues will be applied.
 
 Using an “In Service” version is recommended when starting a new project.
 
-Users are encouraged to upgrade all projects to a newer ESP-IDF release before the support period finishes and the release becomes End of Life (EOL). It is our policy to not continue fixing bugs in End of Life releases.
+Users are encouraged to upgrade all projects to a newer ESP-IDF release before
+the support period finishes and the release becomes End of Life (EOL). It is our
+policy to not continue fixing bugs in End of Life releases.
 
-Pre-release versions (betas, previews, `-rc` and `-dev` versions, etc) are not covered by any support period. Sometimes a particular feature is marked as "Preview" in a release, which means it is also not covered by the support period.
+Pre-release versions (betas, previews, `-rc` and `-dev` versions, etc)
+are not covered by any support period. Sometimes a particular feature is
+marked as "Preview" in a release, which means it is also not covered
+by the support period.
 
-ESP-IDF should be used in an up-to-date software environment. The operating system and other third-party tools should be supported by their maintainers. ESP-IDF cannot keep compatibility with unsupported third-party tools.
+ESP-IDF should be used in an up-to-date software environment. The operating system
+and other third-party tools should be supported by their maintainers.
+ESP-IDF cannot keep compatibility with unsupported third-party tools.
 
-The ESP-IDF Programming Guide has information about the [different versions of ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/latest/versions.html) (major, minor, bugfix, etc).
+The ESP-IDF Programming Guide has information about the
+[different versions of ESP-IDF](https://docs.espressif.com/projects/esp-idf/en/latest/versions.html)
+(major, minor, bugfix, etc).
 
 Example
 -------
 
-ESP-IDF V3.3 was released in September 2019. It was supported for 30 months until February 2022.
+ESP-IDF V3.3 was released in September 2019. It will be supported for 30 months
+until February 2022.
 
 - The first V3.3 release was `v3.3` in September 2019.
-- The ESP-IDF team continues to backport bug fixes, security fixes, etc to the release branch `release/v3.3`.
-- Periodically stable bugfix releases are created from the release branch. For example `v3.3.1`, `v3.3.2`, etc. Users are encouraged to always update to the latest bugfix release.
-- V3.3 bugfix releases continue until February 2022, when all V3.3.x releases become End of Life.
+- The ESP-IDF team continues to backport bug fixes, security fixes,
+  etc to the release branch `release/v3.3`.
+- Periodically stable bugfix releases are created from the release
+  branch. For example `v3.3.1`, `v3.3.2`, etc. Users are encouraged to
+  always update to the latest bugfix release.
+- V3.3 bugfix releases continue until February 2022, when all V3.3.x
+  releases become End of Life.
 
 Existing Releases
 -----------------
 
-ESP-IDF release V4.1 and all newer releases will follow this support period policy. The support period for each release will be announced when the release is made.
+ESP-IDF release V4.1 and all newer releases will follow this support period
+policy. The support period for each release will be announced when the release
+is made.
 
-For releases made before the current support period policy was announced, the original support periods apply:
+For releases made before the current support period policy was announced, the
+original support periods apply:
 
 * ESP-IDF V4.0.x will be supported until October 2021
 * ESP-IDF V3.3.x will be supported until February 2022
@@ -54,5 +79,8 @@ For releases made before the current support period policy was announced, the or
 Policy History
 --------------
 
-* September 2019. This policy splits ESP-IDF releases into Standard and Long Term Support.
-* July 2020. All releases from now will have the same support period, which is equal to the previous Long Term Support period. Added “In Service” period, during which versions will receive more updates.
+* September 2019. This policy split ESP-IDF releases into Standard and Long Term
+  Support.
+* July 2020. All releases from now will have the same support period, which is
+  equal to the previous Long Term Support period. Added “In Service” period,
+  during which versions will receive more updates.

SUPPORT_POLICY_CN.md

@@ -3,8 +3,6 @@
 支持期限政策
 =====================
 
-* [英文版](./SUPPORT_POLICY.md)
-
 ESP-IDF 的每个主要版本和次要版本（如 V4.1、V4.2 等）自其首次稳定版本发布之日起将支持 30 个月。
 
 支持意味着 ESP-IDF 团队将会对 GitHub 上的发布分支继续进行 bug 修复、安全修补等，并根据需求定期发布新的 bugfix 版本。
@@ -20,14 +18,12 @@ ESP-IDF 的每个主要版本和次要版本（如 V4.1、V4.2 等）自其首
 
 在版本的维护周期内，版本仍然会继续支持，但仅会对严重问题或安全问题进行 bug 修复。
 
-建议在开始新项目的时候使用处于服务周期的版本。
+建议在开始新项目的时候使用处于服务周期的版本。 
 
 在某一版本支持期限结束，停止更新维护 (EOL) 前，建议用户升级所有项目至较新的 ESP-IDF 版本。根据《支持期限政策》，我们将停止对 EOL 版本进行 bug 修复。
 
 《支持期限政策》不适用于预发布版本（包括 beta、preview、-rc 和 -dev 版本等）。有时，在发布的版本中存在被标记为 "Preview" 的特定功能，则该功能也不在支持期限内。
 
-请确保在最新的软件环境中使用 ESP-IDF。操作系统和其他第三方工具应得到其维护者的支持。ESP-IDF 无法兼容不受支持的第三方工具。
-
 有关 [ESP-IDF 不同版本](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/versions.html)（主要版本、次要版本、bugfix 版本等）信息，可参阅《ESP-IDF 编程指南》。
 
 示例
@@ -49,10 +45,11 @@ ESP-IDF V4.1 及所有后续更新版本都将遵守该《支持期限政策》
 
 * ESP-IDF V4.0.x 将支持至 2021 年 10 月。
 * ESP-IDF V3.3.x 将支持至 2022 年 2 月。
-* ESP-IDF v3.3 之前的版本已经停止支持。
-
+* ESP-IDF V3.1.x 和 V3.2.x 都将在 2020 年 10 月停止支持。
+* ESP-IDF v3.1.x 之前的版本已经停止支持。
+  
 政策历史
 --------------
 
-* 2019 年 9 月。该政策将 ESP-IDF 版本发布分为标准支持版本和长期支持版本。
-* 2020 年 7 月。从现在开始，所有发布的版本都将有相同的支持周期，即之前的长期支持周期。新增了”服务周期“，期间版本的更新将较为频繁。
+* 2019 年 9 月。该政策将 ESP-IDF 版本发布分为标准支持版本和长期支持版本。 
+* 2020 年 7 月。从现在开始，所有发布的版本都将有相同的支持周期，等同于之前的长期支持周期。新增了”服务周期“，期间版本的更新将较为频繁。

components/README.md

@@ -1,4 +1,3 @@
-
 # Core Components
 
 ## Overview
@@ -43,7 +42,7 @@ This can also contain files provided by the architecture vendor.
 Example:
 
 - `xt_set_exception_handler`
-- `rv_utils_intr_enable`
+- `riscv_global_interrupts_enable`
 - `ERI_PERFMON_MAX`
 
 #### `esp_common`
@@ -151,10 +150,11 @@ The current implementation in `esp_system` can then just register the interrupt
 #### `esp_mac.h`, `esp_chip_info.h`, `esp_random.h` (`esp_hw_support`)
 
 The functions in these headers used to be in `esp_system.h`, but have been split-off.
+However, to maintain backward compatibility, `esp_system.h` includes these headers.
 
 The remaining functions in `esp_system.h` are those that deal with system behavior, such
 as `esp_register_shutdown_handler`, or are proxy for other system components's APIs such as
 `esp_get_free_heap_size`.
 
 The functions split-off from `esp_system.h` are much more hardware manipulation oriented such as:
-`esp_read_mac`, `esp_random` and `esp_chip_info`.
+`esp_read_mac`, `esp_random` and `esp_chip_info`.

components/app_trace/CMakeLists.txt

@@ -1,16 +1,8 @@
 set(srcs
     "app_trace.c"
     "app_trace_util.c"
-    "host_file_io.c")
-
-if(CONFIG_APPTRACE_GCOV_ENABLE)
-    if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-        list(APPEND srcs
-            "gcov/gcov_rtio.c")
-    else()
-        fail_at_build_time(app_trace "Only GNU compiler can link with Gcov library")
-    endif()
-endif()
+    "host_file_io.c"
+    "gcov/gcov_rtio.c")
 
 set(include_dirs "include")
 
@@ -29,19 +21,17 @@ if(CONFIG_APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE)
             "port/riscv/port.c")
     endif()
 endif()
-list(APPEND srcs
-    "port/port_uart.c")
 
 if(CONFIG_APPTRACE_SV_ENABLE)
     list(APPEND include_dirs
         sys_view/Config
         sys_view/SEGGER
-        sys_view/Sample/FreeRTOSV10.4)
+        sys_view/Sample/OS)
 
     list(APPEND srcs
         "sys_view/SEGGER/SEGGER_SYSVIEW.c"
-        "sys_view/Sample/FreeRTOSV10.4/Config/esp/SEGGER_SYSVIEW_Config_FreeRTOS.c"
-        "sys_view/Sample/FreeRTOSV10.4/SEGGER_SYSVIEW_FreeRTOS.c"
+        "sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c"
+        "sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c"
         "sys_view/esp/SEGGER_RTT_esp.c"
         "sys_view/ext/heap_trace_module.c"
         "sys_view/ext/logging.c")
@@ -57,64 +47,13 @@ endif()
 idf_component_register(SRCS "${srcs}"
                        INCLUDE_DIRS "${include_dirs}"
                        PRIV_INCLUDE_DIRS "${priv_include_dirs}"
-                       # Requires "driver" for GPTimer in "SEGGER_SYSVIEW_Config_FreeRTOS.c"
-                       PRIV_REQUIRES soc driver
-                       REQUIRES esp_timer
+                       PRIV_REQUIRES soc esp_ipc
                        LDFRAGMENTS linker.lf)
 
+# disable --coverage for this component, as it is used as transport
+# for gcov
+target_compile_options(${COMPONENT_LIB} PRIVATE "-fno-profile-arcs" "-fno-test-coverage")
+
 # Force app_trace to also appear later than gcov in link line
 idf_component_get_property(app_trace app_trace COMPONENT_LIB)
-
-if(CONFIG_APPTRACE_GCOV_ENABLE)
-    # The original Gcov library from toolchain will be objcopy with symbols redefinitions (see file gcov/io_sym.map).
-    # This needs because ESP has no file-system onboard, and redefined functions solves this problem and transmits
-    # output file to host PC.
-
-    # Set a name for Gcov library
-    set(GCOV_LIB libgcov_rtio)
-
-    # Set include direcrory of Gcov internal headers
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -print-file-name=plugin
-                    OUTPUT_VARIABLE gcc_plugin_dir
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
-    set_source_files_properties(gcov/gcov_rtio.c
-                                PROPERTIES COMPILE_FLAGS "-I${gcc_plugin_dir}/include")
-
-    # Copy libgcov.a with symbols redefinition
-    find_library(GCOV_LIBRARY_PATH gcov ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
-    add_custom_command(OUTPUT ${GCOV_LIB}.a
-                       COMMAND ${_CMAKE_TOOLCHAIN_PREFIX}objcopy
-                               --redefine-syms ${CMAKE_CURRENT_LIST_DIR}/gcov/io_sym.map
-                               ${GCOV_LIBRARY_PATH} ${GCOV_LIB}.a
-                       MAIN_DEPENDENCY ${GCOV_LIBRARY_PATH}
-                       VERBATIM)
-    add_custom_target(${GCOV_LIB}_target DEPENDS ${GCOV_LIB}.a)
-    add_library(${GCOV_LIB} STATIC IMPORTED)
-    set_target_properties(${GCOV_LIB}
-                          PROPERTIES
-                          IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${GCOV_LIB}.a)
-    add_dependencies(${GCOV_LIB} ${GCOV_LIB}_target)
-    add_dependencies(${COMPONENT_LIB} ${GCOV_LIB})
-
-    # disable --coverage for this component, as it is used as transport for gcov
-    target_compile_options(${COMPONENT_LIB} PRIVATE "-fno-profile-arcs" "-fno-test-coverage")
-    target_link_options(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=__gcov_init")
-
-    target_link_libraries(${COMPONENT_LIB} INTERFACE ${GCOV_LIB} $<TARGET_FILE:${app_trace}> c)
-else()
-    target_link_libraries(${COMPONENT_LIB} INTERFACE $<TARGET_FILE:${app_trace}> c)
-endif()
-
-# This function adds a dependency on the given component if the component is included into the build.
-function(maybe_add_component component_name)
-    idf_build_get_property(components BUILD_COMPONENTS)
-    if(${component_name} IN_LIST components)
-        idf_component_get_property(lib_name ${component_name} COMPONENT_LIB)
-        target_link_libraries(${COMPONENT_LIB} PUBLIC ${lib_name})
-    endif()
-endfunction()
-
-if(CONFIG_APPTRACE_DEST_UART0 OR CONFIG_APPTRACE_DEST_UART1 OR CONFIG_APPTRACE_DEST_UART2)
-    maybe_add_component(driver)
-endif()
+target_link_libraries(${COMPONENT_LIB} INTERFACE $<TARGET_FILE:${app_trace}> gcov $<TARGET_FILE:${app_trace}> c)

components/app_trace/Kconfig

@@ -1,7 +1,7 @@
 menu "Application Level Tracing"
 
-    choice APPTRACE_DESTINATION1
-        prompt "Data Destination 1"
+    choice APPTRACE_DESTINATION
+        prompt "Data Destination"
         default APPTRACE_DEST_NONE
         help
             Select destination for application trace: JTAG or none (to disable).
@@ -16,124 +16,6 @@ menu "Application Level Tracing"
             bool "None"
     endchoice
 
-    config APPTRACE_DEST_UART
-        bool
-
-    config APPTRACE_DEST_UART_NOUSB
-        bool
-
-    choice APPTRACE_DESTINATION2
-        prompt "Data Destination 2"
-        default APPTRACE_DEST_UART_NONE
-        help
-            Select destination for application trace: UART(XX) or none (to disable).
-
-        config APPTRACE_DEST_UART0
-            bool "UART0"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            select APPTRACE_DEST_UART_NOUSB
-            depends on (ESP_CONSOLE_UART_NUM !=0)
-
-        config APPTRACE_DEST_UART1
-            bool "UART1"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            select APPTRACE_DEST_UART_NOUSB
-            depends on (ESP_CONSOLE_UART_NUM !=1)
-
-        config APPTRACE_DEST_UART2
-            bool "UART2"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            select APPTRACE_DEST_UART_NOUSB
-            depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_NUM > 2)
-
-        config APPTRACE_DEST_USB_CDC
-            bool "USB_CDC"
-            select APPTRACE_ENABLE
-            select APPTRACE_DEST_UART
-            depends on !ESP_CONSOLE_USB_CDC && (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3) && !USB_ENABLED
-
-        config APPTRACE_DEST_UART_NONE
-            bool "None"
-    endchoice
-
-    config APPTRACE_UART_TX_GPIO
-        int "UART TX on GPIO#"
-        depends on APPTRACE_DEST_UART_NOUSB
-        range 0 46
-        default 12 if IDF_TARGET_ESP32
-        default 12 if IDF_TARGET_ESP32C3
-        default 12
-        help
-            This GPIO is used for UART TX pin.
-
-    config APPTRACE_UART_RX_GPIO
-        int "UART RX on GPIO#"
-        depends on APPTRACE_DEST_UART_NOUSB
-        range 0 46
-        default 13 if IDF_TARGET_ESP32
-        default 13 if IDF_TARGET_ESP32C3
-        default 13
-        help
-            This GPIO is used for UART RX pin.
-
-    config APPTRACE_UART_BAUDRATE
-        int
-        prompt "UART baud rate" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 1000000
-        range 1200 8000000
-        range 1200 1000000
-        help
-            This baud rate is used for UART.
-
-            The app's maximum baud rate depends on the UART clock source. If Power Management is disabled,
-            the UART clock source is the APB clock and all baud rates in the available range will be sufficiently
-            accurate. If Power Management is enabled, REF_TICK clock source is used so the baud rate is divided
-            from 1MHz. Baud rates above 1Mbps are not possible and values between 500Kbps and 1Mbps may not be
-            accurate.
-
-    config APPTRACE_UART_RX_BUFF_SIZE
-        int
-        prompt "UART RX ring buffer size" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 128
-        range 64 32768
-        help
-            Size of the UART input ring buffer.
-            This size related to the baudrate, system tick frequency and amount of data to transfer.
-            The data placed to this buffer before sent out to the interface.
-
-    config APPTRACE_UART_TX_BUFF_SIZE
-        int
-        prompt "UART TX ring buffer size" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 4096
-        range 2048 32768
-        help
-            Size of the UART output ring buffer.
-            This size related to the baudrate, system tick frequency and amount of data to transfer.
-
-    config APPTRACE_UART_TX_MSG_SIZE
-        int
-        prompt "UART TX message size" if APPTRACE_DEST_UART
-        depends on APPTRACE_DEST_UART
-        default 128
-        range 64 32768
-        help
-            Maximum size of the single message to transfer.
-
-    config APPTRACE_UART_TASK_PRIO
-        int
-        prompt "UART Task Priority" if APPTRACE_DEST_UART
-        default 1
-        range 1 32
-        help
-            UART task priority. In case of high events rate,
-            this parameter could be changed up to (configMAX_PRIORITIES-1).
-
     config APPTRACE_DEST_TRAX
         bool
         depends on IDF_TARGET_ARCH_XTENSA && !ESP32_TRAX && !ESP32S2_TRAX && !ESP32S3_TRAX
@@ -208,52 +90,11 @@ menu "Application Level Tracing"
             help
                 Enables supporrt for SEGGER SystemView tracing functionality.
 
-        choice APPTRACE_SV_DEST
-            prompt "SystemView destination"
-            depends on APPTRACE_SV_ENABLE
-            default APPTRACE_SV_DEST_JTAG
-            help
-                SystemView witt transfer data trough defined interface.
-
-            config APPTRACE_SV_DEST_JTAG
-                bool "Data destination JTAG"
-                depends on  !PM_ENABLE && !APPTRACE_DEST_NONE
-                help
-                    Send SEGGER SystemView events through JTAG interface.
-
-            config APPTRACE_SV_DEST_UART
-                bool "Data destination UART"
-                depends on APPTRACE_DEST_UART
-                help
-                    Send SEGGER SystemView events through UART interface.
-
-        endchoice
-
-        choice APPTRACE_SV_CPU
-            prompt "CPU to trace"
-            depends on APPTRACE_SV_DEST_UART && !FREERTOS_UNICORE
-            default APPTRACE_SV_DEST_CPU_0
-            help
-                Define the CPU to trace by SystemView.
-
-            config APPTRACE_SV_DEST_CPU_0
-                bool "CPU0"
-                help
-                    Send SEGGER SystemView events for Pro CPU.
-
-            config APPTRACE_SV_DEST_CPU_1
-                bool "CPU1"
-                help
-                    Send SEGGER SystemView events for App CPU.
-
-        endchoice
-
-
         choice APPTRACE_SV_TS_SOURCE
             prompt "Timer to use as timestamp source"
             depends on APPTRACE_SV_ENABLE
             default APPTRACE_SV_TS_SOURCE_CCOUNT if FREERTOS_UNICORE && !PM_ENABLE && !IDF_TARGET_ESP32C3
-            default APPTRACE_SV_TS_SOURCE_GPTIMER if !FREERTOS_UNICORE && !PM_ENABLE && !IDF_TARGET_ESP32C3
+            default APPTRACE_SV_TS_SOURCE_TIMER_00 if !FREERTOS_UNICORE && !PM_ENABLE && !IDF_TARGET_ESP32C3
             default APPTRACE_SV_TS_SOURCE_ESP_TIMER if PM_ENABLE || IDF_TARGET_ESP32C3
             help
                 SystemView needs to use a hardware timer as the source of timestamps
@@ -263,8 +104,20 @@ menu "Application Level Tracing"
                 bool "CPU cycle counter (CCOUNT)"
                 depends on FREERTOS_UNICORE && !PM_ENABLE && !IDF_TARGET_ESP32C3
 
-            config APPTRACE_SV_TS_SOURCE_GPTIMER
-                bool "General Purpose Timer (Timer Group)"
+            config APPTRACE_SV_TS_SOURCE_TIMER_00
+                bool "Timer 0, Group 0"
+                depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
+
+            config APPTRACE_SV_TS_SOURCE_TIMER_01
+                bool "Timer 1, Group 0"
+                depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
+
+            config APPTRACE_SV_TS_SOURCE_TIMER_10
+                bool "Timer 0, Group 1"
+                depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
+
+            config APPTRACE_SV_TS_SOURCE_TIMER_11
+                bool "Timer 1, Group 1"
                 depends on !PM_ENABLE && !IDF_TARGET_ESP32C3
 
             config APPTRACE_SV_TS_SOURCE_ESP_TIMER

components/app_trace/app_trace.c

@@ -5,38 +5,24 @@
  */
 
 #include <string.h>
-#include "esp_cpu.h"
 #include "esp_log.h"
 #include "esp_app_trace.h"
 #include "esp_app_trace_port.h"
-#include "esp_private/startup_internal.h"
 
-#ifdef CONFIG_APPTRACE_DEST_UART0
-#define ESP_APPTRACE_DEST_UART_NUM 0
-#elif CONFIG_APPTRACE_DEST_UART1
-#define ESP_APPTRACE_DEST_UART_NUM 1
-#elif CONFIG_APPTRACE_DEST_UART2
-#define ESP_APPTRACE_DEST_UART_NUM 2
-#elif CONFIG_APPTRACE_DEST_USB_CDC
-#define ESP_APPTRACE_DEST_UART_NUM 10
-#else
-#define ESP_APPTRACE_DEST_UART_NUM 0
-#endif
+#define ESP_APPTRACE_MAX_VPRINTF_ARGS           256
+#define ESP_APPTRACE_HOST_BUF_SIZE              256
 
-#define ESP_APPTRACE_MAX_VPRINTF_ARGS 256
-#define ESP_APPTRACE_HOST_BUF_SIZE 256
-
-#define ESP_APPTRACE_PRINT_LOCK 0
+#define ESP_APPTRACE_PRINT_LOCK                 0
 
 const static char *TAG = "esp_apptrace";
 
 /** tracing module internal data */
 typedef struct {
-    esp_apptrace_hw_t *hw;
-    void               *hw_data;
+    esp_apptrace_hw_t * hw;
+    void *              hw_data;
 } esp_apptrace_channel_t;
 
-static esp_apptrace_channel_t   s_trace_channels[ESP_APPTRACE_DEST_MAX];
+static esp_apptrace_channel_t   s_trace_channels[ESP_APPTRACE_DEST_NUM];
 static bool s_inited;
 
 esp_err_t esp_apptrace_init(void)
@@ -46,7 +32,7 @@ esp_err_t esp_apptrace_init(void)
     void *hw_data = NULL;
 
     // 'esp_apptrace_init()' is called on every core, so ensure to do main initialization only once
-    if (esp_cpu_get_core_id() == 0) {
+    if (cpu_hal_get_core_id() == 0) {
         memset(&s_trace_channels, 0, sizeof(s_trace_channels));
         hw = esp_apptrace_jtag_hw_get(&hw_data);
         ESP_APPTRACE_LOGD("HW interface %p", hw);
@@ -54,16 +40,16 @@ esp_err_t esp_apptrace_init(void)
             s_trace_channels[ESP_APPTRACE_DEST_JTAG].hw = hw;
             s_trace_channels[ESP_APPTRACE_DEST_JTAG].hw_data = hw_data;
         }
-        hw = esp_apptrace_uart_hw_get(ESP_APPTRACE_DEST_UART_NUM, &hw_data);
+        hw = esp_apptrace_uart_hw_get(0, &hw_data);
         if (hw != NULL) {
-            s_trace_channels[ESP_APPTRACE_DEST_UART].hw = hw;
-            s_trace_channels[ESP_APPTRACE_DEST_UART].hw_data = hw_data;
+            s_trace_channels[ESP_APPTRACE_DEST_UART0].hw = hw;
+            s_trace_channels[ESP_APPTRACE_DEST_UART0].hw_data = hw_data;
         }
         s_inited = true;
     }
 
     // esp_apptrace_init() is called on every core, so initialize trace channel on every core
-    for (int i = 0; i < sizeof(s_trace_channels) / sizeof(s_trace_channels[0]); i++) {
+    for (int i = 0; i < sizeof(s_trace_channels)/sizeof(s_trace_channels[0]); i++) {
         esp_apptrace_channel_t *ch = &s_trace_channels[i];
         if (ch->hw) {
             res = ch->hw->init(ch->hw_data);
@@ -77,11 +63,6 @@ esp_err_t esp_apptrace_init(void)
     return ESP_OK;
 }
 
-ESP_SYSTEM_INIT_FN(esp_apptrace_init, ESP_SYSTEM_INIT_ALL_CORES, 115)
-{
-    return esp_apptrace_init();
-}
-
 void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size)
 {
     esp_apptrace_channel_t *ch;
@@ -92,21 +73,15 @@ void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size)
     // currently down buffer is supported for JTAG interface only
     // TODO: one more argument should be added to this function to specify HW inteface: JTAG, UART0 etc
     ch = &s_trace_channels[ESP_APPTRACE_DEST_JTAG];
-    if (ch->hw != NULL) {
-        if (ch->hw->down_buffer_config != NULL) {
-            ch->hw->down_buffer_config(ch->hw_data, buf, size);
-        }
-    } else {
-        ESP_APPTRACE_LOGD("Trace destination for JTAG not supported!");
+    if (ch->hw == NULL) {
+        ESP_APPTRACE_LOGE("Trace destination not supported!");
+        return;
     }
-    ch = &s_trace_channels[ESP_APPTRACE_DEST_UART];
-    if (ch->hw != NULL) {
-        if (ch->hw->down_buffer_config != NULL) {
-            ch->hw->down_buffer_config(ch->hw_data, buf, size);
-        }
-    } else {
-        ESP_APPTRACE_LOGD("Trace destination for UART not supported!");
+    if (ch->hw->down_buffer_config == NULL) {
+        return;
     }
+
+    ch->hw->down_buffer_config(ch->hw_data, buf, size);
 }
 
 uint8_t *esp_apptrace_down_buffer_get(esp_apptrace_dest_t dest, uint32_t *size, uint32_t user_tmo)
@@ -194,7 +169,7 @@ esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *buf, uint32_t *size,
     esp_apptrace_tmo_init(&tmo, user_tmo);
     uint32_t act_sz = *size;
     *size = 0;
-    uint8_t *ptr = ch->hw->get_down_buffer(ch->hw_data, &act_sz, &tmo);
+    uint8_t * ptr = ch->hw->get_down_buffer(ch->hw_data, &act_sz, &tmo);
     if (ptr && act_sz > 0) {
         ESP_APPTRACE_LOGD("Read %d bytes from host", act_sz);
         memcpy(buf, ptr, act_sz);
@@ -444,10 +419,3 @@ bool esp_apptrace_host_is_connected(esp_apptrace_dest_t dest)
 
     return ch->hw->host_is_connected(ch->hw_data);
 }
-
-#if !CONFIG_APPTRACE_DEST_JTAG
-esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
-{
-    return NULL;
-}
-#endif

components/app_trace/app_trace_membufs_proto.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,7 +8,6 @@
 #include <string.h>
 #include "sdkconfig.h"
 #include "esp_log.h"
-#include "esp_cpu.h"
 #include "esp_app_trace_membufs_proto.h"
 
 /** Trace data header. Every user data chunk is prepended with this header.
@@ -260,8 +259,8 @@ static inline uint8_t *esp_apptrace_membufs_wait4buf(esp_apptrace_membufs_proto_
 
 static inline uint8_t *esp_apptrace_membufs_pkt_start(uint8_t *ptr, uint16_t size)
 {
-    // it is safe to use esp_cpu_get_core_id() in macro call because arg is used only once inside it
-    ((esp_tracedata_hdr_t *)ptr)->block_sz = ESP_APPTRACE_USR_BLOCK_CORE(esp_cpu_get_core_id()) | size;
+    // it is safe to use cpu_hal_get_core_id() in macro call because arg is used only once inside it
+    ((esp_tracedata_hdr_t *)ptr)->block_sz = ESP_APPTRACE_USR_BLOCK_CORE(cpu_hal_get_core_id()) | size;
     ((esp_tracedata_hdr_t *)ptr)->wr_sz = 0;
     return ptr + sizeof(esp_tracedata_hdr_t);
 }

components/app_trace/app_trace_util.c

@@ -57,26 +57,35 @@ esp_err_t esp_apptrace_tmo_check(esp_apptrace_tmo_t *tmo)
 
 esp_err_t esp_apptrace_lock_take(esp_apptrace_lock_t *lock, esp_apptrace_tmo_t *tmo)
 {
-    esp_err_t ret;
+    int res;
 
     while (1) {
-        // Try enter a critical section (i.e., take the spinlock) with 0 timeout
-        if (portTRY_ENTER_CRITICAL(&(lock->mux), 0) == pdTRUE) {
+        //Todo: Replace the current locking mechanism and int_state with portTRY_ENTER_CRITICAL() instead.
+        // do not overwrite lock->int_state before we actually acquired the mux
+        unsigned int_state = portSET_INTERRUPT_MASK_FROM_ISR();
+        bool success = vPortCPUAcquireMutexTimeout(&lock->mux, 0);
+        if (success) {
+            lock->int_state = int_state;
             return ESP_OK;
         }
-        // Failed to enter the critical section, so interrupts are still enabled. Check if we have timed out.
-        ret = esp_apptrace_tmo_check(tmo);
-        if (ret != ESP_OK) {
-            break;  // Timed out, exit now
+        portCLEAR_INTERRUPT_MASK_FROM_ISR(int_state);
+        // we can be preempted from this place till the next call (above) to portSET_INTERRUPT_MASK_FROM_ISR()
+        res = esp_apptrace_tmo_check(tmo);
+        if (res != ESP_OK) {
+            break;
         }
-        // Haven't timed out, try again
     }
-    return ret;
+    return res;
 }
 
 esp_err_t esp_apptrace_lock_give(esp_apptrace_lock_t *lock)
 {
-    portEXIT_CRITICAL(&(lock->mux));
+    // save lock's irq state value for this CPU
+    unsigned int_state = lock->int_state;
+    // after call to the following func we can not be sure that lock->int_state
+    // is not overwritten by other CPU who has acquired the mux just after we released it. See esp_apptrace_lock_take().
+    vPortCPUReleaseMutex(&lock->mux);
+    portCLEAR_INTERRUPT_MASK_FROM_ISR(int_state);
     return ESP_OK;
 }
 

components/app_trace/component.mk

@@ -0,0 +1,39 @@
+#
+# Component Makefile
+#
+
+COMPONENT_SRCDIRS := .
+
+ifdef CONFIG_APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE
+COMPONENT_SRCDIRS += port/xtensa
+endif
+
+COMPONENT_ADD_INCLUDEDIRS = include
+
+COMPONENT_PRIV_INCLUDEDIRS = private_include \
+	port/include
+
+COMPONENT_ADD_LDFLAGS = -lapp_trace
+
+# do not produce gcov info for this module, it is used as transport for gcov
+CFLAGS := $(subst --coverage,,$(CFLAGS))
+
+ifdef CONFIG_APPTRACE_SV_ENABLE
+
+COMPONENT_ADD_INCLUDEDIRS += \
+	sys_view/Config \
+	sys_view/SEGGER \
+	sys_view/Sample/OS
+
+COMPONENT_SRCDIRS += \
+	gcov \
+	sys_view/SEGGER \
+	sys_view/Sample/OS \
+	sys_view/Sample/Config \
+	sys_view/esp \
+	sys_view/ext
+else
+COMPONENT_SRCDIRS += gcov
+endif
+
+COMPONENT_ADD_LDFRAGMENTS += linker.lf

components/app_trace/gcov/gcov_rtio.c

@@ -11,6 +11,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
+#include "soc/cpu.h"
 #include "soc/timer_periph.h"
 #include "esp_app_trace.h"
 #include "esp_freertos_hooks.h"
@@ -103,7 +104,7 @@ static int esp_dbg_stub_gcov_entry(void)
     return ESP_OK;
 }
 
-void gcov_rtio_init(void)
+int gcov_rtio_atexit(void (*function)(void) __attribute__ ((unused)))
 {
     uint32_t capabilities = 0;
     ESP_EARLY_LOGV(TAG, "%s", __FUNCTION__);
@@ -112,6 +113,7 @@ void gcov_rtio_init(void)
         esp_dbg_stub_entry_set(ESP_DBG_STUB_ENTRY_CAPABILITIES, capabilities | ESP_DBG_STUB_CAP_GCOV_TASK);
     }
     esp_register_freertos_tick_hook(gcov_create_task_tick_hook);
+    return ESP_OK;
 }
 
 void esp_gcov_dump(void)
@@ -171,19 +173,4 @@ long gcov_rtio_ftell(void *stream)
     ESP_EARLY_LOGV(TAG, "%s(%p) = %ld", __FUNCTION__, stream, ret);
     return ret;
 }
-
-void gcov_rtio_setbuf(void *arg1 __attribute__ ((unused)), void *arg2 __attribute__ ((unused)))
-{
-    return;
-}
-
-/* Wrappers for Gcov functions */
-
-extern void __real___gcov_init(void *info);
-void __wrap___gcov_init(void *info)
-{
-    __real___gcov_init(info);
-    gcov_rtio_init();
-}
-
 #endif

components/app_trace/gcov/io_sym.map

@@ -1,7 +0,0 @@
-fopen          gcov_rtio_fopen
-fclose         gcov_rtio_fclose
-fwrite         gcov_rtio_fwrite
-fread          gcov_rtio_fread
-fseek          gcov_rtio_fseek
-ftell          gcov_rtio_ftell
-setbuf         gcov_rtio_setbuf

components/app_trace/heap_trace_tohost.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,7 +8,7 @@
 #define HEAP_TRACE_SRCFILE /* don't warn on inclusion here */
 #include "esp_heap_trace.h"
 #undef HEAP_TRACE_SRCFILE
-#include "esp_heap_caps.h"
+
 #if CONFIG_APPTRACE_SV_ENABLE
 #include "esp_app_trace.h"
 #include "esp_sysview_trace.h"
@@ -69,23 +69,13 @@ esp_err_t heap_trace_get(size_t index, heap_trace_record_t *record)
     return ESP_ERR_NOT_SUPPORTED;
 }
 
-esp_err_t heap_trace_summary(heap_trace_summary_t *summary)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-
 void heap_trace_dump(void)
 {
     return;
 }
 
-void heap_trace_dump_caps(__attribute__((unused)) const uint32_t caps)
-{
-    return;
-}
-
 /* Add a new allocation to the heap trace records */
-static HEAP_IRAM_ATTR void record_allocation(const heap_trace_record_t *record)
+static IRAM_ATTR void record_allocation(const heap_trace_record_t *record)
 {
     if (!s_tracing) {
         return;
@@ -100,7 +90,7 @@ static HEAP_IRAM_ATTR void record_allocation(const heap_trace_record_t *record)
    For HEAP_TRACE_ALL, this means filling in the freed_by pointer.
    For HEAP_TRACE_LEAKS, this means removing the record from the log.
 */
-static HEAP_IRAM_ATTR void record_free(void *p, void **callers)
+static IRAM_ATTR void record_free(void *p, void **callers)
 {
     if (!s_tracing) {
         return;

components/app_trace/host_file_io.c

@@ -229,7 +229,7 @@ size_t esp_apptrace_fwrite(esp_apptrace_dest_t dest, const void *ptr, size_t siz
         return 0;
     }
 
-    return resp/size; // return the number of items written
+    return resp;
 }
 
 static void esp_apptrace_fread_args_prepare(uint8_t *buf, void *priv)
@@ -266,16 +266,14 @@ size_t esp_apptrace_fread(esp_apptrace_dest_t dest, void *ptr, size_t size, size
         ESP_EARLY_LOGE(TAG, "Failed to read response (%d)!", ret);
         return 0;
     }
-    if (resp == 0) {
-        return 0;
+    if (resp > 0) {
+        ret = esp_apptrace_file_rsp_recv(dest, ptr, resp);
+        if (ret != ESP_OK) {
+            ESP_EARLY_LOGE(TAG, "Failed to read file data (%d)!", ret);
+            return 0;
+        }
     }
-
-    ret = esp_apptrace_file_rsp_recv(dest, ptr, resp);
-    if (ret != ESP_OK) {
-        ESP_EARLY_LOGE(TAG, "Failed to read file data (%d)!", ret);
-        return 0;
-    }
-    return resp/size; // return the number of items read
+    return resp;
 }
 
 static void esp_apptrace_fseek_args_prepare(uint8_t *buf, void *priv)

components/app_trace/include/esp_app_trace.h

@@ -20,8 +20,8 @@ extern "C" {
 typedef enum {
     ESP_APPTRACE_DEST_JTAG = 1,                         ///< JTAG destination
     ESP_APPTRACE_DEST_TRAX = ESP_APPTRACE_DEST_JTAG, 	///< xxx_TRAX name is obsolete, use more common xxx_JTAG
-    ESP_APPTRACE_DEST_UART,	                            ///< UART destination
-    ESP_APPTRACE_DEST_MAX = ESP_APPTRACE_DEST_UART+1,
+    ESP_APPTRACE_DEST_UART0,	                        ///< UART0 destination
+    ESP_APPTRACE_DEST_MAX = ESP_APPTRACE_DEST_UART0,
     ESP_APPTRACE_DEST_NUM
 } esp_apptrace_dest_t;
 
@@ -36,7 +36,7 @@ esp_err_t esp_apptrace_init(void);
 
 /**
  * @brief Configures down buffer.
- *        @note Needs to be called before attempting to receive any data using esp_apptrace_down_buffer_get and esp_apptrace_read.
+ *        @note Needs to be called before initiating any data transfer using esp_apptrace_buffer_get and esp_apptrace_write.
  *              This function does not protect internal data by lock.
  *
  * @param buf Address of buffer to use for down channel (host to target) data.
@@ -46,7 +46,7 @@ void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size);
 
 /**
  * @brief Allocates buffer for trace data.
- *        Once the data in the buffer is ready to be sent, esp_apptrace_buffer_put must be called to indicate it.
+ *        After data in buffer are ready to be sent off esp_apptrace_buffer_put must be called to indicate it.
  *
  * @param dest Indicates HW interface to send data.
  * @param size Size of data to write to trace buffer.
@@ -57,8 +57,8 @@ void esp_apptrace_down_buffer_config(uint8_t *buf, uint32_t size);
 uint8_t *esp_apptrace_buffer_get(esp_apptrace_dest_t dest, uint32_t size, uint32_t tmo);
 
 /**
- * @brief Indicates that the data in the buffer is ready to be sent.
- *        This function is a counterpart of and must be preceded by esp_apptrace_buffer_get.
+ * @brief Indicates that the data in buffer are ready to be sent off.
+ *        This function is a counterpart of and must be preceeded by esp_apptrace_buffer_get.
  *
  * @param dest Indicates HW interface to send data. Should be identical to the same parameter in call to esp_apptrace_buffer_get.
  * @param ptr  Address of trace buffer to release. Should be the value returned by call to esp_apptrace_buffer_get.
@@ -81,7 +81,7 @@ esp_err_t esp_apptrace_buffer_put(esp_apptrace_dest_t dest, uint8_t *ptr, uint32
 esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, const void *data, uint32_t size, uint32_t tmo);
 
 /**
- * @brief vprintf-like function to send log messages to host via specified HW interface.
+ * @brief vprintf-like function to sent log messages to host via specified HW interface.
  *
  * @param dest Indicates HW interface to send data.
  * @param tmo  Timeout for operation (in us). Use ESP_APPTRACE_TMO_INFINITE to wait indefinitely.
@@ -93,7 +93,7 @@ esp_err_t esp_apptrace_write(esp_apptrace_dest_t dest, const void *data, uint32_
 int esp_apptrace_vprintf_to(esp_apptrace_dest_t dest, uint32_t tmo, const char *fmt, va_list ap);
 
 /**
- * @brief vprintf-like function to send log messages to host.
+ * @brief vprintf-like function to sent log messages to host.
  *
  * @param fmt  Address of format string.
  * @param ap   List of arguments.
@@ -114,7 +114,7 @@ esp_err_t esp_apptrace_flush(esp_apptrace_dest_t dest, uint32_t tmo);
 
 /**
  * @brief Flushes remaining data in trace buffer to host without locking internal data.
- *        This is a special version of esp_apptrace_flush which should be called from panic handler.
+ *        This is special version of esp_apptrace_flush which should be called from panic handler.
  *
  * @param dest   Indicates HW interface to flush data on.
  * @param min_sz Threshold for flushing data. If current filling level is above this value, data will be flushed. TRAX destinations only.
@@ -138,7 +138,7 @@ esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *data, uint32_t *size
 
 /**
  * @brief Retrieves incoming data buffer if any.
- *        Once data in the buffer is processed, esp_apptrace_down_buffer_put must be called to indicate it.
+ *        After data in buffer are processed esp_apptrace_down_buffer_put must be called to indicate it.
  *
  * @param dest Indicates HW interface to receive data.
  * @param size Address to store size of available data in down buffer. Must be initialized with requested value.
@@ -149,8 +149,8 @@ esp_err_t esp_apptrace_read(esp_apptrace_dest_t dest, void *data, uint32_t *size
 uint8_t *esp_apptrace_down_buffer_get(esp_apptrace_dest_t dest, uint32_t *size, uint32_t tmo);
 
 /**
- * @brief Indicates that the data in the down buffer is processed.
- *        This function is a counterpart of and must be preceded by esp_apptrace_down_buffer_get.
+ * @brief Indicates that the data in down buffer are processed.
+ *        This function is a counterpart of and must be preceeded by esp_apptrace_down_buffer_get.
  *
  * @param dest Indicates HW interface to receive data. Should be identical to the same parameter in call to esp_apptrace_down_buffer_get.
  * @param ptr  Address of trace buffer to release. Should be the value returned by call to esp_apptrace_down_buffer_get.
@@ -245,7 +245,7 @@ int esp_apptrace_fseek(esp_apptrace_dest_t dest, void *stream, long offset, int
 int esp_apptrace_ftell(esp_apptrace_dest_t dest, void *stream);
 
 /**
- * @brief Indicates to the host that all file operations are complete.
+ * @brief Indicates to the host that all file operations are completed.
  *		  This function should be called after all file operations are finished and
  *		  indicate to the host that it can perform cleanup operations (close open files etc.).
  *

components/app_trace/include/esp_app_trace_util.h

@@ -57,7 +57,7 @@ static inline uint32_t esp_apptrace_tmo_remaining_us(esp_apptrace_tmo_t *tmo)
 
 /** Tracing module synchronization lock */
 typedef struct {
-    spinlock_t mux;
+    portMUX_TYPE mux;
     unsigned int_state;
 } esp_apptrace_lock_t;
 

components/app_trace/linker.lf

@@ -2,7 +2,6 @@
 archive: libapp_trace.a
 entries:
     app_trace (noflash)
-    port_uart (noflash)
     app_trace_util (noflash)
     if APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE:
       app_trace_membufs_proto (noflash)
@@ -17,7 +16,8 @@ entries:
 [mapping:app_trace_driver]
 archive: libdriver.a
 entries:
-    if APPTRACE_SV_TS_SOURCE_GPTIMER = y:
-      gptimer (noflash)
+    if APPTRACE_SV_TS_SOURCE_TIMER_00 = y || APPTRACE_SV_TS_SOURCE_TIMER_01 = y
+       || APPTRACE_SV_TS_SOURCE_TIMER_10 = y || APPTRACE_SV_TS_SOURCE_TIMER_11 = y:
+      timer (noflash)
     else:
       * (default)

components/app_trace/port/include/esp_app_trace_port.h

@@ -1,9 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef ESP_APP_TRACE_PORT_H_
 #define ESP_APP_TRACE_PORT_H_
 

components/app_trace/port/port_uart.c

@@ -1,348 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "soc/soc.h"
-#include "esp_log.h"
-#include "esp_cpu.h"
-#include "esp_app_trace_port.h"
-
-#include "driver/uart.h"
-#include "hal/uart_ll.h"
-#include "string.h"
-#include "driver/gpio.h"
-
-
-#define APPTRACE_DEST_UART (CONFIG_APPTRACE_DEST_UART0 | CONFIG_APPTRACE_DEST_UART1 | CONFIG_APPTRACE_DEST_UART2)
-
-#define APP_TRACE_MAX_TX_BUFF_UART          CONFIG_APPTRACE_UART_TX_BUFF_SIZE
-#define APP_TRACE_MAX_TX_MSG_UART           CONFIG_APPTRACE_UART_TX_MSG_SIZE
-
-/** UART HW transport data */
-typedef struct {
-    uint8_t                             inited;
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_apptrace_lock_t                 lock;   // sync lock
-#endif
-    uart_port_t port_num;
-// TX data ring buffer
-    uint8_t *tx_data_buff;
-    int32_t tx_data_buff_in;
-    int32_t tx_data_buff_out;
-// TX message buffer
-    uint8_t *tx_msg_buff;
-    uint32_t tx_msg_buff_size;
-
-// RX message buffer
-    uint8_t *down_buffer;
-    uint32_t down_buffer_size;
-// Buffer overflow flags
-    bool message_buff_overflow;
-    bool circular_buff_overflow;
-} esp_apptrace_uart_data_t;
-
-#if APPTRACE_DEST_UART
-static esp_err_t esp_apptrace_uart_init(esp_apptrace_uart_data_t *hw_data);
-static esp_err_t esp_apptrace_uart_flush(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_uart_flush_nolock(esp_apptrace_uart_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo);
-static uint8_t *esp_apptrace_uart_up_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_uart_up_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static void esp_apptrace_uart_down_buffer_config(esp_apptrace_uart_data_t *hw_data, uint8_t *buf, uint32_t size);
-static uint8_t *esp_apptrace_uart_down_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo);
-static esp_err_t esp_apptrace_uart_down_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo);
-static bool esp_apptrace_uart_host_is_connected(esp_apptrace_uart_data_t *hw_data);
-
-#endif // APPTRACE_DEST_UART
-const static char *TAG = "esp_apptrace_uart";
-
-esp_apptrace_hw_t *esp_apptrace_uart_hw_get(int num, void **data)
-{
-    ESP_LOGD(TAG,"esp_apptrace_uart_hw_get - %i", num);
-#if APPTRACE_DEST_UART
-    static esp_apptrace_uart_data_t s_uart_hw_data = {
-    };
-    static esp_apptrace_hw_t s_uart_hw = {
-        .init = (esp_err_t (*)(void *))esp_apptrace_uart_init,
-        .get_up_buffer = (uint8_t *(*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_uart_up_buffer_get,
-        .put_up_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_uart_up_buffer_put,
-        .flush_up_buffer_nolock = (esp_err_t (*)(void *, uint32_t, esp_apptrace_tmo_t *))esp_apptrace_uart_flush_nolock,
-        .flush_up_buffer = (esp_err_t (*)(void *, esp_apptrace_tmo_t *))esp_apptrace_uart_flush,
-        .down_buffer_config = (void (*)(void *, uint8_t *, uint32_t ))esp_apptrace_uart_down_buffer_config,
-        .get_down_buffer = (uint8_t *(*)(void *, uint32_t *, esp_apptrace_tmo_t *))esp_apptrace_uart_down_buffer_get,
-        .put_down_buffer = (esp_err_t (*)(void *, uint8_t *, esp_apptrace_tmo_t *))esp_apptrace_uart_down_buffer_put,
-        .host_is_connected = (bool (*)(void *))esp_apptrace_uart_host_is_connected,
-    };
-    s_uart_hw_data.port_num = num;
-    *data = &s_uart_hw_data;
-    return &s_uart_hw;
-#else
-    return NULL;
-#endif
-}
-
-#if APPTRACE_DEST_UART
-
-static esp_err_t esp_apptrace_uart_lock(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    esp_err_t ret = esp_apptrace_lock_take(&hw_data->lock, tmo);
-    if (ret != ESP_OK) {
-        return ESP_FAIL;
-    }
-#endif
-    return ESP_OK;
-}
-
-static esp_err_t esp_apptrace_uart_unlock(esp_apptrace_uart_data_t *hw_data)
-{
-    esp_err_t ret = ESP_OK;
-#if CONFIG_APPTRACE_LOCK_ENABLE
-    ret = esp_apptrace_lock_give(&hw_data->lock);
-#endif
-    return ret;
-}
-
-static inline void esp_apptrace_uart_hw_init(void)
-{
-    ESP_APPTRACE_LOGI("Initialized UART on CPU%d", esp_cpu_get_core_id());
-}
-
-
-/*****************************************************************************************/
-/***************************** Apptrace HW iface *****************************************/
-/*****************************************************************************************/
-
-static esp_err_t esp_apptrace_send_uart_data(esp_apptrace_uart_data_t *hw_data, const char *data, uint32_t size, esp_apptrace_tmo_t *tmo)
-{
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return res;
-    }
-    // We store current out position to handle it without lock
-    volatile int32_t out_position = hw_data->tx_data_buff_out;
-
-    int len_free = APP_TRACE_MAX_TX_BUFF_UART - (hw_data->tx_data_buff_in - out_position);
-    if (out_position > hw_data->tx_data_buff_in) {
-        len_free = out_position - hw_data->tx_data_buff_in;
-    }
-    int check_len = APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in;
-    if (size <= len_free)
-    {
-        if ( check_len >= size) {
-            memcpy(&hw_data->tx_data_buff[hw_data->tx_data_buff_in], data, size);
-            hw_data->tx_data_buff_in += size;
-        } else {
-            memcpy(&hw_data->tx_data_buff[hw_data->tx_data_buff_in], data, APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in);
-            memcpy(&hw_data->tx_data_buff[0], &data[APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in], size - (APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in));
-            hw_data->tx_data_buff_in = size - (APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_in);
-        }
-        if (hw_data->tx_data_buff_in >= APP_TRACE_MAX_TX_BUFF_UART) {
-            hw_data->tx_data_buff_in = 0;
-        }
-    } else {
-        hw_data->circular_buff_overflow = true;
-    }
-
-    if (esp_apptrace_uart_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-
-    return ESP_OK;
-}
-
-static void send_buff_data(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-    if (hw_data->tx_data_buff_in == hw_data->tx_data_buff_out) {
-        return;
-    }
-    // We store current in position to handle it without lock
-    volatile int32_t in_position = hw_data->tx_data_buff_in;
-    if (in_position > hw_data->tx_data_buff_out) {
-        int bytes_sent = uart_write_bytes(hw_data->port_num, &hw_data->tx_data_buff[hw_data->tx_data_buff_out], in_position - hw_data->tx_data_buff_out);
-        hw_data->tx_data_buff_out += bytes_sent;
-    } else {
-        int bytes_sent = uart_write_bytes(hw_data->port_num, &hw_data->tx_data_buff[hw_data->tx_data_buff_out], APP_TRACE_MAX_TX_BUFF_UART - hw_data->tx_data_buff_out);
-        hw_data->tx_data_buff_out += bytes_sent;
-        if (hw_data->tx_data_buff_out >= APP_TRACE_MAX_TX_BUFF_UART) {
-            hw_data->tx_data_buff_out = 0;
-        }
-    }
-}
-
-#define APP_TRACE_UART_STOP_WAIT_TMO    1000000 //us
-
-static void esp_apptrace_send_uart_tx_task(void *arg)
-{
-    esp_apptrace_uart_data_t *hw_data = (esp_apptrace_uart_data_t *)arg;
-    esp_apptrace_tmo_t tmo;
-    esp_apptrace_tmo_init(&tmo, APP_TRACE_UART_STOP_WAIT_TMO);
-
-    vTaskDelay(10);
-    while (1) {
-        send_buff_data(hw_data, &tmo);
-        vTaskDelay(10);
-        if (hw_data->circular_buff_overflow == true)
-        {
-            hw_data->circular_buff_overflow = false;
-            ESP_LOGE(TAG, "Buffer overflow. Please increase UART baudrate, or increase UART TX ring buffer size in menuconfig.");
-        }
-        if (hw_data->message_buff_overflow == true)
-        {
-            hw_data->message_buff_overflow = false;
-            ESP_LOGE(TAG, "Message size more then message buffer!");
-        }
-    }
-}
-
-static const int APP_TRACE_UART_RX_BUF_SIZE = 4024;
-
-static esp_err_t esp_apptrace_uart_init(esp_apptrace_uart_data_t *hw_data)
-{
-    int core_id = esp_cpu_get_core_id();
-    if (core_id == 0) {
-        hw_data->tx_data_buff = (uint8_t *)heap_caps_malloc(APP_TRACE_MAX_TX_BUFF_UART, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-        if (hw_data->tx_data_buff == NULL){
-            return ESP_ERR_NO_MEM;
-        }
-        hw_data->tx_data_buff_in = 0;
-        hw_data->tx_data_buff_out = 0;
-        hw_data->tx_msg_buff =  (uint8_t *)heap_caps_malloc(APP_TRACE_MAX_TX_MSG_UART, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
-        if (hw_data->tx_msg_buff == NULL)
-        {
-            return ESP_ERR_NO_MEM;
-        }
-        hw_data->tx_msg_buff_size = 0;
-        hw_data->down_buffer_size = 0;
-        hw_data->message_buff_overflow = false;
-        hw_data->circular_buff_overflow = false;
-
-
-        const uart_config_t uart_config = {
-            .baud_rate = CONFIG_APPTRACE_UART_BAUDRATE,
-            .data_bits = UART_DATA_8_BITS,
-            .parity = UART_PARITY_DISABLE,
-            .stop_bits = UART_STOP_BITS_1,
-            .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
-            .source_clk = UART_SCLK_DEFAULT,
-        };
-        ESP_LOGI(TAG, "UART baud rate: %i", CONFIG_APPTRACE_UART_BAUDRATE);
-        // We won't use a buffer for sending data.
-        esp_err_t err = uart_driver_install(hw_data->port_num, APP_TRACE_UART_RX_BUF_SIZE, APP_TRACE_UART_RX_BUF_SIZE, 0, NULL, 0);
-        assert((err == ESP_OK) && "Not possible to install UART. Please check and change menuconfig parameters!");
-        err = uart_param_config(hw_data->port_num, &uart_config);
-        assert((err == ESP_OK) && "Not possible to configure UART. Please check and change menuconfig parameters!");
-        err = uart_set_pin(hw_data->port_num, CONFIG_APPTRACE_UART_TX_GPIO, CONFIG_APPTRACE_UART_RX_GPIO, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
-        assert((err == ESP_OK) && "Not possible to configure UART RX/TX pins. Please check and change menuconfig parameters!");
-
-        int uart_prio = CONFIG_APPTRACE_UART_TASK_PRIO;
-        if (uart_prio >= (configMAX_PRIORITIES-1)) uart_prio = configMAX_PRIORITIES - 1;
-        err = xTaskCreate(esp_apptrace_send_uart_tx_task, "app_trace_uart_tx_task", 2500, hw_data, uart_prio, NULL);
-        assert((err == pdPASS) && "Not possible to configure UART. Not possible to create task!");
-
-#if CONFIG_APPTRACE_LOCK_ENABLE
-        esp_apptrace_lock_init(&hw_data->lock);
-#endif
-    }
-    // init UART on this CPU
-    esp_apptrace_uart_hw_init();
-    hw_data->inited |= 1 << core_id;
-
-    return ESP_OK;
-}
-
-static uint8_t *esp_apptrace_uart_up_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t size, esp_apptrace_tmo_t *tmo)
-{
-    uint8_t *ptr;
-    if (size > APP_TRACE_MAX_TX_MSG_UART) {
-        hw_data->message_buff_overflow = true;
-        return NULL;
-    }
-    if (hw_data->tx_msg_buff_size != 0)
-    {
-        // A previous message was not sent.
-        return NULL;
-    }
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-    ptr = hw_data->tx_msg_buff;
-    hw_data->tx_msg_buff_size = size;
-
-    // now we can safely unlock apptrace to allow other tasks/ISRs to get other buffers and write their data
-    if (esp_apptrace_uart_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return ptr;
-}
-
-static esp_err_t esp_apptrace_uart_up_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
-{
-    esp_err_t res = esp_apptrace_send_uart_data(hw_data, (const char *)ptr, hw_data->tx_msg_buff_size, tmo);
-    // Clear size to indicate that we've sent data
-    hw_data->tx_msg_buff_size = 0;
-    return res;
-}
-
-static void esp_apptrace_uart_down_buffer_config(esp_apptrace_uart_data_t *hw_data, uint8_t *buf, uint32_t size)
-{
-    hw_data->down_buffer = (uint8_t *)malloc(size);
-    if (hw_data->down_buffer == NULL){
-        assert(false && "Failed to allocate apptrace uart down buffer!");
-    }
-    hw_data->down_buffer_size = size;
-}
-
-static uint8_t *esp_apptrace_uart_down_buffer_get(esp_apptrace_uart_data_t *hw_data, uint32_t *size, esp_apptrace_tmo_t *tmo)
-{
-    uint8_t *ptr = NULL;
-
-    if (*size > hw_data->down_buffer_size) {
-        return NULL;
-    }
-
-    esp_err_t res = esp_apptrace_uart_lock(hw_data, tmo);
-    if (res != ESP_OK) {
-        return NULL;
-    }
-
-    size_t uart_fifolen = 0;
-    uart_get_buffered_data_len(hw_data->port_num, &uart_fifolen);
-    if (uart_fifolen > 0) {
-        if (*size < uart_fifolen) {
-            uart_fifolen = *size;
-        }
-        *size = uart_fifolen;
-        ptr = hw_data->down_buffer;
-        *size =uart_read_bytes(hw_data->port_num, ptr, uart_fifolen, 0);
-    }
-
-    if (esp_apptrace_uart_unlock(hw_data) != ESP_OK) {
-        assert(false && "Failed to unlock apptrace data!");
-    }
-    return ptr;
-}
-
-static esp_err_t esp_apptrace_uart_down_buffer_put(esp_apptrace_uart_data_t *hw_data, uint8_t *ptr, esp_apptrace_tmo_t *tmo)
-{
-    return ESP_OK;
-}
-
-static bool esp_apptrace_uart_host_is_connected(esp_apptrace_uart_data_t *hw_data)
-{
-    return hw_data->inited & 1;
-}
-
-static esp_err_t esp_apptrace_uart_flush_nolock(esp_apptrace_uart_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
-{
-    return ESP_OK;
-}
-
-static esp_err_t esp_apptrace_uart_flush(esp_apptrace_uart_data_t *hw_data, esp_apptrace_tmo_t *tmo)
-{
-    return ESP_OK;
-}
-
-#endif // APPTRACE_DEST_UART

components/app_trace/port/riscv/port.c

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "esp_cpu.h"
 #include "esp_log.h"
 #include "esp_app_trace_membufs_proto.h"
 #include "esp_app_trace_port.h"
@@ -37,7 +36,7 @@ typedef struct {
 #define ESP_APPTRACE_RISCV_HOST_DATA             (1 << 22)
 #define ESP_APPTRACE_RISCV_HOST_CONNECT          (1 << 23)
 
-#define ESP_APPTRACE_RISCV_INITED(_hw_)          ((_hw_)->inited & (1 << 0/*esp_cpu_get_core_id()*/))
+#define ESP_APPTRACE_RISCV_INITED(_hw_)          ((_hw_)->inited & (1 << 0/*cpu_hal_get_core_id()*/))
 
 static esp_err_t esp_apptrace_riscv_init(esp_apptrace_riscv_data_t *hw_data);
 static esp_err_t esp_apptrace_riscv_flush(esp_apptrace_riscv_data_t *hw_data, esp_apptrace_tmo_t *tmo);
@@ -58,6 +57,11 @@ const static char *TAG = "esp_apptrace";
 
 static esp_apptrace_riscv_ctrl_block_t s_tracing_ctrl[portNUM_PROCESSORS];
 
+esp_apptrace_hw_t *esp_apptrace_uart_hw_get(int num, void **data)
+{
+    return NULL;
+}
+
 esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
 {
 #if CONFIG_APPTRACE_DEST_JTAG
@@ -95,7 +99,7 @@ esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
    e.g. OpenOCD flasher stub use own implementation of it. */
 __attribute__((weak)) int esp_apptrace_advertise_ctrl_block(void *ctrl_block_addr)
 {
-    if (!esp_cpu_dbgr_is_attached()) {
+    if (!esp_cpu_in_ocd_debug_mode()) {
         return 0;
     }
     return (int) semihosting_call_noerrno(ESP_SEMIHOSTING_SYS_APPTRACE_INIT, (long*)ctrl_block_addr);
@@ -140,7 +144,7 @@ static esp_err_t esp_apptrace_riscv_unlock(esp_apptrace_riscv_data_t *hw_data)
 
 static esp_err_t esp_apptrace_riscv_init(esp_apptrace_riscv_data_t *hw_data)
 {
-    int core_id = esp_cpu_get_core_id();
+    int core_id = cpu_hal_get_core_id();
 
     if (hw_data->inited == 0) {
         esp_apptrace_mem_block_t mem_blocks_cfg[2];
@@ -254,7 +258,7 @@ static bool esp_apptrace_riscv_host_is_connected(esp_apptrace_riscv_data_t *hw_d
     if (!ESP_APPTRACE_RISCV_INITED(hw_data)) {
         return false;
     }
-    return s_tracing_ctrl[esp_cpu_get_core_id()].ctrl & ESP_APPTRACE_RISCV_HOST_CONNECT ? true : false;
+    return s_tracing_ctrl[cpu_hal_get_core_id()].ctrl & ESP_APPTRACE_RISCV_HOST_CONNECT ? true : false;
 }
 
 static esp_err_t esp_apptrace_riscv_flush_nolock(esp_apptrace_riscv_data_t *hw_data, uint32_t min_sz, esp_apptrace_tmo_t *tmo)
@@ -298,13 +302,13 @@ static inline void esp_apptrace_riscv_buffer_swap_lock(void)
     // HACK: in this case host will set breakpoint just after ESP_APPTRACE_RISCV_CTRL_REG update,
     // here we set address to set bp at
     // enter ERI update critical section
-    s_tracing_ctrl[esp_cpu_get_core_id()].stat = (uint32_t)&__esp_apptrace_riscv_updated;
+    s_tracing_ctrl[cpu_hal_get_core_id()].stat = (uint32_t)&__esp_apptrace_riscv_updated;
 }
 
 static __attribute__((noinline)) void esp_apptrace_riscv_buffer_swap_unlock(void)
 {
     // exit ERI update critical section
-    s_tracing_ctrl[esp_cpu_get_core_id()].stat = 0;
+    s_tracing_ctrl[cpu_hal_get_core_id()].stat = 0;
     // TODO: currently host sets breakpoint, use break instruction to stop;
     // it will allow to use ESP_APPTRACE_RISCV_STAT_REG for other purposes
     asm volatile (
@@ -318,13 +322,13 @@ static esp_err_t esp_apptrace_riscv_buffer_swap_start(uint32_t curr_block_id)
 
     esp_apptrace_riscv_buffer_swap_lock();
 
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    uint32_t ctrl_reg = s_tracing_ctrl[cpu_hal_get_core_id()].ctrl;
     uint32_t host_connected = ESP_APPTRACE_RISCV_HOST_CONNECT & ctrl_reg;
     if (host_connected) {
         uint32_t acked_block = ESP_APPTRACE_RISCV_BLOCK_ID_GET(ctrl_reg);
         uint32_t host_to_read = ESP_APPTRACE_RISCV_BLOCK_LEN_GET(ctrl_reg);
         if (host_to_read != 0 || acked_block != (curr_block_id & ESP_APPTRACE_RISCV_BLOCK_ID_MSK)) {
-            ESP_APPTRACE_LOGD("[%d]: Can not switch %x %d %x %x/%lx", esp_cpu_get_core_id(), ctrl_reg, host_to_read, acked_block,
+            ESP_APPTRACE_LOGD("[%d]: Can not switch %x %d %x %x/%lx", cpu_hal_get_core_id(), ctrl_reg, host_to_read, acked_block,
                 curr_block_id & ESP_APPTRACE_RISCV_BLOCK_ID_MSK, curr_block_id);
             res = ESP_ERR_NO_MEM;
             goto _on_err;
@@ -338,9 +342,9 @@ _on_err:
 
 static esp_err_t esp_apptrace_riscv_buffer_swap_end(uint32_t new_block_id, uint32_t prev_block_len)
 {
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    uint32_t ctrl_reg = s_tracing_ctrl[cpu_hal_get_core_id()].ctrl;
     uint32_t host_connected = ESP_APPTRACE_RISCV_HOST_CONNECT & ctrl_reg;
-    s_tracing_ctrl[esp_cpu_get_core_id()].ctrl = ESP_APPTRACE_RISCV_BLOCK_ID(new_block_id) |
+    s_tracing_ctrl[cpu_hal_get_core_id()].ctrl = ESP_APPTRACE_RISCV_BLOCK_ID(new_block_id) |
               host_connected | ESP_APPTRACE_RISCV_BLOCK_LEN(prev_block_len);
     esp_apptrace_riscv_buffer_swap_unlock();
     return ESP_OK;
@@ -354,7 +358,7 @@ static esp_err_t esp_apptrace_riscv_buffer_swap(uint32_t new_block_id)
 
 static bool esp_apptrace_riscv_host_data_pending(void)
 {
-    uint32_t ctrl_reg = s_tracing_ctrl[esp_cpu_get_core_id()].ctrl;
+    uint32_t ctrl_reg = s_tracing_ctrl[cpu_hal_get_core_id()].ctrl;
     // ESP_APPTRACE_LOGV("%s() 0x%x", __func__, ctrl_reg);
     return (ctrl_reg & ESP_APPTRACE_RISCV_HOST_DATA) ? true : false;
 }

components/app_trace/port/xtensa/port.c

@@ -148,14 +148,14 @@
 // time exceeds specified timeout value operation is canceled and ESP_ERR_TIMEOUT code is returned.
 #include "sdkconfig.h"
 #include "soc/soc.h"
+#include "soc/dport_access.h"
 #include "soc/dport_reg.h"
 #include "soc/tracemem_config.h"
 #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 #include "soc/sensitive_reg.h"
 #endif
 #include "eri.h"
-#include "esp_private/trax.h"
-#include "esp_cpu.h"
+#include "trax.h"
 #include "esp_log.h"
 #include "esp_app_trace_membufs_proto.h"
 #include "esp_app_trace_port.h"
@@ -174,7 +174,7 @@
 #define ESP_APPTRACE_TRAX_HOST_DATA             (1 << 22)
 #define ESP_APPTRACE_TRAX_HOST_CONNECT          (1 << 23)
 
-#define ESP_APPTRACE_TRAX_INITED(_hw_)          ((_hw_)->inited & (1 << esp_cpu_get_core_id()))
+#define ESP_APPTRACE_TRAX_INITED(_hw_)          ((_hw_)->inited & (1 << cpu_hal_get_core_id()))
 
 #define ESP_APPTRACE_TRAX_BLOCK_SIZE            (0x4000UL)
 
@@ -210,6 +210,12 @@ static uint8_t * const s_trax_blocks[] = {
     (uint8_t *)TRACEMEM_BLK1_ADDR
 };
 
+
+esp_apptrace_hw_t *esp_apptrace_uart_hw_get(int num, void **data)
+{
+    return NULL;
+}
+
 esp_apptrace_hw_t *esp_apptrace_jtag_hw_get(void **data)
 {
 #if CONFIG_APPTRACE_DEST_JTAG
@@ -272,7 +278,7 @@ static inline void esp_apptrace_trax_hw_init(void)
     // must be read by host before any transfer using TRAX
     eri_write(ESP_APPTRACE_TRAX_STAT_REG, 0);
 
-    ESP_APPTRACE_LOGI("Initialized TRAX on CPU%d", esp_cpu_get_core_id());
+    ESP_APPTRACE_LOGI("Initialized TRAX on CPU%d", cpu_hal_get_core_id());
 }
 
 static inline void esp_apptrace_trax_select_memory_block(int block_num)
@@ -311,7 +317,7 @@ static inline void esp_apptrace_trax_memory_enable(void)
 
 static esp_err_t esp_apptrace_trax_init(esp_apptrace_trax_data_t *hw_data)
 {
-    int core_id = esp_cpu_get_core_id();
+    int core_id = cpu_hal_get_core_id();
 
     // 'esp_apptrace_trax_init()' is called on every core, so ensure to do main initialization only once
     if (core_id == 0) {
@@ -498,7 +504,7 @@ static esp_err_t esp_apptrace_trax_buffer_swap_start(uint32_t curr_block_id)
         uint32_t acked_block = ESP_APPTRACE_TRAX_BLOCK_ID_GET(ctrl_reg);
         uint32_t host_to_read = ESP_APPTRACE_TRAX_BLOCK_LEN_GET(ctrl_reg);
         if (host_to_read != 0 || acked_block != (curr_block_id & ESP_APPTRACE_TRAX_BLOCK_ID_MSK)) {
-            ESP_APPTRACE_LOGD("HC[%d]: Can not switch %x %d %x %x/%lx", esp_cpu_get_core_id(), ctrl_reg, host_to_read, acked_block,
+            ESP_APPTRACE_LOGD("HC[%d]: Can not switch %x %d %x %x/%lx", cpu_hal_get_core_id(), ctrl_reg, host_to_read, acked_block,
                 curr_block_id & ESP_APPTRACE_TRAX_BLOCK_ID_MSK, curr_block_id);
             res = ESP_ERR_NO_MEM;
             goto _on_err;

components/app_trace/private_include/esp_app_trace_membufs_proto.h

@@ -1,9 +1,16 @@
-/*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef ESP_APP_TRACE_MEMBUFS_PROTO_H_
 #define ESP_APP_TRACE_MEMBUFS_PROTO_H_
 

components/app_trace/project_include.cmake

@@ -2,7 +2,7 @@
 #
 # Create coverage report.
 function(idf_create_coverage_report report_dir)
-    set(gcov_tool ${_CMAKE_TOOLCHAIN_PREFIX}gcov)
+    set(gcov_tool ${CONFIG_SDK_TOOLPREFIX}gcov)
     idf_build_get_property(project_name PROJECT_NAME)
 
     add_custom_target(pre-cov-report

components/app_trace/sdkconfig.rename

@@ -14,6 +14,10 @@ CONFIG_ESP32_GCOV_ENABLE								CONFIG_APPTRACE_GCOV_ENABLE
 CONFIG_SYSVIEW_ENABLE							        CONFIG_APPTRACE_SV_ENABLE
 CONFIG_SYSVIEW_TS_SOURCE							    CONFIG_APPTRACE_SV_TS_SOURCE
 CONFIG_SYSVIEW_TS_SOURCE_CCOUNT							CONFIG_APPTRACE_SV_TS_SOURCE_CCOUNT
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_00						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_00
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_01						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_01
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_10						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_10
+CONFIG_SYSVIEW_TS_SOURCE_TIMER_11						CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_11
 CONFIG_SYSVIEW_TS_SOURCE_ESP_TIMER						CONFIG_APPTRACE_SV_TS_SOURCE_ESP_TIMER
 CONFIG_SYSVIEW_MAX_TASKS							    CONFIG_APPTRACE_SV_MAX_TASKS
 CONFIG_SYSVIEW_BUF_WAIT_TMO							    CONFIG_APPTRACE_SV_BUF_WAIT_TMO

components/app_trace/sys_view/Config/Global.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -47,7 +52,7 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ----------------------------------------------------------------------
@@ -57,7 +62,6 @@ Purpose : Global types
           merge the files. In order to use Segger code, the types
           U8, U16, U32, I8, I16, I32 need to be defined in Global.h;
           additional definitions do not hurt.
-Revision: $Rev: 12501 $
 ---------------------------END-OF-HEADER------------------------------
 */
 
@@ -65,26 +69,13 @@ Revision: $Rev: 12501 $
 #define GLOBAL_H
 
 #define U8    unsigned char
-#define I8    signed char
 #define U16   unsigned short
-#define I16   signed short
-#ifdef __x86_64__
-#define U32   unsigned
-#define I32   int
-#else
 #define U32   unsigned long
+#define I8    signed char
+#define I16   signed short
 #define I32   signed long
-#endif
 
-//
-// CC_NO_LONG_SUPPORT can be defined to compile test
-// without long support for compilers that do not
-// support C99 and its long type.
-//
-#ifdef CC_NO_LONG_SUPPORT
-  #define PTR_ADDR  U32
-#else  // Supports long type.
-#if defined(_WIN32) && !defined(__clang__) && !defined(__MINGW32__)
+#ifdef _WIN32
   //
   // Microsoft VC6 compiler related
   //
@@ -106,13 +97,6 @@ Revision: $Rev: 12501 $
   #define U64_C(x) x##ULL
 #endif
 
-#if (defined(_WIN64) || defined(__LP64__))  // 64-bit symbols used by Visual Studio and GCC, maybe others as well.
-  #define PTR_ADDR  U64
-#else
-  #define PTR_ADDR  U32
-#endif
-#endif  // Supports long type.
-
 #endif                      // Avoid multiple inclusion
 
 /*************************** End of file ****************************/

components/app_trace/sys_view/Config/SEGGER_RTT_Conf.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -47,7 +52,7 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ---------------------------END-OF-HEADER------------------------------
@@ -55,7 +60,7 @@ File    : SEGGER_RTT_Conf.h
 Purpose : Implementation of SEGGER real-time transfer (RTT) which
           allows real-time communication on targets which support
           debugger memory accesses while the CPU is running.
-Revision: $Rev: 24316 $
+Revision: $Rev: 5626 $
 
 */
 
@@ -73,65 +78,15 @@ Revision: $Rev: 24316 $
 **********************************************************************
 */
 
-//
-// Take in and set to correct values for Cortex-A systems with CPU cache
-//
-//#define SEGGER_RTT_CPU_CACHE_LINE_SIZE            (32)          // Largest cache line size (in bytes) in the current system
-//#define SEGGER_RTT_UNCACHED_OFF                   (0xFB000000)  // Address alias where RTT CB and buffers can be accessed uncached
-//
-// Most common case:
-// Up-channel 0: RTT
-// Up-channel 1: SystemView
-//
-#ifndef   SEGGER_RTT_MAX_NUM_UP_BUFFERS
-  #define SEGGER_RTT_MAX_NUM_UP_BUFFERS             (3)     // Max. number of up-buffers (T->H) available on this target    (Default: 3)
-#endif
-//
-// Most common case:
-// Down-channel 0: RTT
-// Down-channel 1: SystemView
-//
-#ifndef   SEGGER_RTT_MAX_NUM_DOWN_BUFFERS
-  #define SEGGER_RTT_MAX_NUM_DOWN_BUFFERS           (3)     // Max. number of down-buffers (H->T) available on this target  (Default: 3)
-#endif
+#define SEGGER_RTT_MAX_NUM_UP_BUFFERS             (3)     // Max. number of up-buffers (T->H) available on this target    (Default: 3)
+#define SEGGER_RTT_MAX_NUM_DOWN_BUFFERS           (3)     // Max. number of down-buffers (H->T) available on this target  (Default: 3)
 
-#ifndef   BUFFER_SIZE_UP
-  #define BUFFER_SIZE_UP                            (1024)  // Size of the buffer for terminal output of target, up to host (Default: 1k)
-#endif
+#define BUFFER_SIZE_UP                            (1024)  // Size of the buffer for terminal output of target, up to host (Default: 1k)
+#define BUFFER_SIZE_DOWN                          (16)    // Size of the buffer for terminal input to target from host (Usually keyboard input) (Default: 16)
 
-#ifndef   BUFFER_SIZE_DOWN
-  #define BUFFER_SIZE_DOWN                          (16)    // Size of the buffer for terminal input to target from host (Usually keyboard input) (Default: 16)
-#endif
+#define SEGGER_RTT_PRINTF_BUFFER_SIZE             (64u)    // Size of buffer for RTT printf to bulk-send chars via RTT     (Default: 64)
 
-#ifndef   SEGGER_RTT_PRINTF_BUFFER_SIZE
-  #define SEGGER_RTT_PRINTF_BUFFER_SIZE             (64u)    // Size of buffer for RTT printf to bulk-send chars via RTT     (Default: 64)
-#endif
-
-#ifndef   SEGGER_RTT_MODE_DEFAULT
-  #define SEGGER_RTT_MODE_DEFAULT                   SEGGER_RTT_MODE_NO_BLOCK_SKIP // Mode for pre-initialized terminal channel (buffer 0)
-#endif
-
-/*********************************************************************
-*
-*       RTT memcpy configuration
-*
-*       memcpy() is good for large amounts of data,
-*       but the overhead is big for small amounts, which are usually stored via RTT.
-*       With SEGGER_RTT_MEMCPY_USE_BYTELOOP a simple byte loop can be used instead.
-*
-*       SEGGER_RTT_MEMCPY() can be used to replace standard memcpy() in RTT functions.
-*       This is may be required with memory access restrictions,
-*       such as on Cortex-A devices with MMU.
-*/
-#ifndef   SEGGER_RTT_MEMCPY_USE_BYTELOOP
-  #define SEGGER_RTT_MEMCPY_USE_BYTELOOP              0 // 0: Use memcpy/SEGGER_RTT_MEMCPY, 1: Use a simple byte-loop
-#endif
-//
-// Example definition of SEGGER_RTT_MEMCPY to external memcpy with GCC toolchains and Cortex-A targets
-//
-//#if ((defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)) && (defined (__ARM_ARCH_7A__))
-//  #define SEGGER_RTT_MEMCPY(pDest, pSrc, NumBytes)      SEGGER_memcpy((pDest), (pSrc), (NumBytes))
-//#endif
+#define SEGGER_RTT_MODE_DEFAULT                   SEGGER_RTT_MODE_NO_BLOCK_SKIP // Mode for pre-initialized terminal channel (buffer 0)
 
 //
 // Target is not allowed to perform other RTT operations while string still has not been stored completely.
@@ -147,64 +102,64 @@ Revision: $Rev: 24316 $
 // In case of doubt mask all interrupts: 1 << (8 - BASEPRI_PRIO_BITS) i.e. 1 << 5 when 3 bits are implemented in NVIC
 // or define SEGGER_RTT_LOCK() to completely disable interrupts.
 //
-#ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
-  #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY         (0x20)   // Interrupt priority to lock on SEGGER_RTT_LOCK on Cortex-M3/4 (Default: 0x20)
-#endif
+
+#define SEGGER_RTT_MAX_INTERRUPT_PRIORITY         (0x20)   // Interrupt priority to lock on SEGGER_RTT_LOCK on Cortex-M3/4 (Default: 0x20)
 
 /*********************************************************************
 *
 *       RTT lock configuration for SEGGER Embedded Studio,
 *       Rowley CrossStudio and GCC
 */
-#if ((defined(__SES_ARM) || defined(__SES_RISCV) || defined(__CROSSWORKS_ARM) || defined(__GNUC__) || defined(__clang__)) && !defined (__CC_ARM) && !defined(WIN32))
-  #if (defined(__ARM_ARCH_6M__) || defined(__ARM_ARCH_8M_BASE__))
+#if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)
+  #ifdef __ARM_ARCH_6M__
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                    unsigned int _SEGGER_RTT__LockState;                                         \
+                                    unsigned int LockState;                                         \
                                   __asm volatile ("mrs   %0, primask  \n\t"                         \
-                                                  "movs  r1, #1       \n\t"                         \
+                                                  "mov   r1, $1     \n\t"                           \
                                                   "msr   primask, r1  \n\t"                         \
-                                                  : "=r" (_SEGGER_RTT__LockState)                                \
+                                                  : "=r" (LockState)                                \
                                                   :                                                 \
-                                                  : "r1", "cc"                                      \
+                                                  : "r1"                                            \
                                                   );
 
     #define SEGGER_RTT_UNLOCK()   __asm volatile ("msr   primask, %0  \n\t"                         \
                                                   :                                                 \
-                                                  : "r" (_SEGGER_RTT__LockState)                                 \
+                                                  : "r" (LockState)                                 \
                                                   :                                                 \
                                                   );                                                \
                                 }
-  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__))
+
+  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__))
     #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                    unsigned int _SEGGER_RTT__LockState;                                         \
+                                    unsigned int LockState;                                         \
                                   __asm volatile ("mrs   %0, basepri  \n\t"                         \
                                                   "mov   r1, %1       \n\t"                         \
                                                   "msr   basepri, r1  \n\t"                         \
-                                                  : "=r" (_SEGGER_RTT__LockState)                                \
+                                                  : "=r" (LockState)                                \
                                                   : "i"(SEGGER_RTT_MAX_INTERRUPT_PRIORITY)          \
-                                                  : "r1", "cc"                                      \
+                                                  : "r1"                                            \
                                                   );
 
     #define SEGGER_RTT_UNLOCK()   __asm volatile ("msr   basepri, %0  \n\t"                         \
                                                   :                                                 \
-                                                  : "r" (_SEGGER_RTT__LockState)                                 \
+                                                  : "r" (LockState)                                 \
                                                   :                                                 \
                                                   );                                                \
                                 }
 
-  #elif (defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__))
+  #elif defined(__ARM_ARCH_7A__)
     #define SEGGER_RTT_LOCK() {                                                \
-                                 unsigned int _SEGGER_RTT__LockState;                       \
+                                 unsigned int LockState;                       \
                                  __asm volatile ("mrs r1, CPSR \n\t"           \
                                                  "mov %0, r1 \n\t"             \
                                                  "orr r1, r1, #0xC0 \n\t"      \
                                                  "msr CPSR_c, r1 \n\t"         \
-                                                 : "=r" (_SEGGER_RTT__LockState)            \
+                                                 : "=r" (LockState)            \
                                                  :                             \
-                                                 : "r1", "cc"                  \
+                                                 : "r1"                        \
                                                  );
 
     #define SEGGER_RTT_UNLOCK() __asm volatile ("mov r0, %0 \n\t"              \
@@ -214,30 +169,11 @@ Revision: $Rev: 24316 $
                                                 "orr r1, r1, r0 \n\t"          \
                                                 "msr CPSR_c, r1 \n\t"          \
                                                 :                              \
-                                                : "r" (_SEGGER_RTT__LockState)              \
-                                                : "r0", "r1", "cc"             \
+                                                : "r" (LockState)              \
+                                                : "r0", "r1"                   \
                                                 );                             \
                             }
-  #elif defined(__riscv) || defined(__riscv_xlen)
-    #define SEGGER_RTT_LOCK()  {                                               \
-                                 unsigned int _SEGGER_RTT__LockState;                       \
-                                 __asm volatile ("csrr  %0, mstatus  \n\t"     \
-                                                 "csrci mstatus, 8   \n\t"     \
-                                                 "andi  %0, %0,  8   \n\t"     \
-                                                 : "=r" (_SEGGER_RTT__LockState)            \
-                                                 :                             \
-                                                 :                             \
-                                                );
-
-  #define SEGGER_RTT_UNLOCK()    __asm volatile ("csrr  a1, mstatus  \n\t"     \
-                                                 "or    %0, %0, a1   \n\t"     \
-                                                 "csrs  mstatus, %0  \n\t"     \
-                                                 :                             \
-                                                 : "r"  (_SEGGER_RTT__LockState)            \
-                                                 : "a1"                        \
-                                                );                             \
-                               }
-  #else
+#else
     #define SEGGER_RTT_LOCK()
     #define SEGGER_RTT_UNLOCK()
   #endif
@@ -248,53 +184,25 @@ Revision: $Rev: 24316 $
 *       RTT lock configuration for IAR EWARM
 */
 #ifdef __ICCARM__
-  #if (defined (__ARM6M__)          && (__CORE__ == __ARM6M__))             ||                      \
-      (defined (__ARM8M_BASELINE__) && (__CORE__ == __ARM8M_BASELINE__))
+  #if (defined (__ARM6M__) && (__CORE__ == __ARM6M__))
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = __get_PRIMASK();                                      \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_PRIMASK();                                      \
                                   __set_PRIMASK(1);
 
-    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(_SEGGER_RTT__LockState);                                         \
+    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(LockState);                                         \
                                 }
-  #elif (defined (__ARM7EM__)         && (__CORE__ == __ARM7EM__))          ||                      \
-        (defined (__ARM7M__)          && (__CORE__ == __ARM7M__))           ||                      \
-        (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__))  ||                      \
-        (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__))
+  #elif ((defined (__ARM7EM__) && (__CORE__ == __ARM7EM__)) || (defined (__ARM7M__) && (__CORE__ == __ARM7M__)))
     #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = __get_BASEPRI();                                      \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_BASEPRI();                                      \
                                   __set_BASEPRI(SEGGER_RTT_MAX_INTERRUPT_PRIORITY);
 
-    #define SEGGER_RTT_UNLOCK()   __set_BASEPRI(_SEGGER_RTT__LockState);                                         \
+    #define SEGGER_RTT_UNLOCK()   __set_BASEPRI(LockState);                                         \
                                 }
-  #elif (defined (__ARM7A__) && (__CORE__ == __ARM7A__))                    ||                      \
-        (defined (__ARM7R__) && (__CORE__ == __ARM7R__))
-    #define SEGGER_RTT_LOCK() {                                                                     \
-                                 unsigned int _SEGGER_RTT__LockState;                                            \
-                                 __asm volatile ("mrs r1, CPSR \n\t"                                \
-                                                 "mov %0, r1 \n\t"                                  \
-                                                 "orr r1, r1, #0xC0 \n\t"                           \
-                                                 "msr CPSR_c, r1 \n\t"                              \
-                                                 : "=r" (_SEGGER_RTT__LockState)                                 \
-                                                 :                                                  \
-                                                 : "r1", "cc"                                       \
-                                                 );
-
-    #define SEGGER_RTT_UNLOCK() __asm volatile ("mov r0, %0 \n\t"                                   \
-                                                "mrs r1, CPSR \n\t"                                 \
-                                                "bic r1, r1, #0xC0 \n\t"                            \
-                                                "and r0, r0, #0xC0 \n\t"                            \
-                                                "orr r1, r1, r0 \n\t"                               \
-                                                "msr CPSR_c, r1 \n\t"                               \
-                                                :                                                   \
-                                                : "r" (_SEGGER_RTT__LockState)                                   \
-                                                : "r0", "r1", "cc"                                  \
-                                                );                                                  \
-                            }
   #endif
 #endif
 
@@ -304,25 +212,11 @@ Revision: $Rev: 24316 $
 */
 #ifdef __ICCRX__
   #define SEGGER_RTT_LOCK()   {                                                                     \
-                                unsigned long _SEGGER_RTT__LockState;                                            \
-                                _SEGGER_RTT__LockState = __get_interrupt_state();                                \
+                                unsigned long LockState;                                            \
+                                LockState = __get_interrupt_state();                                \
                                 __disable_interrupt();
 
-  #define SEGGER_RTT_UNLOCK()   __set_interrupt_state(_SEGGER_RTT__LockState);                                   \
-                              }
-#endif
-
-/*********************************************************************
-*
-*       RTT lock configuration for IAR RL78
-*/
-#ifdef __ICCRL78__
-  #define SEGGER_RTT_LOCK()   {                                                                     \
-                                __istate_t _SEGGER_RTT__LockState;                                               \
-                                _SEGGER_RTT__LockState = __get_interrupt_state();                                \
-                                __disable_interrupt();
-
-  #define SEGGER_RTT_UNLOCK()   __set_interrupt_state(_SEGGER_RTT__LockState);                                   \
+  #define SEGGER_RTT_UNLOCK()   __set_interrupt_state(LockState);                                   \
                               }
 #endif
 
@@ -333,13 +227,13 @@ Revision: $Rev: 24316 $
 #ifdef __CC_ARM
   #if (defined __TARGET_ARCH_6S_M)
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  register unsigned char _SEGGER_RTT__PRIMASK __asm( "primask");                 \
-                                  _SEGGER_RTT__LockState = _SEGGER_RTT__PRIMASK;                                              \
-                                  _SEGGER_RTT__PRIMASK = 1u;                                                     \
+                                  unsigned int LockState;                                           \
+                                  register unsigned char PRIMASK __asm( "primask");                 \
+                                  LockState = PRIMASK;                                              \
+                                  PRIMASK = 1u;                                                     \
                                   __schedule_barrier();
 
-    #define SEGGER_RTT_UNLOCK()   _SEGGER_RTT__PRIMASK = _SEGGER_RTT__LockState;                                              \
+    #define SEGGER_RTT_UNLOCK()   PRIMASK = LockState;                                              \
                                   __schedule_barrier();                                             \
                                 }
   #elif (defined(__TARGET_ARCH_7_M) || defined(__TARGET_ARCH_7E_M))
@@ -347,13 +241,13 @@ Revision: $Rev: 24316 $
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
+                                  unsigned int LockState;                                           \
                                   register unsigned char BASEPRI __asm( "basepri");                 \
-                                  _SEGGER_RTT__LockState = BASEPRI;                                              \
+                                  LockState = BASEPRI;                                              \
                                   BASEPRI = SEGGER_RTT_MAX_INTERRUPT_PRIORITY;                      \
                                   __schedule_barrier();
 
-    #define SEGGER_RTT_UNLOCK()   BASEPRI = _SEGGER_RTT__LockState;                                              \
+    #define SEGGER_RTT_UNLOCK()   BASEPRI = LockState;                                              \
                                   __schedule_barrier();                                             \
                                 }
   #endif
@@ -366,67 +260,38 @@ Revision: $Rev: 24316 $
 #ifdef __TI_ARM__
   #if defined (__TI_ARM_V6M0__)
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = __get_PRIMASK();                                      \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_PRIMASK();                                      \
                                   __set_PRIMASK(1);
 
-    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(_SEGGER_RTT__LockState);                                         \
+    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(LockState);                                         \
                                 }
   #elif (defined (__TI_ARM_V7M3__) || defined (__TI_ARM_V7M4__))
     #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
       #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
     #endif
     #define SEGGER_RTT_LOCK()   {                                                                   \
-                                  unsigned int _SEGGER_RTT__LockState;                                           \
-                                  _SEGGER_RTT__LockState = _set_interrupt_priority(SEGGER_RTT_MAX_INTERRUPT_PRIORITY);
+                                  unsigned int LockState;                                           \
+                                  LockState = OS_GetBASEPRI();                                      \
+                                  OS_SetBASEPRI(SEGGER_RTT_MAX_INTERRUPT_PRIORITY);
 
-    #define SEGGER_RTT_UNLOCK()   _set_interrupt_priority(_SEGGER_RTT__LockState);                               \
+    #define SEGGER_RTT_UNLOCK()   OS_SetBASEPRI(LockState);                                         \
                                 }
   #endif
 #endif
 
-/*********************************************************************
-*
-*       RTT lock configuration for CCRX
-*/
-#ifdef __RX
-  #include <machine.h>
-  #define SEGGER_RTT_LOCK()   {                                                                     \
-                                unsigned long _SEGGER_RTT__LockState;                                            \
-                                _SEGGER_RTT__LockState = get_psw() & 0x010000;                                   \
-                                clrpsw_i();
-
-  #define SEGGER_RTT_UNLOCK()   set_psw(get_psw() | _SEGGER_RTT__LockState);                                     \
-                              }
-#endif
-
-/*********************************************************************
-*
-*       RTT lock configuration for embOS Simulation on Windows
-*       (Can also be used for generic RTT locking with embOS)
-*/
-#if defined(WIN32) || defined(SEGGER_RTT_LOCK_EMBOS)
-
-void OS_SIM_EnterCriticalSection(void);
-void OS_SIM_LeaveCriticalSection(void);
-
-#define SEGGER_RTT_LOCK()       {                                                                   \
-                                  OS_SIM_EnterCriticalSection();
-
-#define SEGGER_RTT_UNLOCK()       OS_SIM_LeaveCriticalSection();                                    \
-                                }
-#endif
-
 /*********************************************************************
 *
 *       RTT lock configuration fallback
 */
 #ifndef   SEGGER_RTT_LOCK
-  #define SEGGER_RTT_LOCK()                // Lock RTT (nestable)   (i.e. disable interrupts)
+  void SEGGER_SYSVIEW_X_RTT_Lock(void);
+  #define SEGGER_RTT_LOCK()                SEGGER_SYSVIEW_X_RTT_Lock() // Lock RTT (nestable)   (i.e. disable interrupts)
 #endif
 
 #ifndef   SEGGER_RTT_UNLOCK
-  #define SEGGER_RTT_UNLOCK()              // Unlock RTT (nestable) (i.e. enable previous interrupt lock state)
+  void SEGGER_SYSVIEW_X_RTT_Unlock(void);
+  #define SEGGER_RTT_UNLOCK()              SEGGER_SYSVIEW_X_RTT_Unlock() // Unlock RTT (nestable) (i.e. enable previous interrupt lock state)
 #endif
 
 #endif

components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -47,43 +52,127 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 
 File    : SEGGER_SYSVIEW_Conf.h
-Purpose : SEGGER SystemView configuration file.
-          Set defines which deviate from the defaults (see SEGGER_SYSVIEW_ConfDefaults.h) here.
-Revision: $Rev: 21292 $
-
-Additional information:
-  Required defines which must be set are:
-    SEGGER_SYSVIEW_GET_TIMESTAMP
-    SEGGER_SYSVIEW_GET_INTERRUPT_ID
-  For known compilers and cores, these might be set to good defaults
-  in SEGGER_SYSVIEW_ConfDefaults.h.
-
-  SystemView needs a (nestable) locking mechanism.
-  If not defined, the RTT locking mechanism is used,
-  which then needs to be properly configured.
+Purpose : SEGGER SystemView configuration.
+Revision: $Rev: 5927 $
 */
 
 #ifndef SEGGER_SYSVIEW_CONF_H
 #define SEGGER_SYSVIEW_CONF_H
 
+#include "soc/soc.h"
+
+/*********************************************************************
+*
+*       Defines, fixed
+*
+**********************************************************************
+*/
+//
+// Constants for known core configuration
+//
+#define SEGGER_SYSVIEW_CORE_OTHER   0
+#define SEGGER_SYSVIEW_CORE_CM0     1 // Cortex-M0/M0+/M1
+#define SEGGER_SYSVIEW_CORE_CM3     2 // Cortex-M3/M4/M7
+#define SEGGER_SYSVIEW_CORE_RX      3 // Renesas RX
+
+#if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)
+  #ifdef __ARM_ARCH_6M__
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__ICCARM__)
+  #if (defined (__ARM6M__) && (__CORE__ == __ARM6M__))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif ((defined (__ARM7M__) && (__CORE__ == __ARM7M__)) || (defined (__ARM7EM__) && (__CORE__ == __ARM7EM__)))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__CC_ARM)
+  #if (defined(__TARGET_ARCH_6S_M))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif (defined(__TARGET_ARCH_7_M) || defined(__TARGET_ARCH_7E_M))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__TI_ARM__)
+  #ifdef __TI_ARM_V6M0__
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
+  #elif (defined(__TI_ARM_V7M3__) || defined(__TI_ARM_V7M4__))
+    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
+  #endif
+#elif defined(__ICCRX__)
+  #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
+#elif defined(__RX)
+  #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
+#endif
+
+#ifndef   SEGGER_SYSVIEW_CORE
+  #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_OTHER
+#endif
+
 /*********************************************************************
 *
 *       Defines, configurable
 *
 **********************************************************************
 */
+/*********************************************************************
+*
+*       SystemView buffer configuration
+*/
+#define SEGGER_SYSVIEW_RTT_BUFFER_SIZE      1024                                // Number of bytes that SystemView uses for the buffer.
+#define SEGGER_SYSVIEW_RTT_CHANNEL          1                                   // The RTT channel that SystemView will use. 0: Auto selection
+
+#define SEGGER_SYSVIEW_USE_STATIC_BUFFER    1                                   // Use a static buffer to generate events instead of a buffer on the stack
+
+#define SEGGER_SYSVIEW_POST_MORTEM_MODE     0                                   // 1: Enable post mortem analysis mode
 
 /*********************************************************************
-* TODO: Add your defines here.                                       *
-**********************************************************************
+*
+*       SystemView timestamp configuration
 */
+#if SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3
+  #define SEGGER_SYSVIEW_GET_TIMESTAMP()      (*(U32 *)(0xE0001004))            // Retrieve a system timestamp. Cortex-M cycle counter.
+  #define SEGGER_SYSVIEW_TIMESTAMP_BITS       32                                // Define number of valid bits low-order delivered by clock source
+#else
+  #define SEGGER_SYSVIEW_GET_TIMESTAMP()      SEGGER_SYSVIEW_X_GetTimestamp()   // Retrieve a system timestamp via user-defined function
+  #define SEGGER_SYSVIEW_TIMESTAMP_BITS       32                                // Define number of valid bits low-order delivered by SEGGER_SYSVIEW_X_GetTimestamp()
+#endif
 
+/*********************************************************************
+*
+*       SystemView Id configuration
+*/
+//TODO: optimise it
+#define SEGGER_SYSVIEW_ID_BASE         SOC_DROM_LOW                             // Default value for the lowest Id reported by the application. Can be overridden by the application via SEGGER_SYSVIEW_SetRAMBase(). (i.e. 0x20000000 when all Ids are an address in this RAM)
+#define SEGGER_SYSVIEW_ID_SHIFT        0                                        // Number of bits to shift the Id to save bandwidth. (i.e. 2 when Ids are 4 byte aligned)
+
+/*********************************************************************
+*
+*       SystemView interrupt configuration
+*/
+#if SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3
+  #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   ((*(U32 *)(0xE000ED04)) & 0x1FF)  // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[8:0] = active vector)
+#elif SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM0
+  #if defined(__ICCARM__)
+    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   (__get_IPSR())                  // Workaround for IAR, which might do a byte-access to 0xE000ED04. Read IPSR instead.
+  #else
+    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   ((*(U32 *)(0xE000ED04)) & 0x3F) // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[5:0] = active vector)
+  #endif
+#else
+  #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   SEGGER_SYSVIEW_X_GetInterruptId() // Get the currently active interrupt Id from the user-provided function.
+#endif
+
+unsigned SEGGER_SYSVIEW_X_SysView_Lock(void);
+void SEGGER_SYSVIEW_X_SysView_Unlock(unsigned int_state);
+// to be recursive save IRQ status on the stack of the caller
+#define SEGGER_SYSVIEW_LOCK()   unsigned _SYSVIEW_int_state = SEGGER_SYSVIEW_X_SysView_Lock()
+#define SEGGER_SYSVIEW_UNLOCK() SEGGER_SYSVIEW_X_SysView_Unlock(_SYSVIEW_int_state)
 
 #endif  // SEGGER_SYSVIEW_CONF_H
 

components/app_trace/sys_view/SEGGER/SEGGER.h

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -49,20 +52,18 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ----------------------------------------------------------------------
 File    : SEGGER.h
 Purpose : Global types etc & general purpose utility functions
-Revision: $Rev: 18102 $
 ---------------------------END-OF-HEADER------------------------------
 */
 
 #ifndef SEGGER_H            // Guard against multiple inclusion
 #define SEGGER_H
 
-#include <stdarg.h>         // For va_list.
 #include "Global.h"         // Type definitions: U8, U16, U32, I8, I16, I32
 
 #if defined(__cplusplus)
@@ -77,28 +78,18 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 */
 
 #ifndef INLINE
-  #if (defined(__ICCARM__) || defined(__RX) || defined(__ICCRX__))
+  #ifdef _WIN32
     //
-    // Other known compilers.
+    // Microsoft VC6 and newer.
+    // Force inlining without cost checking.
     //
-    #define INLINE  inline
+    #define INLINE  __forceinline
   #else
-    #if (defined(_WIN32) && !defined(__clang__))
+    #if (defined(__ICCARM__) || defined(__CC_ARM) || defined(__GNUC__) || defined(__RX) || defined(__ICCRX__))
       //
-      // Microsoft VC6 and newer.
-      // Force inlining without cost checking.
+      // Other known compilers.
       //
-      #define INLINE  __forceinline
-    #elif defined(__GNUC__) || defined(__clang__)
-      //
-      // Force inlining with GCC + clang
-      //
-      #define INLINE inline __attribute__((always_inline))
-    #elif (defined(__CC_ARM))
-      //
-      // Force inlining with ARMCC (Keil)
-      //
-      #define INLINE  __inline
+      #define INLINE  inline
     #else
       //
       // Unknown compilers.
@@ -119,29 +110,6 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 #define SEGGER_MIN(a,b)            (((a) < (b)) ? (a) : (b))
 #define SEGGER_MAX(a,b)            (((a) > (b)) ? (a) : (b))
 
-#ifndef   SEGGER_USE_PARA                   // Some compiler complain about unused parameters.
-  #define SEGGER_USE_PARA(Para) (void)Para  // This works for most compilers.
-#endif
-
-#define SEGGER_ADDR2PTR(Type, Addr)  (/*lint -e(923) -e(9078)*/((Type*)((PTR_ADDR)(Addr))))    // Allow cast from address to pointer.
-#define SEGGER_PTR2ADDR(p)           (/*lint -e(923) -e(9078)*/((PTR_ADDR)(p)))                // Allow cast from pointer to address.
-#define SEGGER_PTR2PTR(Type, p)      (/*lint -e(740) -e(826) -e(9079) -e(9087)*/((Type*)(p)))  // Allow cast from one pointer type to another (ignore different size).
-#define SEGGER_PTR_DISTANCE(p0, p1)  (SEGGER_PTR2ADDR(p0) - SEGGER_PTR2ADDR(p1))
-
-/*********************************************************************
-*
-*       Defines
-*
-**********************************************************************
-*/
-
-#define SEGGER_PRINTF_FLAG_ADJLEFT    (1 << 0)
-#define SEGGER_PRINTF_FLAG_SIGNFORCE  (1 << 1)
-#define SEGGER_PRINTF_FLAG_SIGNSPACE  (1 << 2)
-#define SEGGER_PRINTF_FLAG_PRECEED    (1 << 3)
-#define SEGGER_PRINTF_FLAG_ZEROPAD    (1 << 4)
-#define SEGGER_PRINTF_FLAG_NEGATIVE   (1 << 5)
-
 /*********************************************************************
 *
 *       Types
@@ -150,45 +118,18 @@ extern "C" {     /* Make sure we have C-declarations in C++ programs */
 */
 
 typedef struct {
-  char* pBuffer;
+  char *pBuffer;
   int   BufferSize;
   int   Cnt;
 } SEGGER_BUFFER_DESC;
 
 typedef struct {
-  unsigned int CacheLineSize;                             // 0: No Cache. Most Systems such as ARM9 use a 32 bytes cache line size.
-  void (*pfDMB)       (void);                             // Optional DMB function for Data Memory Barrier to make sure all memory operations are completed.
-  void (*pfClean)     (void *p, unsigned long NumBytes);  // Optional clean function for cached memory.
-  void (*pfInvalidate)(void *p, unsigned long NumBytes);  // Optional invalidate function for cached memory.
+  int  CacheLineSize;                                // 0: No Cache. Most Systems such as ARM9 use a 32 bytes cache line size.
+  void (*pfDMB)       (void);                        // Optional DMB function for Data Memory Barrier to make sure all memory operations are completed.
+  void (*pfClean)     (void *p, unsigned NumBytes);  // Optional clean function for cached memory.
+  void (*pfInvalidate)(void *p, unsigned NumBytes);  // Optional invalidate function for cached memory.
 } SEGGER_CACHE_CONFIG;
 
-typedef struct SEGGER_SNPRINTF_CONTEXT_struct SEGGER_SNPRINTF_CONTEXT;
-
-struct SEGGER_SNPRINTF_CONTEXT_struct {
-  void*               pContext;                       // Application specific context.
-  SEGGER_BUFFER_DESC* pBufferDesc;                    // Buffer descriptor to use for output.
-  void (*pfFlush)(SEGGER_SNPRINTF_CONTEXT* pContext); // Callback executed once the buffer is full. Callback decides if the buffer gets cleared to store more or not.
-};
-
-typedef struct {
-  void (*pfStoreChar)       (SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, char c);
-  int  (*pfPrintUnsigned)   (SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, U32 v, unsigned Base, char Flags, int Width, int Precision);
-  int  (*pfPrintInt)        (SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, I32 v, unsigned Base, char Flags, int Width, int Precision);
-} SEGGER_PRINTF_API;
-
-typedef void (*SEGGER_pFormatter)(SEGGER_BUFFER_DESC* pBufferDesc, SEGGER_SNPRINTF_CONTEXT* pContext, const SEGGER_PRINTF_API* pApi, va_list* pParamList, char Lead, int Width, int Precision);
-
-typedef struct SEGGER_PRINTF_FORMATTER {
-  struct SEGGER_PRINTF_FORMATTER* pNext;              // Pointer to next formatter.
-  SEGGER_pFormatter               pfFormatter;        // Formatter function.
-  char                            Specifier;          // Format specifier.
-} SEGGER_PRINTF_FORMATTER;
-
-typedef struct {
-  U32 (*pfGetHPTimestamp)(void);          // Mandatory, pfGetHPTimestamp
-  int (*pfGetUID)        (U8 abUID[16]);  // Optional,  pfGetUID
-} SEGGER_BSP_API;
-
 /*********************************************************************
 *
 *       Utility functions
@@ -196,55 +137,14 @@ typedef struct {
 **********************************************************************
 */
 
-//
-// Memory operations.
-//
-void SEGGER_ARM_memcpy(void* pDest, const void* pSrc, int NumBytes);
-void SEGGER_memcpy    (void* pDest, const void* pSrc, unsigned NumBytes);
-void SEGGER_memxor    (void* pDest, const void* pSrc, unsigned NumBytes);
+void SEGGER_ARM_memcpy   (void *pDest, const void *pSrc, int NumBytes);
+void SEGGER_memcpy       (void *pDest, const void *pSrc, int NumBytes);
+void SEGGER_memxor       (void *pDest, const void *pSrc, unsigned NumBytes);
+void SEGGER_StoreChar    (SEGGER_BUFFER_DESC *p, char c);
+void SEGGER_PrintUnsigned(SEGGER_BUFFER_DESC *pBufferDesc, U32 v, unsigned Base, int NumDigits);
+void SEGGER_PrintInt     (SEGGER_BUFFER_DESC *pBufferDesc, I32 v, unsigned Base, unsigned NumDigits);
+int  SEGGER_snprintf     (char *pBuffer, int BufferSize, const char *sFormat, ...);
 
-//
-// String functions.
-//
-int      SEGGER_atoi       (const char* s);
-int      SEGGER_isalnum    (int c);
-int      SEGGER_isalpha    (int c);
-unsigned SEGGER_strlen     (const char* s);
-int      SEGGER_tolower    (int c);
-int      SEGGER_strcasecmp (const char* sText1, const char* sText2);
-int      SEGGER_strncasecmp(const char *sText1, const char *sText2, unsigned Count);
-
-//
-// Buffer/printf related.
-//
-void SEGGER_StoreChar    (SEGGER_BUFFER_DESC* pBufferDesc, char c);
-void SEGGER_PrintUnsigned(SEGGER_BUFFER_DESC* pBufferDesc, U32 v, unsigned Base, int Precision);
-void SEGGER_PrintInt     (SEGGER_BUFFER_DESC* pBufferDesc, I32 v, unsigned Base, int Precision);
-int  SEGGER_snprintf     (char* pBuffer, int BufferSize, const char* sFormat, ...);
-int  SEGGER_vsnprintf    (char* pBuffer, int BufferSize, const char* sFormat, va_list ParamList);
-int  SEGGER_vsnprintfEx  (SEGGER_SNPRINTF_CONTEXT* pContext, const char* sFormat, va_list ParamList);
-
-int  SEGGER_PRINTF_AddFormatter       (SEGGER_PRINTF_FORMATTER* pFormatter, SEGGER_pFormatter pfFormatter, char c);
-void SEGGER_PRINTF_AddDoubleFormatter (void);
-void SEGGER_PRINTF_AddIPFormatter     (void);
-void SEGGER_PRINTF_AddBLUEFormatter   (void);
-void SEGGER_PRINTF_AddCONNECTFormatter(void);
-void SEGGER_PRINTF_AddSSLFormatter    (void);
-void SEGGER_PRINTF_AddSSHFormatter    (void);
-void SEGGER_PRINTF_AddHTMLFormatter   (void);
-
-//
-// BSP abstraction API.
-//
-int  SEGGER_BSP_GetUID  (U8 abUID[16]);
-int  SEGGER_BSP_GetUID32(U32* pUID);
-void SEGGER_BSP_SetAPI  (const SEGGER_BSP_API* pAPI);
-void SEGGER_BSP_SeedUID (void);
-
-//
-// Other API.
-//
-void SEGGER_VERSION_GetString(char acText[8], unsigned Version);
 
 #if defined(__cplusplus)
 }                /* Make sure we have C-declarations in C++ programs */

components/app_trace/sys_view/SEGGER/SEGGER_RTT.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -47,7 +52,7 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 ---------------------------END-OF-HEADER------------------------------
@@ -55,222 +60,14 @@ File    : SEGGER_RTT.h
 Purpose : Implementation of SEGGER real-time transfer which allows
           real-time communication on targets which support debugger
           memory accesses while the CPU is running.
-Revision: $Rev: 25842 $
+Revision: $Rev: 5626 $
 ----------------------------------------------------------------------
 */
 
 #ifndef SEGGER_RTT_H
 #define SEGGER_RTT_H
 
-#include "../Config/SEGGER_RTT_Conf.h"
-
-/*********************************************************************
-*
-*       Defines, defaults
-*
-**********************************************************************
-*/
-
-#ifndef RTT_USE_ASM
-  //
-  // Some cores support out-of-order memory accesses (reordering of memory accesses in the core)
-  // For such cores, we need to define a memory barrier to guarantee the order of certain accesses to the RTT ring buffers.
-  // Needed for:
-  //   Cortex-M7 (ARMv7-M)
-  //   Cortex-M23 (ARM-v8M)
-  //   Cortex-M33 (ARM-v8M)
-  //   Cortex-A/R (ARM-v7A/R)
-  //
-  // We do not explicitly check for "Embedded Studio" as the compiler in use determines what we support.
-  // You can use an external toolchain like IAR inside ES. So there is no point in checking for "Embedded Studio"
-  //
-  #if (defined __CROSSWORKS_ARM)                  // Rowley Crossworks
-    #define _CC_HAS_RTT_ASM_SUPPORT 1
-    #if (defined __ARM_ARCH_7M__)                 // Cortex-M3
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-    #elif (defined __ARM_ARCH_7EM__)              // Cortex-M4/M7
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_BASE__)          // Cortex-M23
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_MAIN__)          // Cortex-M33
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #else
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-    #endif
-  #elif (defined __ARMCC_VERSION)
-    //
-    // ARM compiler
-    // ARM compiler V6.0 and later is clang based.
-    // Our ASM part is compatible to clang.
-    //
-    #if (__ARMCC_VERSION >= 6000000)
-      #define _CC_HAS_RTT_ASM_SUPPORT 1
-    #else
-      #define _CC_HAS_RTT_ASM_SUPPORT 0
-    #endif
-    #if (defined __ARM_ARCH_6M__)                 // Cortex-M0 / M1
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0         // No ASM support for this architecture
-    #elif (defined __ARM_ARCH_7M__)               // Cortex-M3
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-    #elif (defined __ARM_ARCH_7EM__)              // Cortex-M4/M7
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_BASE__)          // Cortex-M23
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_MAIN__)          // Cortex-M33
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif ((defined __ARM_ARCH_7A__) || (defined __ARM_ARCH_7R__))  // Cortex-A/R 32-bit ARMv7-A/R
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #else
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-    #endif
-  #elif ((defined __GNUC__) || (defined __clang__))
-    //
-    // GCC / Clang
-    //
-    #define _CC_HAS_RTT_ASM_SUPPORT 1
-    // ARM 7/9: __ARM_ARCH_5__ / __ARM_ARCH_5E__ / __ARM_ARCH_5T__ / __ARM_ARCH_5T__ / __ARM_ARCH_5TE__
-    #if (defined __ARM_ARCH_7M__)                 // Cortex-M3
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-    #elif (defined __ARM_ARCH_7EM__)              // Cortex-M4/M7
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1         // Only Cortex-M7 needs a DMB but we cannot distinguish M4 and M7 here...
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_BASE__)          // Cortex-M23
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif (defined __ARM_ARCH_8M_MAIN__)          // Cortex-M33
-      #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #elif ((defined __ARM_ARCH_7A__) || (defined __ARM_ARCH_7R__))  // Cortex-A/R 32-bit ARMv7-A/R
-      #define _CORE_NEEDS_DMB           1
-      #define RTT__DMB() __asm volatile ("dmb\n" : : :);
-    #else
-      #define _CORE_HAS_RTT_ASM_SUPPORT 0
-    #endif
-  #elif ((defined __IASMARM__) || (defined __ICCARM__))
-    //
-    // IAR assembler/compiler
-    //
-    #define _CC_HAS_RTT_ASM_SUPPORT 1
-    #if (__VER__ < 6300000)
-      #define VOLATILE
-    #else
-      #define VOLATILE volatile
-    #endif
-    #if (defined __ARM7M__)                            // Needed for old versions that do not know the define yet
-      #if (__CORE__ == __ARM7M__)                      // Cortex-M3
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-      #endif
-    #endif
-    #if (defined __ARM7EM__)
-      #if (__CORE__ == __ARM7EM__)                     // Cortex-M4/M7
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM8M_BASELINE__)
-      #if (__CORE__ == __ARM8M_BASELINE__)             // Cortex-M23
-        #define _CORE_HAS_RTT_ASM_SUPPORT 0
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM8M_MAINLINE__)
-      #if (__CORE__ == __ARM8M_MAINLINE__)             // Cortex-M33
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM8EM_MAINLINE__)
-      #if (__CORE__ == __ARM8EM_MAINLINE__)            // Cortex-???
-        #define _CORE_HAS_RTT_ASM_SUPPORT 1
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM7A__)
-      #if (__CORE__ == __ARM7A__)                      // Cortex-A 32-bit ARMv7-A
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-    #if (defined __ARM7R__)
-      #if (__CORE__ == __ARM7R__)                      // Cortex-R 32-bit ARMv7-R
-        #define _CORE_NEEDS_DMB 1
-        #define RTT__DMB() asm VOLATILE ("DMB");
-      #endif
-    #endif
-// TBD: __ARM8A__ => Cortex-A 64-bit ARMv8-A
-// TBD: __ARM8R__ => Cortex-R 64-bit ARMv8-R
-  #else
-    //
-    // Other compilers
-    //
-    #define _CC_HAS_RTT_ASM_SUPPORT   0
-    #define _CORE_HAS_RTT_ASM_SUPPORT 0
-  #endif
-  //
-  // If IDE and core support the ASM version, enable ASM version by default
-  //
-  #ifndef _CORE_HAS_RTT_ASM_SUPPORT
-    #define _CORE_HAS_RTT_ASM_SUPPORT 0              // Default for unknown cores
-  #endif
-  #if (_CC_HAS_RTT_ASM_SUPPORT && _CORE_HAS_RTT_ASM_SUPPORT)
-    #define RTT_USE_ASM                           (1)
-  #else
-    #define RTT_USE_ASM                           (0)
-  #endif
-#endif
-
-#ifndef _CORE_NEEDS_DMB
-  #define _CORE_NEEDS_DMB 0
-#endif
-
-#ifndef RTT__DMB
-  #if _CORE_NEEDS_DMB
-    #error "Don't know how to place inline assembly for DMB"
-  #else
-    #define RTT__DMB()
-  #endif
-#endif
-
-#ifndef SEGGER_RTT_CPU_CACHE_LINE_SIZE
-  #define SEGGER_RTT_CPU_CACHE_LINE_SIZE (0)   // On most target systems where RTT is used, we do not have a CPU cache, therefore 0 is a good default here
-#endif
-
-#ifndef SEGGER_RTT_UNCACHED_OFF
-  #if SEGGER_RTT_CPU_CACHE_LINE_SIZE
-    #error "SEGGER_RTT_UNCACHED_OFF must be defined when setting SEGGER_RTT_CPU_CACHE_LINE_SIZE != 0"
-  #else
-    #define SEGGER_RTT_UNCACHED_OFF (0)
-  #endif
-#endif
-#if RTT_USE_ASM
-  #if SEGGER_RTT_CPU_CACHE_LINE_SIZE
-    #error "RTT_USE_ASM is not available if SEGGER_RTT_CPU_CACHE_LINE_SIZE != 0"
-  #endif
-#endif
-
-#ifndef SEGGER_RTT_ASM  // defined when SEGGER_RTT.h is included from assembly file
-#include <stdlib.h>
-#include <stdarg.h>
+#include "SEGGER_RTT_Conf.h"
 
 /*********************************************************************
 *
@@ -279,21 +76,6 @@ Revision: $Rev: 25842 $
 **********************************************************************
 */
 
-//
-// Determine how much we must pad the control block to make it a multiple of a cache line in size
-// Assuming: U8 = 1B
-//           U16 = 2B
-//           U32 = 4B
-//           U8/U16/U32* = 4B
-//
-#if SEGGER_RTT_CPU_CACHE_LINE_SIZE    // Avoid division by zero in case we do not have any cache
-  #define SEGGER_RTT__ROUND_UP_2_CACHE_LINE_SIZE(NumBytes) (((NumBytes + SEGGER_RTT_CPU_CACHE_LINE_SIZE - 1) / SEGGER_RTT_CPU_CACHE_LINE_SIZE) * SEGGER_RTT_CPU_CACHE_LINE_SIZE)
-#else
-  #define SEGGER_RTT__ROUND_UP_2_CACHE_LINE_SIZE(NumBytes) (NumBytes)
-#endif
-#define SEGGER_RTT__CB_SIZE                              (16 + 4 + 4 + (SEGGER_RTT_MAX_NUM_UP_BUFFERS * 24) + (SEGGER_RTT_MAX_NUM_DOWN_BUFFERS * 24))
-#define SEGGER_RTT__CB_PADDING                           (SEGGER_RTT__ROUND_UP_2_CACHE_LINE_SIZE(SEGGER_RTT__CB_SIZE) - SEGGER_RTT__CB_SIZE)
-
 /*********************************************************************
 *
 *       Types
@@ -311,7 +93,7 @@ typedef struct {
             unsigned SizeOfBuffer;  // Buffer size in bytes. Note that one byte is lost, as this implementation does not fill up the buffer in order to avoid the problem of being unable to distinguish between full and empty.
             unsigned WrOff;         // Position of next item to be written by either target.
   volatile  unsigned RdOff;         // Position of next item to be read by host. Must be volatile since it may be modified by host.
-            unsigned Flags;         // Contains configuration flags. Flags[31:24] are used for validity check and must be zero. Flags[23:2] are reserved for future use. Flags[1:0] = RTT operating mode.
+            unsigned Flags;         // Contains configuration flags
 } SEGGER_RTT_BUFFER_UP;
 
 //
@@ -324,7 +106,7 @@ typedef struct {
             unsigned SizeOfBuffer;  // Buffer size in bytes. Note that one byte is lost, as this implementation does not fill up the buffer in order to avoid the problem of being unable to distinguish between full and empty.
   volatile  unsigned WrOff;         // Position of next item to be written by host. Must be volatile since it may be modified by host.
             unsigned RdOff;         // Position of next item to be read by target (down-buffer).
-            unsigned Flags;         // Contains configuration flags. Flags[31:24] are used for validity check and must be zero. Flags[23:2] are reserved for future use. Flags[1:0] = RTT operating mode.
+            unsigned Flags;         // Contains configuration flags
 } SEGGER_RTT_BUFFER_DOWN;
 
 //
@@ -338,9 +120,6 @@ typedef struct {
   int                     MaxNumDownBuffers;                        // Initialized to SEGGER_RTT_MAX_NUM_DOWN_BUFFERS (type. 2)
   SEGGER_RTT_BUFFER_UP    aUp[SEGGER_RTT_MAX_NUM_UP_BUFFERS];       // Up buffers, transferring information up from target via debug probe to host
   SEGGER_RTT_BUFFER_DOWN  aDown[SEGGER_RTT_MAX_NUM_DOWN_BUFFERS];   // Down buffers, transferring information down from host via debug probe to target
-#if SEGGER_RTT__CB_PADDING
-  unsigned char           aDummy[SEGGER_RTT__CB_PADDING];
-#endif
 } SEGGER_RTT_CB;
 
 /*********************************************************************
@@ -367,7 +146,6 @@ int          SEGGER_RTT_ConfigDownBuffer        (unsigned BufferIndex, const cha
 int          SEGGER_RTT_GetKey                  (void);
 unsigned     SEGGER_RTT_HasData                 (unsigned BufferIndex);
 int          SEGGER_RTT_HasKey                  (void);
-unsigned     SEGGER_RTT_HasDataUp               (unsigned BufferIndex);
 void         SEGGER_RTT_Init                    (void);
 unsigned     SEGGER_RTT_Read                    (unsigned BufferIndex,       void* pBuffer, unsigned BufferSize);
 unsigned     SEGGER_RTT_ReadNoLock              (unsigned BufferIndex,       void* pData,   unsigned BufferSize);
@@ -379,17 +157,10 @@ int          SEGGER_RTT_WaitKey                 (void);
 unsigned     SEGGER_RTT_Write                   (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
 unsigned     SEGGER_RTT_WriteNoLock             (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
 unsigned     SEGGER_RTT_WriteSkipNoLock         (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-unsigned     SEGGER_RTT_ASM_WriteSkipNoLock     (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
 unsigned     SEGGER_RTT_WriteString             (unsigned BufferIndex, const char* s);
 void         SEGGER_RTT_WriteWithOverwriteNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-unsigned     SEGGER_RTT_PutChar                 (unsigned BufferIndex, char c);
-unsigned     SEGGER_RTT_PutCharSkip             (unsigned BufferIndex, char c);
-unsigned     SEGGER_RTT_PutCharSkipNoLock       (unsigned BufferIndex, char c);
-unsigned     SEGGER_RTT_GetAvailWriteSpace      (unsigned BufferIndex);
-unsigned     SEGGER_RTT_GetBytesInBuffer        (unsigned BufferIndex);
-
-void         SEGGER_RTT_ESP_FlushNoLock         (unsigned long min_sz, unsigned long tmo);
-void         SEGGER_RTT_ESP_Flush               (unsigned long min_sz, unsigned long tmo);
+void         SEGGER_RTT_ESP_FlushNoLock       (unsigned long min_sz, unsigned long tmo);
+void         SEGGER_RTT_ESP_Flush             (unsigned long min_sz, unsigned long tmo);
 //
 // Function macro for performance optimization
 //
@@ -397,31 +168,14 @@ void         SEGGER_RTT_ESP_Flush               (unsigned long min_sz, unsigned
 // For ESP32 we use our own implementation of RTT, so this macro should not check SEGGER's RTT buffer state.
 #define      SEGGER_RTT_HASDATA(n)       (1)
 
-#if RTT_USE_ASM
-  #define SEGGER_RTT_WriteSkipNoLock  SEGGER_RTT_ASM_WriteSkipNoLock
-#endif
-
-/*********************************************************************
-*
-*       RTT transfer functions to send RTT data via other channels.
-*
-**********************************************************************
-*/
-unsigned     SEGGER_RTT_ReadUpBuffer            (unsigned BufferIndex, void* pBuffer, unsigned BufferSize);
-unsigned     SEGGER_RTT_ReadUpBufferNoLock      (unsigned BufferIndex, void* pData, unsigned BufferSize);
-unsigned     SEGGER_RTT_WriteDownBuffer         (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-unsigned     SEGGER_RTT_WriteDownBufferNoLock   (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
-
-#define      SEGGER_RTT_HASDATA_UP(n)    (((SEGGER_RTT_BUFFER_UP*)((char*)&_SEGGER_RTT.aUp[n] + SEGGER_RTT_UNCACHED_OFF))->WrOff - ((SEGGER_RTT_BUFFER_UP*)((char*)&_SEGGER_RTT.aUp[n] + SEGGER_RTT_UNCACHED_OFF))->RdOff)   // Access uncached to make sure we see changes made by the J-Link side and all of our changes go into HW directly
-
 /*********************************************************************
 *
 *       RTT "Terminal" API functions
 *
 **********************************************************************
 */
-int     SEGGER_RTT_SetTerminal        (unsigned char TerminalId);
-int     SEGGER_RTT_TerminalOut        (unsigned char TerminalId, const char* s);
+int     SEGGER_RTT_SetTerminal        (char TerminalId);
+int     SEGGER_RTT_TerminalOut        (char TerminalId, const char* s);
 
 /*********************************************************************
 *
@@ -430,14 +184,10 @@ int     SEGGER_RTT_TerminalOut        (unsigned char TerminalId, const char* s);
 **********************************************************************
 */
 int SEGGER_RTT_printf(unsigned BufferIndex, const char * sFormat, ...);
-int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pParamList);
-
 #ifdef __cplusplus
   }
 #endif
 
-#endif // ifndef(SEGGER_RTT_ASM)
-
 /*********************************************************************
 *
 *       Defines
@@ -448,53 +198,53 @@ int SEGGER_RTT_vprintf(unsigned BufferIndex, const char * sFormat, va_list * pPa
 //
 // Operating modes. Define behavior if buffer is full (not enough space for entire message)
 //
-#define SEGGER_RTT_MODE_NO_BLOCK_SKIP         (0)     // Skip. Do not block, output nothing. (Default)
-#define SEGGER_RTT_MODE_NO_BLOCK_TRIM         (1)     // Trim: Do not block, output as much as fits.
-#define SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL    (2)     // Block: Wait until there is space in the buffer.
-#define SEGGER_RTT_MODE_MASK                  (3)
+#define SEGGER_RTT_MODE_NO_BLOCK_SKIP         (0U)     // Skip. Do not block, output nothing. (Default)
+#define SEGGER_RTT_MODE_NO_BLOCK_TRIM         (1U)     // Trim: Do not block, output as much as fits.
+#define SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL    (2U)     // Block: Wait until there is space in the buffer.
+#define SEGGER_RTT_MODE_MASK                  (3U)
 
 //
 // Control sequences, based on ANSI.
 // Can be used to control color, and clear the screen
 //
-#define RTT_CTRL_RESET                "\x1B[0m"         // Reset to default colors
-#define RTT_CTRL_CLEAR                "\x1B[2J"         // Clear screen, reposition cursor to top left
+#define RTT_CTRL_RESET                ""         // Reset to default colors
+#define RTT_CTRL_CLEAR                ""         // Clear screen, reposition cursor to top left
 
-#define RTT_CTRL_TEXT_BLACK           "\x1B[2;30m"
-#define RTT_CTRL_TEXT_RED             "\x1B[2;31m"
-#define RTT_CTRL_TEXT_GREEN           "\x1B[2;32m"
-#define RTT_CTRL_TEXT_YELLOW          "\x1B[2;33m"
-#define RTT_CTRL_TEXT_BLUE            "\x1B[2;34m"
-#define RTT_CTRL_TEXT_MAGENTA         "\x1B[2;35m"
-#define RTT_CTRL_TEXT_CYAN            "\x1B[2;36m"
-#define RTT_CTRL_TEXT_WHITE           "\x1B[2;37m"
+#define RTT_CTRL_TEXT_BLACK           ""
+#define RTT_CTRL_TEXT_RED             ""
+#define RTT_CTRL_TEXT_GREEN           ""
+#define RTT_CTRL_TEXT_YELLOW          ""
+#define RTT_CTRL_TEXT_BLUE            ""
+#define RTT_CTRL_TEXT_MAGENTA         ""
+#define RTT_CTRL_TEXT_CYAN            ""
+#define RTT_CTRL_TEXT_WHITE           ""
 
-#define RTT_CTRL_TEXT_BRIGHT_BLACK    "\x1B[1;30m"
-#define RTT_CTRL_TEXT_BRIGHT_RED      "\x1B[1;31m"
-#define RTT_CTRL_TEXT_BRIGHT_GREEN    "\x1B[1;32m"
-#define RTT_CTRL_TEXT_BRIGHT_YELLOW   "\x1B[1;33m"
-#define RTT_CTRL_TEXT_BRIGHT_BLUE     "\x1B[1;34m"
-#define RTT_CTRL_TEXT_BRIGHT_MAGENTA  "\x1B[1;35m"
-#define RTT_CTRL_TEXT_BRIGHT_CYAN     "\x1B[1;36m"
-#define RTT_CTRL_TEXT_BRIGHT_WHITE    "\x1B[1;37m"
+#define RTT_CTRL_TEXT_BRIGHT_BLACK    ""
+#define RTT_CTRL_TEXT_BRIGHT_RED      ""
+#define RTT_CTRL_TEXT_BRIGHT_GREEN    ""
+#define RTT_CTRL_TEXT_BRIGHT_YELLOW   ""
+#define RTT_CTRL_TEXT_BRIGHT_BLUE     ""
+#define RTT_CTRL_TEXT_BRIGHT_MAGENTA  ""
+#define RTT_CTRL_TEXT_BRIGHT_CYAN     ""
+#define RTT_CTRL_TEXT_BRIGHT_WHITE    ""
 
-#define RTT_CTRL_BG_BLACK             "\x1B[24;40m"
-#define RTT_CTRL_BG_RED               "\x1B[24;41m"
-#define RTT_CTRL_BG_GREEN             "\x1B[24;42m"
-#define RTT_CTRL_BG_YELLOW            "\x1B[24;43m"
-#define RTT_CTRL_BG_BLUE              "\x1B[24;44m"
-#define RTT_CTRL_BG_MAGENTA           "\x1B[24;45m"
-#define RTT_CTRL_BG_CYAN              "\x1B[24;46m"
-#define RTT_CTRL_BG_WHITE             "\x1B[24;47m"
+#define RTT_CTRL_BG_BLACK             ""
+#define RTT_CTRL_BG_RED               ""
+#define RTT_CTRL_BG_GREEN             ""
+#define RTT_CTRL_BG_YELLOW            ""
+#define RTT_CTRL_BG_BLUE              ""
+#define RTT_CTRL_BG_MAGENTA           ""
+#define RTT_CTRL_BG_CYAN              ""
+#define RTT_CTRL_BG_WHITE             ""
 
-#define RTT_CTRL_BG_BRIGHT_BLACK      "\x1B[4;40m"
-#define RTT_CTRL_BG_BRIGHT_RED        "\x1B[4;41m"
-#define RTT_CTRL_BG_BRIGHT_GREEN      "\x1B[4;42m"
-#define RTT_CTRL_BG_BRIGHT_YELLOW     "\x1B[4;43m"
-#define RTT_CTRL_BG_BRIGHT_BLUE       "\x1B[4;44m"
-#define RTT_CTRL_BG_BRIGHT_MAGENTA    "\x1B[4;45m"
-#define RTT_CTRL_BG_BRIGHT_CYAN       "\x1B[4;46m"
-#define RTT_CTRL_BG_BRIGHT_WHITE      "\x1B[4;47m"
+#define RTT_CTRL_BG_BRIGHT_BLACK      ""
+#define RTT_CTRL_BG_BRIGHT_RED        ""
+#define RTT_CTRL_BG_BRIGHT_GREEN      ""
+#define RTT_CTRL_BG_BRIGHT_YELLOW     ""
+#define RTT_CTRL_BG_BRIGHT_BLUE       ""
+#define RTT_CTRL_BG_BRIGHT_MAGENTA    ""
+#define RTT_CTRL_BG_BRIGHT_CYAN       ""
+#define RTT_CTRL_BG_BRIGHT_WHITE      ""
 
 
 #endif

components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.h

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -49,13 +52,13 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 File    : SEGGER_SYSVIEW.h
 Purpose : System visualization API.
-Revision: $Rev: 28237 $
+Revision: $Rev: 5626 $
 */
 
 #ifndef SEGGER_SYSVIEW_H
@@ -69,7 +72,6 @@ Revision: $Rev: 28237 $
 */
 
 #include "SEGGER.h"
-#include "SEGGER_SYSVIEW_ConfDefaults.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,10 +85,7 @@ extern "C" {
 **********************************************************************
 */
 
-#define SEGGER_SYSVIEW_MAJOR          3
-#define SEGGER_SYSVIEW_MINOR          32
-#define SEGGER_SYSVIEW_REV            0
-#define SEGGER_SYSVIEW_VERSION        ((SEGGER_SYSVIEW_MAJOR * 10000) + (SEGGER_SYSVIEW_MINOR * 100) + SEGGER_SYSVIEW_REV)
+#define SEGGER_SYSVIEW_VERSION        21000
 
 #define SEGGER_SYSVIEW_INFO_SIZE      9   // Minimum size, which has to be reserved for a packet. 1-2 byte of message type, 0-2  byte of payload length, 1-5 bytes of timestamp.
 #define SEGGER_SYSVIEW_QUANTA_U32     5   // Maximum number of bytes to encode a U32, should be reserved for each 32-bit value in a packet.
@@ -115,8 +114,8 @@ extern "C" {
 #define   SYSVIEW_EVTID_SYSTIME_CYCLES    12
 #define   SYSVIEW_EVTID_SYSTIME_US        13
 #define   SYSVIEW_EVTID_SYSDESC           14
-#define   SYSVIEW_EVTID_MARK_START        15
-#define   SYSVIEW_EVTID_MARK_STOP         16
+#define   SYSVIEW_EVTID_USER_START        15
+#define   SYSVIEW_EVTID_USER_STOP         16
 #define   SYSVIEW_EVTID_IDLE              17
 #define   SYSVIEW_EVTID_ISR_TO_SCHEDULER  18
 #define   SYSVIEW_EVTID_TIMER_ENTER       19
@@ -133,15 +132,6 @@ extern "C" {
 
 #define   SYSVIEW_EVTID_EX                31
 //
-// SystemView extended events. Sent with ID 31.
-//
-#define   SYSVIEW_EVTID_EX_MARK            0
-#define   SYSVIEW_EVTID_EX_NAME_MARKER     1
-#define   SYSVIEW_EVTID_EX_HEAP_DEFINE     2
-#define   SYSVIEW_EVTID_EX_HEAP_ALLOC      3
-#define   SYSVIEW_EVTID_EX_HEAP_ALLOC_EX   4
-#define   SYSVIEW_EVTID_EX_HEAP_FREE       5
-//
 // Event masks to disable/enable events
 //
 #define   SYSVIEW_EVTMASK_NOP               (1 << SYSVIEW_EVTID_NOP)
@@ -216,29 +206,6 @@ struct SEGGER_SYSVIEW_MODULE_STRUCT {
 
 typedef void (SEGGER_SYSVIEW_SEND_SYS_DESC_FUNC)(void);
 
-
-/*********************************************************************
-*
-*       Global data
-*
-**********************************************************************
-*/
-
-#ifdef   EXTERN
-  #undef EXTERN
-#endif
-
-#ifndef SEGGER_SYSVIEW_C       // Defined in SEGGER_SYSVIEW.c which includes this header beside other C-files
-  #define EXTERN extern
-#else
-  #define EXTERN
-#endif
-
-EXTERN unsigned int SEGGER_SYSVIEW_TickCnt;
-EXTERN unsigned int SEGGER_SYSVIEW_InterruptId;
-
-#undef EXTERN
-
 /*********************************************************************
 *
 *       API functions
@@ -263,8 +230,6 @@ void SEGGER_SYSVIEW_GetSysDesc                    (void);
 void SEGGER_SYSVIEW_SendTaskList                  (void);
 void SEGGER_SYSVIEW_SendTaskInfo                  (const SEGGER_SYSVIEW_TASKINFO* pInfo);
 void SEGGER_SYSVIEW_SendSysDesc                   (const char* sSysDesc);
-int  SEGGER_SYSVIEW_IsStarted                     (void);
-int  SEGGER_SYSVIEW_GetChannelID                  (void);
 // Checks whether tracing has been started
 U8 SEGGER_SYSVIEW_Started(void);
 
@@ -300,15 +265,8 @@ void SEGGER_SYSVIEW_OnTaskStartExec               (U32 TaskId);
 void SEGGER_SYSVIEW_OnTaskStopExec                (void);
 void SEGGER_SYSVIEW_OnTaskStartReady              (U32 TaskId);
 void SEGGER_SYSVIEW_OnTaskStopReady               (U32 TaskId, unsigned int Cause);
-void SEGGER_SYSVIEW_MarkStart                     (unsigned int MarkerId);
-void SEGGER_SYSVIEW_MarkStop                      (unsigned int MarkerId);
-void SEGGER_SYSVIEW_Mark                          (unsigned int MarkerId);
-void SEGGER_SYSVIEW_NameMarker                    (unsigned int MarkerId, const char* sName);
-
-void SEGGER_SYSVIEW_HeapDefine                    (void* pHeap, void* pBase, unsigned int HeapSize, unsigned int MetadataSize);
-void SEGGER_SYSVIEW_HeapAlloc                     (void* pHeap, void* pUserData, unsigned int UserDataLen);
-void SEGGER_SYSVIEW_HeapAllocEx                   (void* pHeap, void* pUserData, unsigned int UserDataLen, unsigned int Tag);
-void SEGGER_SYSVIEW_HeapFree                      (void* pHeap, void* pUserData);
+void SEGGER_SYSVIEW_OnUserStart                   (unsigned int UserId);       // Start of user defined event (such as a subroutine to profile)
+void SEGGER_SYSVIEW_OnUserStop                    (unsigned int UserId);       // Start of user defined event
 
 void SEGGER_SYSVIEW_NameResource                  (U32 ResourceId, const char* sName);
 
@@ -369,20 +327,10 @@ void SEGGER_SYSVIEW_Conf                          (void);
 U32  SEGGER_SYSVIEW_X_GetTimestamp                (void);
 U32  SEGGER_SYSVIEW_X_GetInterruptId              (void);
 
-void SEGGER_SYSVIEW_X_StartComm                   (void);
-void SEGGER_SYSVIEW_X_OnEventRecorded             (unsigned NumBytes);
-
 #ifdef __cplusplus
 }
 #endif
 
-/*********************************************************************
-*
-*       Compatibility API defines
-*/
-#define SEGGER_SYSVIEW_OnUserStart      SEGGER_SYSVIEW_MarkStart
-#define SEGGER_SYSVIEW_OnUserStop       SEGGER_SYSVIEW_MarkStop
-
 #endif
 
 /*************************** End of file ****************************/

components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -49,14 +52,14 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 File    : SEGGER_SYSVIEW_ConfDefaults.h
 Purpose : Defines defaults for configurable defines used in
           SEGGER SystemView.
-Revision: $Rev: 26230 $
+Revision: $Rev: 3734 $
 */
 
 #ifndef SEGGER_SYSVIEW_CONFDEFAULTS_H
@@ -78,182 +81,19 @@ extern "C" {
 
 /*********************************************************************
 *
-*       Defines, fixed
+*       Configuration defaults
 *
 **********************************************************************
 */
-//
-// Use auto-detection for SEGGER_SYSVIEW_CORE define
-// based on compiler-/toolchain-specific defines
-// to define SEGGER_SYSVIEW_GET_INTERRUPT_ID and SEGGER_SYSVIEW_GET_TIMESTAMP
-//
-#define SEGGER_SYSVIEW_CORE_OTHER   0
-#define SEGGER_SYSVIEW_CORE_CM0     1 // Cortex-M0/M0+/M1
-#define SEGGER_SYSVIEW_CORE_CM3     2 // Cortex-M3/M4/M7
-#define SEGGER_SYSVIEW_CORE_RX      3 // Renesas RX
-#ifndef SEGGER_SYSVIEW_CORE
-  #if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __SEGGER_CC__) || (defined __GNUC__) || (defined __clang__)
-    #if (defined __ARM_ARCH_6M__) || (defined __ARM_ARCH_8M_BASE__)
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__ICCARM__)
-    #if (defined (__ARM6M__)          && (__CORE__ == __ARM6M__))          \
-     || (defined (__ARM8M_BASELINE__) && (__CORE__ == __ARM8M_BASELINE__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined (__ARM7EM__)         && (__CORE__ == __ARM7EM__))         \
-       || (defined (__ARM7M__)          && (__CORE__ == __ARM7M__))          \
-       || (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__)) \
-       || (defined (__ARM8M_MAINLINE__) && (__CORE__ == __ARM8M_MAINLINE__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__CC_ARM)
-    #if (defined(__TARGET_ARCH_6S_M))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined(__TARGET_ARCH_7_M) || defined(__TARGET_ARCH_7E_M))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__TI_ARM__)
-    #ifdef __TI_ARM_V6M0__
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM0
-    #elif (defined(__TI_ARM_V7M3__) || defined(__TI_ARM_V7M4__))
-      #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_CM3
-    #endif
-  #elif defined(__ICCRX__)
-    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
-  #elif defined(__RX)
-    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_RX
-  #endif
 
-  #ifndef   SEGGER_SYSVIEW_CORE
-    #define SEGGER_SYSVIEW_CORE SEGGER_SYSVIEW_CORE_OTHER
-  #endif
+// Number of bytes that SystemView uses for a buffer.
+#ifndef   SEGGER_SYSVIEW_RTT_BUFFER_SIZE
+  #define SEGGER_SYSVIEW_RTT_BUFFER_SIZE    1024
 #endif
 
-
-/*********************************************************************
-*
-*       Defines, defaults
-*
-**********************************************************************
-*/
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_APP_NAME
-*
-*  Description
-*    The application name to be displayed in SystemView.
-*  Default
-*    "SystemView-enabled Application"
-*  Notes
-*    Convenience define to be used for SEGGER_SYSVIEW_SendSysDesc().
-*/
-#ifndef   SEGGER_SYSVIEW_APP_NAME
-  #define SEGGER_SYSVIEW_APP_NAME                 "SystemView-enabled Application"
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_DEVICE_NAME
-*
-*  Description
-*    The target device name to be displayed in SystemView.
-*  Default
-*    "undefined device"
-*  Notes
-*    Convenience define to be used for SEGGER_SYSVIEW_SendSysDesc().
-*/
-#ifndef   SEGGER_SYSVIEW_DEVICE_NAME
-  #define SEGGER_SYSVIEW_DEVICE_NAME              "undefined device"
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_GET_INTERRUPT_ID()
-*
-*  Description
-*    Function macro to retrieve the Id of the currently active
-*    interrupt.
-*  Default
-*    Call user-supplied function SEGGER_SYSVIEW_X_GetInterruptId().
-*  Notes
-*    For some known compilers and cores, a ready-to-use, core-specific
-*    default is set.
-*    ARMv7M: Read ICSR[8:0] (active vector)
-*    ARMv6M: Read ICSR[5:0] (active vector)
-*/
-#ifndef SEGGER_SYSVIEW_GET_INTERRUPT_ID
-  #if SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3
-    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()     ((*(U32*)(0xE000ED04)) & 0x1FF)         // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[8:0] = active vector)
-  #elif SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM0
-    #if defined(__ICCARM__)
-      #if (__VER__ > 6010000)
-        #define SEGGER_SYSVIEW_GET_INTERRUPT_ID() (__get_IPSR())                          // Workaround for IAR, which might do a byte-access to 0xE000ED04. Read IPSR instead.
-      #else
-        #define SEGGER_SYSVIEW_GET_INTERRUPT_ID() ((*(U32*)(0xE000ED04)) & 0x3F)          // Older versions of IAR do not include __get_IPSR, but might also not optimize to byte-access.
-      #endif
-    #else
-      #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()   ((*(U32*)(0xE000ED04)) & 0x3F)          // Get the currently active interrupt Id. (i.e. read Cortex-M ICSR[5:0] = active vector)
-    #endif
-  #else
-    #define SEGGER_SYSVIEW_GET_INTERRUPT_ID()     SEGGER_SYSVIEW_X_GetInterruptId()       // Get the currently active interrupt Id from the user-provided function.
-  #endif
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_GET_TIMESTAMP()
-*
-*  Description
-*    Function macro to retrieve a system timestamp for SYSVIEW events.
-*  Default
-*    Call user-supplied function SEGGER_SYSVIEW_X_GetTimestamp().
-*  Notes
-*    For some known compilers and cores, a ready-to-use, core-specific
-*    default is set.
-*    ARMv7M: Read Cortex-M Cycle Count register.
-*
-*    The system timestamp clock frequency has to be passed in
-*    SEGGER_SYSVIEW_Init().
-*/
-#ifndef SEGGER_SYSVIEW_GET_TIMESTAMP
-  #if defined (SEGGER_SYSVIEW_CORE) && (SEGGER_SYSVIEW_CORE == SEGGER_SYSVIEW_CORE_CM3)
-    #define SEGGER_SYSVIEW_GET_TIMESTAMP()        (*(U32 *)(0xE0001004))                  // Retrieve a system timestamp. Cortex-M cycle counter.
-  #else
-    #define SEGGER_SYSVIEW_GET_TIMESTAMP()        SEGGER_SYSVIEW_X_GetTimestamp()         // Retrieve a system timestamp via user-defined function
-  #endif
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_TIMESTAMP_BITS
-*
-*  Description
-*    Number of valid (low-order) bits delivered in system timestamp.
-*  Default
-*    32
-*  Notes
-*    Value has to match system timestamp clock source.
-*/
-// Define number of valid bits low-order delivered by clock source.
-#ifndef   SEGGER_SYSVIEW_TIMESTAMP_BITS
-  #define SEGGER_SYSVIEW_TIMESTAMP_BITS           32
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_RTT_CHANNEL
-*
-*  Description
-*    The RTT channel that SystemView will use.
-*  Default
-*    0: Auto selection.
-*  Notes
-*    Value has to be lower than SEGGER_RTT_MAX_NUM_UP_BUFFERS.
-*/
+// The RTT channel that SystemView will use.
 #ifndef   SEGGER_SYSVIEW_RTT_CHANNEL
-  #define SEGGER_SYSVIEW_RTT_CHANNEL              1
+  #define SEGGER_SYSVIEW_RTT_CHANNEL        0
 #endif
 // Sanity check of RTT channel
 #if (SEGGER_SYSVIEW_RTT_CHANNEL == 0) && (SEGGER_RTT_MAX_NUM_UP_BUFFERS < 2)
@@ -262,321 +102,71 @@ extern "C" {
   #error "SEGGER_RTT_MAX_NUM_UP_BUFFERS  in SEGGER_RTT_Conf.h has to be > SEGGER_SYSVIEW_RTT_CHANNEL!"
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_RTT_BUFFER_SIZE
-*
-*  Description
-*    Number of bytes that SystemView uses for the RTT buffer.
-*  Default
-*    1024
-*/
-#ifndef   SEGGER_SYSVIEW_RTT_BUFFER_SIZE
-  #define SEGGER_SYSVIEW_RTT_BUFFER_SIZE          1024
+// Place the SystemView buffer into its own/the RTT section
+#if !(defined SEGGER_SYSVIEW_BUFFER_SECTION) && (defined SEGGER_RTT_SECTION)
+  #define SEGGER_SYSVIEW_BUFFER_SECTION            SEGGER_RTT_SECTION
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SECTION
-*
-*  Description
-*    Section to place the SystemView RTT Buffer into.
-*  Default
-*    undefined: Do not place into a specific section.
-*  Notes
-*    If SEGGER_RTT_SECTION is defined, the default changes to use
-*    this section for the SystemView RTT Buffer, too.
-*/
-#if !(defined SEGGER_SYSVIEW_SECTION) && (defined SEGGER_RTT_SECTION)
-  #define SEGGER_SYSVIEW_SECTION                  SEGGER_RTT_SECTION
+// Retrieve a system timestamp.  This gets the Cortex-M cycle counter.
+#ifndef   SEGGER_SYSVIEW_GET_TIMESTAMP
+  #error "SEGGER_SYSVIEW_GET_TIMESTAMP has to be defined in SEGGER_SYSVIEW_Conf.h!"
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_CPU_CACHE_LINE_SIZE
-*
-*  Description
-*    Largest cache line size (in bytes) in the target system.
-*  Default
-*    0
-*  Notes
-*    Required in systems with caches to make sure that the SystemView
-*    RTT buffer can be aligned accordingly.
-*/
-#ifndef SEGGER_SYSVIEW_CPU_CACHE_LINE_SIZE
-  #define SEGGER_SYSVIEW_CPU_CACHE_LINE_SIZE      0
+// Define number of valid bits low-order delivered by clock source.
+#ifndef   SEGGER_SYSVIEW_TIMESTAMP_BITS
+  #define SEGGER_SYSVIEW_TIMESTAMP_BITS     32
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_ID_BASE
-*
-*  Description
-*    Lowest Id reported by the application.
-*  Default
-*    0
-*  Notes
-*    Value is usually subtracted from mailboxes, semaphores, tasks,
-*    .... addresses, to compress event parameters.
-*    Should be the lowest RAM address of the system.
-*/
+// Lowest Id reported by the Application.
 #ifndef   SEGGER_SYSVIEW_ID_BASE
-  #define SEGGER_SYSVIEW_ID_BASE                  0
+  #define SEGGER_SYSVIEW_ID_BASE            0
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_ID_SHIFT
-*
-*  Description
-*    Number of bits to shift Ids.
-*  Default
-*    0
-*  Notes
-*    Ids are shifted to compress event parameters.
-*    Should match the alignment of Ids (addresses),
-*    e.g. 2 when Ids are 4 byte aligned.
-*/
+// Number of bits to shift Ids to save bandwidth
 #ifndef   SEGGER_SYSVIEW_ID_SHIFT
-  #define SEGGER_SYSVIEW_ID_SHIFT                 0
+  #define SEGGER_SYSVIEW_ID_SHIFT           0
+#endif
+
+#ifndef   SEGGER_SYSVIEW_GET_INTERRUPT_ID
+  #error "SEGGER_SYSVIEW_GET_INTERRUPT_ID has to be defined in SEGGER_SYSVIEW_Conf.h!"
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_MAX_ARGUMENTS
-*
-*  Description
-*    Maximum number of arguments which are handled with SystemView
-*    print routines or may be encoded in one recording function.
-*    routines.
-*  Default
-*    16
-*/
 #ifndef   SEGGER_SYSVIEW_MAX_ARGUMENTS
-  #define SEGGER_SYSVIEW_MAX_ARGUMENTS            16
+  #define SEGGER_SYSVIEW_MAX_ARGUMENTS      16
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_MAX_STRING_LEN
-*
-*  Description
-*    Maximum string length which can be used in SystemView print and
-*    system description routines.
-*  Default
-*    128
-*/
 #ifndef   SEGGER_SYSVIEW_MAX_STRING_LEN
-  #define SEGGER_SYSVIEW_MAX_STRING_LEN           128
+  #define SEGGER_SYSVIEW_MAX_STRING_LEN     128
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SUPPORT_LONG_ID
-*
-*  Description
-*    It set, support enconding Evend Ids longer than 14 bit.
-*  Default
-*    1
-*/
-#ifndef   SEGGER_SYSVIEW_SUPPORT_LONG_ID
-  #define SEGGER_SYSVIEW_SUPPORT_LONG_ID          1
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SUPPORT_LONG_DATA
-*
-*  Description
-*    It set, support enconding event data longer than 14 bit.
-*  Default
-*    0
-*/
-#ifndef   SEGGER_SYSVIEW_SUPPORT_LONG_DATA
-  #define SEGGER_SYSVIEW_SUPPORT_LONG_DATA        0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_PRINTF_IMPLICIT_FORMAT
-*
-*  Description
-*    If enabled, on SEGGER_SYSVIEW_PrintHost, check the format string
-*    and if it includes unsupported formatters, use formatting on the
-*    target instead.
-*  Default
-*    0: Disabled.
-*/
-#ifndef   SEGGER_SYSVIEW_PRINTF_IMPLICIT_FORMAT
-  #define SEGGER_SYSVIEW_PRINTF_IMPLICIT_FORMAT   0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_USE_INTERNAL_RECORDER
-*
-*  Description
-*    If set, an internal recorder, such as UART or IP is used.
-*  Default
-*    0: Disabled.
-*  Notes
-*    Convenience define to be used by SEGGER_SYSVIEW_Conf(),
-*    such as in embOS configuration to enable Cortex-M cycle counter.
-*/
-#ifndef   SEGGER_SYSVIEW_USE_INTERNAL_RECORDER
-  #define SEGGER_SYSVIEW_USE_INTERNAL_RECORDER    0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_CAN_RESTART
-*
-*  Description
-*    If enabled, send the SystemView start sequence on every start
-*    command, not just on the first one.
-*    Enables restart when SystemView disconnected unexpectedly.
-*  Default
-*    1: Enabled
-*/
-#ifndef   SEGGER_SYSVIEW_CAN_RESTART
-  #define SEGGER_SYSVIEW_CAN_RESTART              1
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_START_ON_INIT
-*
-*  Description
-*    Enable calling SEGGER_SYSVIEW_Start() after initialization.
-*  Default
-*    0: Disabled.
-*  Notes
-*    Convenience define to be used by SEGGER_SYSVIEW_Conf(),
-*    such as in embOS configuration.
-*/
-#ifndef   SEGGER_SYSVIEW_START_ON_INIT
-  #define SEGGER_SYSVIEW_START_ON_INIT            0
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_USE_STATIC_BUFFER
-*
-*  Description
-*    If enabled, use a static buffer instead of a buffer on the stack
-*    for SystemView event packets.
-*  Default
-*    1: Enabled.
-*  Notes
-*    If enabled, the static memory use by SystemView is increased by
-*    the maximum packet size. SystemView is locked on entry of a
-*    recording function.
-*    If disabled, the stack usage by SystemView recording functions
-*    might be increased by up to the maximum packet size. SystemView
-*    is locked when writing the packet to the RTT buffer.
-*/
+// Use a static buffer instead of a buffer on the stack for packets
 #ifndef   SEGGER_SYSVIEW_USE_STATIC_BUFFER
-  #define SEGGER_SYSVIEW_USE_STATIC_BUFFER        1
+  #define SEGGER_SYSVIEW_USE_STATIC_BUFFER  1
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_MAX_PACKET_SIZE
-*
-*  Description
-*    Maximum packet size for a SystemView event.
-*  Default
-*    Automatically calculated.
-*  Notes
-*    The maximum packet size is mainly defined by the maximum string
-*    length and the maximum number of arguments.
-*/
+// Maximum packet size used by SystemView for the static buffer
 #ifndef   SEGGER_SYSVIEW_MAX_PACKET_SIZE
-  #define SEGGER_SYSVIEW_MAX_PACKET_SIZE          (SEGGER_SYSVIEW_INFO_SIZE + SEGGER_SYSVIEW_MAX_STRING_LEN + 2 * SEGGER_SYSVIEW_QUANTA_U32 + SEGGER_SYSVIEW_MAX_ARGUMENTS * SEGGER_SYSVIEW_QUANTA_U32)
+  #define SEGGER_SYSVIEW_MAX_PACKET_SIZE   SEGGER_SYSVIEW_INFO_SIZE + SEGGER_SYSVIEW_MAX_STRING_LEN + 2 * SEGGER_SYSVIEW_QUANTA_U32 + SEGGER_SYSVIEW_MAX_ARGUMENTS * SEGGER_SYSVIEW_QUANTA_U32
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_POST_MORTEM_MODE
-*
-*  Description
-*    If enabled, SystemView records for post-mortem analysis instead
-*    of real-time analysis.
-*  Default
-*    0: Disabled.
-*  Notes
-*    For more information refer to
-*    https://www.segger.com/products/development-tools/systemview/technology/post-mortem-mode
-*/
+// Use post-mortem analysis instead of real-time analysis
 #ifndef   SEGGER_SYSVIEW_POST_MORTEM_MODE
-  #define SEGGER_SYSVIEW_POST_MORTEM_MODE         0
+  #define SEGGER_SYSVIEW_POST_MORTEM_MODE   0
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT
-*
-*  Description
-*    Configure how frequently syncronization is sent in post-mortem
-*    mode.
-*  Default
-*    8: (1 << 8) = Every 256 Events.
-*  Notes
-*    In post-mortem mode, at least one sync has to be in the RTT buffer.
-*    Recommended sync frequency: Buffer Size / 16
-*    For more information refer to
-*    https://www.segger.com/products/development-tools/systemview/technology/post-mortem-mode
-*/
+// Configure how frequently syncronization is sent
 #ifndef   SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT
-  #define SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT        8
+  #define SEGGER_SYSVIEW_SYNC_PERIOD_SHIFT  8
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_ON_EVENT_RECORDED()
-*
-*  Description
-*    Function macro to notify recorder about a new event in buffer.
-*  Default
-*    undefined: Do not notify recorder.
-*  Notes
-*    Used for non-J-Link recorder,
-*    such as to enable transmission via UART or notify IP task.
-*/
-#ifndef   SEGGER_SYSVIEW_ON_EVENT_RECORDED
-  #define SEGGER_SYSVIEW_ON_EVENT_RECORDED(NumBytes)
-#endif
-
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_LOCK()
-*
-*  Description
-*    Function macro to (nestable) lock SystemView recording.
-*  Default
-*    Use RTT Locking mechanism (defined by SEGGER_RTT_LOCK()).
-*  Notes
-*    If SystemView recording is not locked, recording events from
-*    interrupts and tasks may lead to unpredictable, undefined, event
-*    data.
-*/
+// Lock SystemView (nestable)
 #ifndef   SEGGER_SYSVIEW_LOCK
-  unsigned SEGGER_SYSVIEW_X_SysView_Lock(void);
-  #define SEGGER_SYSVIEW_LOCK()                   unsigned _SYSVIEW_int_state = SEGGER_SYSVIEW_X_SysView_Lock()
+  #define SEGGER_SYSVIEW_LOCK()             SEGGER_RTT_LOCK()
 #endif
 
-/*********************************************************************
-*
-*       Define: SEGGER_SYSVIEW_UNLOCK
-*
-*  Description
-*    Function macro to unlock SystemView recording.
-*  Default
-*    Use RTT Unlocking mechanism (defined by SEGGER_RTT_UNLOCK()).
-*/
+// Unlock SystemView (nestable)
 #ifndef   SEGGER_SYSVIEW_UNLOCK
-  void SEGGER_SYSVIEW_X_SysView_Unlock(unsigned int_state);
-  #define SEGGER_SYSVIEW_UNLOCK()                 SEGGER_SYSVIEW_X_SysView_Unlock(_SYSVIEW_int_state)
+  #define SEGGER_SYSVIEW_UNLOCK()           SEGGER_RTT_UNLOCK()
 #endif
 
 #ifdef __cplusplus

components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_Int.h

@@ -1,14 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -22,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -47,13 +52,13 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 File    : SEGGER_SYSVIEW_Int.h
 Purpose : SEGGER SystemView internal header.
-Revision: $Rev: 21281 $
+Revision: $Rev: 5626 $
 */
 
 #ifndef SEGGER_SYSVIEW_INT_H
@@ -67,6 +72,8 @@ Revision: $Rev: 21281 $
 */
 
 #include "SEGGER_SYSVIEW.h"
+#include "SEGGER_SYSVIEW_Conf.h"
+#include "SEGGER_SYSVIEW_ConfDefaults.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -90,7 +97,6 @@ typedef enum {
   SEGGER_SYSVIEW_COMMAND_ID_GET_SYSDESC,
   SEGGER_SYSVIEW_COMMAND_ID_GET_NUMMODULES,
   SEGGER_SYSVIEW_COMMAND_ID_GET_MODULEDESC,
-  SEGGER_SYSVIEW_COMMAND_ID_HEARTBEAT = 127,
   // Extended commands: Commands >= 128 have a second parameter
   SEGGER_SYSVIEW_COMMAND_ID_GET_MODULE = 128
 } SEGGER_SYSVIEW_COMMAND_ID;

components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c

@@ -1,16 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2017-2022 Espressif Systems (Shanghai) CO LTD
- */
 /*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
+*                SEGGER Microcontroller GmbH & Co. KG                *
 *                        The Embedded Experts                        *
 **********************************************************************
 *                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
 *                                                                    *
 *       www.segger.com     Support: support@segger.com               *
 *                                                                    *
@@ -24,14 +17,24 @@
 *                                                                    *
 * SEGGER strongly recommends to not make any changes                 *
 * to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
+* compatible with the RTT protocol and J-Link.                       *
 *                                                                    *
 * Redistribution and use in source and binary forms, with or         *
 * without modification, are permitted provided that the following    *
-* condition is met:                                                  *
+* conditions are met:                                                *
 *                                                                    *
 * o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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,        *
@@ -49,14 +52,14 @@
 *                                                                    *
 **********************************************************************
 *                                                                    *
-*       SystemView version: 3.42                                    *
+*       SystemView version: V2.42                                    *
 *                                                                    *
 **********************************************************************
 -------------------------- END-OF-HEADER -----------------------------
 
 File    : SEGGER_SYSVIEW_Config_FreeRTOS.c
 Purpose : Sample setup configuration of SystemView with FreeRTOS.
-Revision: $Rev: 7745 $
+Revision: $Rev: 3734 $
 */
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
@@ -64,10 +67,18 @@ Revision: $Rev: 7745 $
 #include "esp_app_trace.h"
 #include "esp_app_trace_util.h"
 #include "esp_intr_alloc.h"
-#include "esp_cpu.h"
 #include "soc/soc.h"
 #include "soc/interrupts.h"
-#include "esp_private/esp_clk.h"
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32C3
+#include "esp32c3/clk.h"
+#endif
+
 
 extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;
 
@@ -99,16 +110,26 @@ extern const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI;
 #endif
 
 #if TS_USE_TIMERGROUP
-#include "driver/gptimer.h"
+#include "driver/timer.h"
 
 // Timer group timer divisor
 #define SYSVIEW_TIMER_DIV       2
 
-// Frequency of the timestamp, using APB as GPTimer source clock
+// Frequency of the timestamp.
 #define SYSVIEW_TIMESTAMP_FREQ  (esp_clk_apb_freq() / SYSVIEW_TIMER_DIV)
 
-// GPTimer handle
-gptimer_handle_t s_sv_gptimer;
+// Timer ID and group ID
+#if defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_00) || defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_10)
+#define TS_TIMER_ID 0
+#else
+#define TS_TIMER_ID 1
+#endif // TIMER_00 || TIMER_01
+
+#if defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_00) || defined(CONFIG_APPTRACE_SV_TS_SOURCE_TIMER_01)
+#define TS_TIMER_GROUP 0
+#else
+#define TS_TIMER_GROUP 1
+#endif // TIMER_00 || TIMER_10
 
 #endif // TS_USE_TIMERGROUP
 
@@ -119,7 +140,13 @@ gptimer_handle_t s_sv_gptimer;
 
 #if TS_USE_CCOUNT
 // CCOUNT is incremented at CPU frequency
-#define SYSVIEW_TIMESTAMP_FREQ  (CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ * 1000000)
+#if CONFIG_IDF_TARGET_ESP32
+#define SYSVIEW_TIMESTAMP_FREQ  (CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ * 1000000)
+#elif CONFIG_IDF_TARGET_ESP32S2
+#define SYSVIEW_TIMESTAMP_FREQ  (CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ * 1000000)
+#elif CONFIG_IDF_TARGET_ESP32S3
+#define SYSVIEW_TIMESTAMP_FREQ  (CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ * 1000000)
+#endif
 #endif // TS_USE_CCOUNT
 
 // System Frequency.
@@ -181,16 +208,19 @@ static void SEGGER_SYSVIEW_TS_Init(void)
      * esp_timer and ccount can be used as is.
      */
 #if TS_USE_TIMERGROUP
-    gptimer_config_t config = {
-        .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-        .direction = GPTIMER_COUNT_UP,
-        .resolution_hz = SYSVIEW_TIMESTAMP_FREQ,
+    timer_config_t config = {
+        .alarm_en = 0,
+        .auto_reload = 0,
+        .counter_dir = TIMER_COUNT_UP,
+        .divider = SYSVIEW_TIMER_DIV,
+        .counter_en = 0
     };
-    // pick any free GPTimer instance
-    ESP_ERROR_CHECK(gptimer_new_timer(&config, &s_sv_gptimer));
+    /* Configure timer */
+    timer_init(TS_TIMER_GROUP, TS_TIMER_ID, &config);
+    /* Load counter value */
+    timer_set_counter_value(TS_TIMER_GROUP, TS_TIMER_ID, 0x00000000ULL);
     /* Start counting */
-    gptimer_enable(s_sv_gptimer);
-    gptimer_start(s_sv_gptimer);
+    timer_start(TS_TIMER_GROUP, TS_TIMER_ID);
 #endif // TS_USE_TIMERGROUP
 }
 
@@ -248,10 +278,10 @@ U32 SEGGER_SYSVIEW_X_GetTimestamp(void)
 {
 #if TS_USE_TIMERGROUP
     uint64_t ts = 0;
-    gptimer_get_raw_count(s_sv_gptimer, &ts);
+    timer_get_counter_value(TS_TIMER_GROUP, TS_TIMER_ID, &ts);
     return (U32) ts; // return lower part of counter value
 #elif TS_USE_CCOUNT
-    return esp_cpu_get_cycle_count();
+    return portGET_RUN_TIME_COUNTER_VALUE();
 #elif TS_USE_ESP_TIMER
     return (U32) esp_timer_get_time(); // return lower part of counter value
 #endif

components/app_trace/sys_view/Sample/FreeRTOSV10.4/SEGGER_SYSVIEW_FreeRTOS.c

@@ -1,267 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023 Espressif Systems (Shanghai) CO LTD
- */
-/*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
-*                        The Embedded Experts                        *
-**********************************************************************
-*                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
-*                                                                    *
-*       www.segger.com     Support: support@segger.com               *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-*       SEGGER SystemView * Real-time application analysis           *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-* All rights reserved.                                               *
-*                                                                    *
-* SEGGER strongly recommends to not make any changes                 *
-* to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
-*                                                                    *
-* Redistribution and use in source and binary forms, with or         *
-* without modification, are permitted provided that the following    *
-* condition is met:                                                  *
-*                                                                    *
-* o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
-*                                                                    *
-* 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           *
-* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
-* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
-* OR BUSINESS INTERRUPTION) HOWEVER 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.                                                            *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-*       SystemView version: 3.42                                    *
-*                                                                    *
-**********************************************************************
--------------------------- END-OF-HEADER -----------------------------
-
-File    : SEGGER_SYSVIEW_FreeRTOS.c
-Purpose : Interface between FreeRTOS and SystemView.
-Revision: $Rev: 7947 $
-*/
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "SEGGER_SYSVIEW.h"
-#include "SEGGER_SYSVIEW_FreeRTOS.h"
-#include "string.h" // Required for memset
-
-
-
-typedef struct SYSVIEW_FREERTOS_TASK_STATUS SYSVIEW_FREERTOS_TASK_STATUS;
-
-struct SYSVIEW_FREERTOS_TASK_STATUS {
-  U32         xHandle;
-  const char* pcTaskName;
-  unsigned    uxCurrentPriority;
-  U32         pxStack;
-  unsigned    uStackHighWaterMark;
-};
-
-static SYSVIEW_FREERTOS_TASK_STATUS _aTasks[SYSVIEW_FREERTOS_MAX_NOF_TASKS];
-static unsigned _NumTasks;
-
-/*********************************************************************
-*
-*       _cbSendTaskList()
-*
-*  Function description
-*    This function is part of the link between FreeRTOS and SYSVIEW.
-*    Called from SystemView when asked by the host, it uses SYSVIEW
-*    functions to send the entire task list to the host.
-*/
-static void _cbSendTaskList(void) {
-  unsigned n;
-
-  for (n = 0; n < _NumTasks; n++) {
-#if INCLUDE_uxTaskGetStackHighWaterMark // Report Task Stack High Watermark
-    _aTasks[n].uStackHighWaterMark = uxTaskGetStackHighWaterMark((TaskHandle_t)_aTasks[n].xHandle);
-#endif
-    SYSVIEW_SendTaskInfo((U32)_aTasks[n].xHandle, _aTasks[n].pcTaskName, (unsigned)_aTasks[n].uxCurrentPriority, (U32)_aTasks[n].pxStack, (unsigned)_aTasks[n].uStackHighWaterMark);
-  }
-}
-
-/*********************************************************************
-*
-*       _cbGetTime()
-*
-*  Function description
-*    This function is part of the link between FreeRTOS and SYSVIEW.
-*    Called from SystemView when asked by the host, returns the
-*    current system time in micro seconds.
-*/
-static U64 _cbGetTime(void) {
-  U64 Time;
-
-  Time = xTaskGetTickCountFromISR();
-  Time *= portTICK_PERIOD_MS;
-  Time *= 1000;
-  return Time;
-}
-
-/*********************************************************************
-*
-*       Global functions
-*
-**********************************************************************
-*/
-/*********************************************************************
-*
-*       SYSVIEW_AddTask()
-*
-*  Function description
-*    Add a task to the internal list and record its information.
-*/
-void SYSVIEW_AddTask(U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32  pxStack, unsigned uStackHighWaterMark) {
-
-  /* On multi-core we have several idle tasks with 'IDLEx' names
-     Not best solution, because we can filter out user tasks starting with 'IDLE'.
-     But we can not use 'xTaskGetIdleTaskHandle' because at the moment when this
-     function is called array of idle tasks handles are not initialized yet. */
-  if (memcmp(pcTaskName, "IDLE", 4) == 0) {
-    return;
-  }
-
-  if (_NumTasks >= SYSVIEW_FREERTOS_MAX_NOF_TASKS) {
-    SEGGER_SYSVIEW_Warn("SYSTEMVIEW: Could not record task information. Maximum number of tasks reached.");
-    return;
-  }
-
-  _aTasks[_NumTasks].xHandle = xHandle;
-  _aTasks[_NumTasks].pcTaskName = pcTaskName;
-  _aTasks[_NumTasks].uxCurrentPriority = uxCurrentPriority;
-  _aTasks[_NumTasks].pxStack = pxStack;
-  _aTasks[_NumTasks].uStackHighWaterMark = uStackHighWaterMark;
-
-  _NumTasks++;
-
-  SYSVIEW_SendTaskInfo(xHandle, pcTaskName,uxCurrentPriority, pxStack, uStackHighWaterMark);
-
-}
-
-/*********************************************************************
-*
-*       SYSVIEW_UpdateTask()
-*
-*  Function description
-*    Update a task in the internal list and record its information.
-*/
-void SYSVIEW_UpdateTask(U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32 pxStack, unsigned uStackHighWaterMark) {
-  unsigned n;
-
-  /* On multi-core we have several idle tasks with 'IDLEx' names
-     Not best solution, because we can filter out user tasks starting with 'IDLE'.
-     But we can not use 'xTaskGetIdleTaskHandle' because at the moment when this
-     function is called array of idle tasks handles are not initialized yet. */
-  if (memcmp(pcTaskName, "IDLE", 4) == 0) {
-    return;
-  }
-
-  for (n = 0; n < _NumTasks; n++) {
-    if (_aTasks[n].xHandle == xHandle) {
-      break;
-    }
-  }
-  if (n < _NumTasks) {
-    _aTasks[n].pcTaskName = pcTaskName;
-    _aTasks[n].uxCurrentPriority = uxCurrentPriority;
-    _aTasks[n].pxStack = pxStack;
-    _aTasks[n].uStackHighWaterMark = uStackHighWaterMark;
-
-    SYSVIEW_SendTaskInfo(xHandle, pcTaskName, uxCurrentPriority, pxStack, uStackHighWaterMark);
-  } else {
-    SYSVIEW_AddTask(xHandle, pcTaskName, uxCurrentPriority, pxStack, uStackHighWaterMark);
-  }
-}
-
-/*********************************************************************
-*
-*       SYSVIEW_DeleteTask()
-*
-*  Function description
-*    Delete a task from the internal list.
-*/
-void SYSVIEW_DeleteTask(U32 xHandle) {
-  unsigned n;
-
-  if (_NumTasks == 0) {
-    return; // Early out
-  }
-  for (n = 0; n < _NumTasks; n++) {
-    if (_aTasks[n].xHandle == xHandle) {
-      break;
-    }
-  }
-  if (n == (_NumTasks - 1)) {
-    //
-    // Task is last item in list.
-    // Simply zero the item and decrement number of tasks.
-    //
-    memset(&_aTasks[n], 0, sizeof(_aTasks[n]));
-    _NumTasks--;
-  } else if (n < _NumTasks) {
-    //
-    // Task is in the middle of the list.
-    // Move last item to current position and decrement number of tasks.
-    // Order of tasks does not really matter, so no need to move all following items.
-    //
-    _aTasks[n].xHandle             = _aTasks[_NumTasks - 1].xHandle;
-    _aTasks[n].pcTaskName          = _aTasks[_NumTasks - 1].pcTaskName;
-    _aTasks[n].uxCurrentPriority   = _aTasks[_NumTasks - 1].uxCurrentPriority;
-    _aTasks[n].pxStack             = _aTasks[_NumTasks - 1].pxStack;
-    _aTasks[n].uStackHighWaterMark = _aTasks[_NumTasks - 1].uStackHighWaterMark;
-    memset(&_aTasks[_NumTasks - 1], 0, sizeof(_aTasks[_NumTasks - 1]));
-    _NumTasks--;
-  }
-}
-
-/*********************************************************************
-*
-*       SYSVIEW_SendTaskInfo()
-*
-*  Function description
-*    Record task information.
-*/
-void SYSVIEW_SendTaskInfo(U32 TaskID, const char* sName, unsigned Prio, U32 StackBase, unsigned StackSize) {
-  SEGGER_SYSVIEW_TASKINFO TaskInfo;
-
-  memset(&TaskInfo, 0, sizeof(TaskInfo)); // Fill all elements with 0 to allow extending the structure in future version without breaking the code
-  TaskInfo.TaskID     = TaskID;
-  TaskInfo.sName      = sName;
-  TaskInfo.Prio       = Prio;
-  TaskInfo.StackBase  = StackBase;
-  TaskInfo.StackSize  = StackSize;
-  SEGGER_SYSVIEW_SendTaskInfo(&TaskInfo);
-}
-
-/*********************************************************************
-*
-*       Public API structures
-*
-**********************************************************************
-*/
-// Callbacks provided to SYSTEMVIEW by FreeRTOS
-const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI = {
-  _cbGetTime,
-  _cbSendTaskList,
-};
-
-/*************************** End of file ****************************/

components/app_trace/sys_view/Sample/FreeRTOSV10.4/SEGGER_SYSVIEW_FreeRTOS.h

@@ -1,367 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1995-2021 SEGGER Microcontroller GmbH
- *
- * SPDX-License-Identifier: BSD-1-Clause
- *
- * SPDX-FileContributor: 2023 Espressif Systems (Shanghai) CO LTD
- */
-/*********************************************************************
-*                    SEGGER Microcontroller GmbH                     *
-*                        The Embedded Experts                        *
-**********************************************************************
-*                                                                    *
-*            (c) 1995 - 2021 SEGGER Microcontroller GmbH             *
-*                                                                    *
-*       www.segger.com     Support: support@segger.com               *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-*       SEGGER SystemView * Real-time application analysis           *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-* All rights reserved.                                               *
-*                                                                    *
-* SEGGER strongly recommends to not make any changes                 *
-* to or modify the source code of this software in order to stay     *
-* compatible with the SystemView and RTT protocol, and J-Link.       *
-*                                                                    *
-* Redistribution and use in source and binary forms, with or         *
-* without modification, are permitted provided that the following    *
-* condition is met:                                                  *
-*                                                                    *
-* o Redistributions of source code must retain the above copyright   *
-*   notice, this condition and the following disclaimer.             *
-*                                                                    *
-* 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           *
-* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
-* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
-* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
-* OR BUSINESS INTERRUPTION) HOWEVER 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.                                                            *
-*                                                                    *
-**********************************************************************
-*                                                                    *
-*       SystemView version: 3.42                                    *
-*                                                                    *
-**********************************************************************
--------------------------- END-OF-HEADER -----------------------------
-
-File    : SEGGER_SYSVIEW_FreeRTOS.h
-Purpose : Interface between FreeRTOS and SystemView.
-          Tested with FreeRTOS V10.4.3
-Revision: $Rev: 7745 $
-
-Notes:
-  (1) Include this file at the end of FreeRTOSConfig.h
-*/
-
-#ifndef SYSVIEW_FREERTOS_H
-#define SYSVIEW_FREERTOS_H
-
-#include "SEGGER_SYSVIEW.h"
-
-/*********************************************************************
-*
-*       Defines, configurable
-*
-**********************************************************************
-*/
-
-#define SYSVIEW_FREERTOS_MAX_NOF_TASKS  CONFIG_APPTRACE_SV_MAX_TASKS
-
-/*********************************************************************
-*
-*       Defines, fixed
-*
-**********************************************************************
-*/
-// for dual-core targets we use event ID to keep core ID bit (0 or 1)
-// use the highest - 1 bit of event ID to indicate core ID
-// the highest bit can not be used due to event ID encoding method
-// this reduces supported ID range to [0..63] (for 1 byte IDs) plus [128..16383] (for 2 bytes IDs)
-// so original continuous event IDs range is split into two sub-ranges for 1-bytes IDs and 2-bytes ones
-
-// events which use apiFastID_OFFSET will have 1 byte ID,
-// so for the sake of bandwidth economy events which are generated more frequently should use this ID offset
-// currently all used events fall into this range
-#define apiFastID_OFFSET                          (32u)
-
-#define apiID_VTASKDELETE                         (1u)
-#define apiID_VTASKDELAY                          (2u)
-#define apiID_VTASKDELAYUNTIL                     (3u)
-#define apiID_VTASKSUSPEND                        (4u)
-#define apiID_ULTASKNOTIFYTAKE                    (5u)
-#define apiID_VTASKNOTIFYGIVEFROMISR              (6u)
-#define apiID_VTASKPRIORITYINHERIT                (7u)
-#define apiID_VTASKRESUME                         (8u)
-#define apiID_VTASKSTEPTICK                       (9u)
-#define apiID_XTASKPRIORITYDISINHERIT             (10u)
-#define apiID_XTASKRESUMEFROMISR                  (11u)
-#define apiID_XTASKGENERICNOTIFY                  (12u)
-#define apiID_XTASKGENERICNOTIFYFROMISR           (13u)
-#define apiID_XTASKNOTIFYWAIT                     (14u)
-#define apiID_XQUEUEGENERICCREATE                 (15u)
-#define apiID_VQUEUEDELETE                        (16u)
-#define apiID_XQUEUEGENERICRECEIVE                (17u)
-#define apiID_XQUEUEPEEKFROMISR                   (18u)
-#define apiID_XQUEUERECEIVEFROMISR                (19u)
-#define apiID_VQUEUEADDTOREGISTRY                 (20u)
-#define apiID_XQUEUEGENERICSEND                   (21u)
-#define apiID_XQUEUEGENERICSENDFROMISR            (22u)
-#define apiID_VTASKPRIORITYSET                    (23u)
-#define apiID_UXTASKPRIORITYGETFROMISR            (24u)
-#define apiID_XTASKGETTICKCOUNTFROMISR            (25u)
-#define apiID_XEVENTGROUPCLEARBITSFROMISR         (26u)
-#define apiID_XEVENTGROUPSETBITSFROMISR           (27u)
-#define apiID_XEVENTGROUPGETBITSFROMISR           (28u)
-#define apiID_XQUEUEGIVEFROMISR                   (29u)
-#define apiID_XQUEUEISQUEUEEMPTYFROMISR           (30u)
-#define apiID_XQUEUEISQUEUEFULLFROMISR            (31u) // the maximum allowed apiID for the first ID range
-
-// events which use apiSlowID_OFFSET will have 2-bytes ID
-#define apiSlowID_OFFSET                          (127u)
-
-#define apiID_VTASKALLOCATEMPUREGIONS             (1u)
-#define apiID_UXTASKPRIORITYGET                   (2u)
-#define apiID_ETASKGETSTATE                       (3u)
-#define apiID_VTASKSTARTSCHEDULER                 (4u)
-#define apiID_VTASKENDSCHEDULER                   (5u)
-#define apiID_VTASKSUSPENDALL                     (6u)
-#define apiID_XTASKRESUMEALL                      (7u)
-#define apiID_XTASKGETTICKCOUNT                   (8u)
-#define apiID_UXTASKGETNUMBEROFTASKS              (9u)
-#define apiID_PCTASKGETTASKNAME                   (10u)
-#define apiID_UXTASKGETSTACKHIGHWATERMARK         (11u)
-#define apiID_VTASKSETAPPLICATIONTASKTAG          (12u)
-#define apiID_XTASKGETAPPLICATIONTASKTAG          (13u)
-#define apiID_VTASKSETTHREADLOCALSTORAGEPOINTER   (14u)
-#define apiID_PVTASKGETTHREADLOCALSTORAGEPOINTER  (15u)
-#define apiID_XTASKCALLAPPLICATIONTASKHOOK        (16u)
-#define apiID_XTASKGETIDLETASKHANDLE              (17u)
-#define apiID_UXTASKGETSYSTEMSTATE                (18u)
-#define apiID_VTASKLIST                           (19u)
-#define apiID_VTASKGETRUNTIMESTATS                (20u)
-#define apiID_XTASKNOTIFYSTATECLEAR               (21u)
-#define apiID_XTASKGETCURRENTTASKHANDLE           (22u)
-#define apiID_VTASKSETTIMEOUTSTATE                (23u)
-#define apiID_XTASKCHECKFORTIMEOUT                (24u)
-#define apiID_VTASKMISSEDYIELD                    (25u)
-#define apiID_XTASKGETSCHEDULERSTATE              (26u)
-#define apiID_XTASKGENERICCREATE                  (27u)
-#define apiID_UXTASKGETTASKNUMBER                 (28u)
-#define apiID_VTASKSETTASKNUMBER                  (29u)
-#define apiID_ETASKCONFIRMSLEEPMODESTATUS         (30u)
-#define apiID_XTIMERCREATE                        (31u)
-#define apiID_PVTIMERGETTIMERID                   (32u)
-#define apiID_VTIMERSETTIMERID                    (33u)
-#define apiID_XTIMERISTIMERACTIVE                 (34u)
-#define apiID_XTIMERGETTIMERDAEMONTASKHANDLE      (35u)
-#define apiID_XTIMERPENDFUNCTIONCALLFROMISR       (36u)
-#define apiID_XTIMERPENDFUNCTIONCALL              (37u)
-#define apiID_PCTIMERGETTIMERNAME                 (38u)
-#define apiID_XTIMERCREATETIMERTASK               (39u)
-#define apiID_XTIMERGENERICCOMMAND                (40u)
-#define apiID_UXQUEUEMESSAGESWAITING              (41u)
-#define apiID_UXQUEUESPACESAVAILABLE              (42u)
-#define apiID_UXQUEUEMESSAGESWAITINGFROMISR       (43u)
-#define apiID_XQUEUEALTGENERICSEND                (44u)
-#define apiID_XQUEUEALTGENERICRECEIVE             (45u)
-#define apiID_XQUEUECRSENDFROMISR                 (46u)
-#define apiID_XQUEUECRRECEIVEFROMISR              (47u)
-#define apiID_XQUEUECRSEND                        (48u)
-#define apiID_XQUEUECRRECEIVE                     (49u)
-#define apiID_XQUEUECREATEMUTEX                   (50u)
-#define apiID_XQUEUECREATECOUNTINGSEMAPHORE       (51u)
-#define apiID_XQUEUEGETMUTEXHOLDER                (52u)
-#define apiID_XQUEUETAKEMUTEXRECURSIVE            (53u)
-#define apiID_XQUEUEGIVEMUTEXRECURSIVE            (54u)
-#define apiID_VQUEUEUNREGISTERQUEUE               (55u)
-#define apiID_XQUEUECREATESET                     (56u)
-#define apiID_XQUEUEADDTOSET                      (57u)
-#define apiID_XQUEUEREMOVEFROMSET                 (58u)
-#define apiID_XQUEUESELECTFROMSET                 (59u)
-#define apiID_XQUEUESELECTFROMSETFROMISR          (60u)
-#define apiID_XQUEUEGENERICRESET                  (61u)
-#define apiID_VLISTINITIALISE                     (62u)
-#define apiID_VLISTINITIALISEITEM                 (63u)
-#define apiID_VLISTINSERT                         (64u)
-#define apiID_VLISTINSERTEND                      (65u)
-#define apiID_UXLISTREMOVE                        (66u)
-#define apiID_XEVENTGROUPCREATE                   (67u)
-#define apiID_XEVENTGROUPWAITBITS                 (68u)
-#define apiID_XEVENTGROUPCLEARBITS                (69u)
-#define apiID_XEVENTGROUPSETBITS                  (70u)
-#define apiID_XEVENTGROUPSYNC                     (71u)
-#define apiID_VEVENTGROUPDELETE                   (72u)
-#define apiID_UXEVENTGROUPGETNUMBER               (73u)
-#define apiID_XSTREAMBUFFERCREATE                 (74u)
-#define apiID_VSTREAMBUFFERDELETE                 (75u)
-#define apiID_XSTREAMBUFFERRESET                  (76u)
-#define apiID_XSTREAMBUFFERSEND                   (77u)
-#define apiID_XSTREAMBUFFERSENDFROMISR            (78u)
-#define apiID_XSTREAMBUFFERRECEIVE                (79u)
-#define apiID_XSTREAMBUFFERRECEIVEFROMISR         (80u)
-
-#ifdef CONFIG_FREERTOS_SMP
-
-#define traceQUEUE_SEND( pxQueue )                                              SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSEND, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), 0u, 0u, 0u)
-
-#else // CONFIG_FREERTOS_SMP
-
-#if ( configUSE_QUEUE_SETS != 1 )
-  #define traceQUEUE_SEND( pxQueue )                                            SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSEND, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, xTicksToWait, xCopyPosition)
-#else
-  #define traceQUEUE_SEND( pxQueue )                                            SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSEND, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), 0u, 0u, 0u)
-#endif
-
-#endif // CONFIG_FREERTOS_SMP
-
-
-#define traceSTART()                                                            SEGGER_SYSVIEW_Conf()
-
-#define traceTASK_NOTIFY_TAKE(uxIndexToWait)                                    SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_ULTASKNOTIFYTAKE, xClearCountOnExit, xTicksToWait)
-#define traceTASK_DELAY()                                                       SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_VTASKDELAY, xTicksToDelay)
-#define traceTASK_DELAY_UNTIL(xTimeToWake)                                      SEGGER_SYSVIEW_RecordVoid (apiFastID_OFFSET + apiID_VTASKDELAYUNTIL)
-#define traceTASK_NOTIFY_GIVE_FROM_ISR(uxIndexToNotify)                         SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_VTASKNOTIFYGIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), (U32)pxHigherPriorityTaskWoken)
-
-#define traceTASK_PRIORITY_INHERIT( pxTCB, uxPriority )                         SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_VTASKPRIORITYINHERIT, (U32)pxMutexHolder)
-#define traceTASK_RESUME( pxTCB )                                               SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_VTASKRESUME, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB))
-#define traceINCREASE_TICK_COUNT( xTicksToJump )                                SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_VTASKSTEPTICK, xTicksToJump)
-#define traceTASK_SUSPEND( pxTCB )                                              SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_VTASKSUSPEND, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB))
-#define traceTASK_PRIORITY_DISINHERIT( pxTCB, uxBasePriority )                  SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_XTASKPRIORITYDISINHERIT, (U32)pxMutexHolder)
-#define traceTASK_RESUME_FROM_ISR( pxTCB )                                      SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_XTASKRESUMEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB))
-#define traceTASK_NOTIFY(uxIndexToNotify)                                       SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XTASKGENERICNOTIFY, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), ulValue, eAction, (U32)pulPreviousNotificationValue)
-#define traceTASK_NOTIFY_FROM_ISR(uxIndexToWait)                                SEGGER_SYSVIEW_RecordU32x5(apiFastID_OFFSET + apiID_XTASKGENERICNOTIFYFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), ulValue, eAction, (U32)pulPreviousNotificationValue, (U32)pxHigherPriorityTaskWoken)
-#define traceTASK_NOTIFY_WAIT(uxIndexToWait)                                    SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XTASKNOTIFYWAIT, ulBitsToClearOnEntry, ulBitsToClearOnExit, (U32)pulNotificationValue, xTicksToWait)
-
-#define traceQUEUE_CREATE( pxNewQueue )                                         SEGGER_SYSVIEW_RecordU32x3(apiFastID_OFFSET + apiID_XQUEUEGENERICCREATE, uxQueueLength, uxItemSize, ucQueueType)
-#define traceQUEUE_DELETE( pxQueue )                                            SEGGER_SYSVIEW_RecordU32  (apiFastID_OFFSET + apiID_VQUEUEDELETE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue))
-#define traceQUEUE_PEEK( pxQueue )                                              SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer), xTicksToWait, 1)
-#define traceQUEUE_PEEK_FROM_ISR( pxQueue )                                     SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEPEEKFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer))
-#define traceQUEUE_PEEK_FROM_ISR_FAILED( pxQueue )                              SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEPEEKFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer))
-#define traceQUEUE_RECEIVE( pxQueue )                                           SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)0), xTicksToWait, 1)
-#define traceQUEUE_RECEIVE_FAILED( pxQueue )                                    SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)0), xTicksToWait, 1)
-#define traceQUEUE_SEMAPHORE_RECEIVE( pxQueue )                                 SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)0), xTicksToWait, 0)
-#define traceQUEUE_RECEIVE_FROM_ISR( pxQueue )                                  SEGGER_SYSVIEW_RecordU32x3(apiFastID_OFFSET + apiID_XQUEUERECEIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer), (U32)pxHigherPriorityTaskWoken)
-#define traceQUEUE_RECEIVE_FROM_ISR_FAILED( pxQueue )                           SEGGER_SYSVIEW_RecordU32x3(apiFastID_OFFSET + apiID_XQUEUERECEIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer), (U32)pxHigherPriorityTaskWoken)
-#define traceQUEUE_REGISTRY_ADD( xQueue, pcQueueName )                          SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_VQUEUEADDTOREGISTRY, SEGGER_SYSVIEW_ShrinkId((U32)xQueue), (U32)pcQueueName)
-#define traceQUEUE_SEND_FAILED( pxQueue )                                       SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSEND, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, xTicksToWait, xCopyPosition)
-#define traceQUEUE_SEND_FROM_ISR( pxQueue )                                     SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSENDFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, (U32)pxHigherPriorityTaskWoken, xCopyPosition)
-#define traceQUEUE_SEND_FROM_ISR_FAILED( pxQueue )                              SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSENDFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, (U32)pxHigherPriorityTaskWoken, xCopyPosition)
-#define traceQUEUE_GIVE_FROM_ISR( pxQueue )                                     SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEGIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pxHigherPriorityTaskWoken)
-#define traceQUEUE_GIVE_FROM_ISR_FAILED( pxQueue )                              SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEGIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pxHigherPriorityTaskWoken)
-#define traceSTREAM_BUFFER_CREATE( pxStreamBuffer, xIsMessageBuffer )           SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERCREATE, (U32)xIsMessageBuffer, (U32)pxStreamBuffer)
-#define traceSTREAM_BUFFER_CREATE_FAILED( xIsMessageBuffer )                    SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERCREATE, (U32)xIsMessageBuffer, 0u)
-#define traceSTREAM_BUFFER_DELETE( xStreamBuffer )                              SEGGER_SYSVIEW_RecordU32  (apiSlowID_OFFSET + apiID_VSTREAMBUFFERDELETE, (U32)xStreamBuffer)
-#define traceSTREAM_BUFFER_RESET( xStreamBuffer )                               SEGGER_SYSVIEW_RecordU32  (apiSlowID_OFFSET + apiID_XSTREAMBUFFERRESET, (U32)xStreamBuffer)
-#define traceSTREAM_BUFFER_SEND( xStreamBuffer, xBytesSent )                    SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERSEND, (U32)xStreamBuffer, (U32)xBytesSent)
-#define traceSTREAM_BUFFER_SEND_FAILED( xStreamBuffer )                         SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERSEND, (U32)xStreamBuffer, 0u)
-#define traceSTREAM_BUFFER_SEND_FROM_ISR( xStreamBuffer, xBytesSent )           SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERSENDFROMISR, (U32)xStreamBuffer, (U32)xBytesSent)
-#define traceSTREAM_BUFFER_RECEIVE( xStreamBuffer, xReceivedLength )            SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERRECEIVE, (U32)xStreamBuffer, (U32)xReceivedLength)
-#define traceSTREAM_BUFFER_RECEIVE_FAILED( xStreamBuffer )                      SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERRECEIVE, (U32)xStreamBuffer, 0u)
-#define traceSTREAM_BUFFER_RECEIVE_FROM_ISR( xStreamBuffer, xReceivedLength )   SEGGER_SYSVIEW_RecordU32x2(apiSlowID_OFFSET + apiID_XSTREAMBUFFERRECEIVEFROMISR, (U32)xStreamBuffer, (U32)xReceivedLength)
-
-#define traceTASK_DELETE( pxTCB )                   do {                                                                                                \
-                                                      SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VTASKDELETE, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB));  \
-                                                      SYSVIEW_DeleteTask((U32)pxTCB);                                                                   \
-                                                    }  while(0)
-
-
-#if( portSTACK_GROWTH < 0 )
-#define traceTASK_CREATE(pxNewTCB)                  if (pxNewTCB != NULL) {                                             \
-                                                      SEGGER_SYSVIEW_OnTaskCreate((U32)pxNewTCB);                       \
-                                                      SYSVIEW_AddTask((U32)pxNewTCB,                                    \
-                                                                      &(pxNewTCB->pcTaskName[0]),                       \
-                                                                      pxNewTCB->uxPriority,                             \
-                                                                      (U32)pxNewTCB->pxStack,                           \
-                                                                      ((U32)pxNewTCB->pxTopOfStack - (U32)pxNewTCB->pxStack) \
-                                                                      );                                                \
-                                                    }
-#else
-#define traceTASK_CREATE(pxNewTCB)                  if (pxNewTCB != NULL) {                                             \
-                                                      SEGGER_SYSVIEW_OnTaskCreate((U32)pxNewTCB);                       \
-                                                      SYSVIEW_AddTask((U32)pxNewTCB,                                    \
-                                                                      &(pxNewTCB->pcTaskName[0]),                       \
-                                                                      pxNewTCB->uxPriority,                             \
-                                                                      (U32)pxNewTCB->pxStack,                           \
-                                                                      (U32)(pxNewTCB->pxStack-pxNewTCB->pxTopOfStack)   \
-                                                                      );                                                \
-                                                    }
-#endif
-#define traceTASK_PRIORITY_SET(pxTask, uxNewPriority) {                                                                 \
-                                                        SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET+apiID_VTASKPRIORITYSET, \
-                                                                                   SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), \
-                                                                                   uxNewPriority                        \
-                                                                                  );                                    \
-                                                        SYSVIEW_UpdateTask((U32)pxTask,                                 \
-                                                                           &(pxTask->pcTaskName[0]),                    \
-                                                                           uxNewPriority,                               \
-                                                                           (U32)pxTask->pxStack,                        \
-                                                                           0                                            \
-                                                                          );                                            \
-                                                      }
-//
-// Define INCLUDE_xTaskGetIdleTaskHandle as 1 in FreeRTOSConfig.h to allow identification of Idle state.
-//
-// SMP FreeRTOS uses unpinned IDLE tasks, so sometimes IDEL0 runs on CPU1, IDLE1 runs on CPU0 and so on.
-// So IDLE state detection based on 'xTaskGetIdleTaskHandle' does not work for SMP kernel.
-// We could compare current task handle with every element of the array returned by 'xTaskGetIdleTaskHandle',
-// but it deos not seem to be efficient enough to be worth of making code more complex and less readabl.
-// So always use task name comparison mechanism for SMP kernel.
-#if ( INCLUDE_xTaskGetIdleTaskHandle == 1  && !defined(CONFIG_FREERTOS_SMP))
-  #define traceTASK_SWITCHED_IN()                   if(prvGetTCBFromHandle(NULL) == xTaskGetIdleTaskHandle()) {         \
-                                                      SEGGER_SYSVIEW_OnIdle();                                          \
-                                                    } else {                                                            \
-                                                      SEGGER_SYSVIEW_OnTaskStartExec((U32)prvGetTCBFromHandle(NULL));   \
-                                                    }
-#else
-  #define traceTASK_SWITCHED_IN()                   {                                                                   \
-                                                      if (memcmp(prvGetTCBFromHandle(NULL)->pcTaskName, "IDLE", 4) != 0) { \
-                                                        SEGGER_SYSVIEW_OnTaskStartExec((U32)prvGetTCBFromHandle(NULL));    \
-                                                      } else {                                                          \
-                                                        SEGGER_SYSVIEW_OnIdle();                                        \
-                                                      }                                                                 \
-                                                    }
-#endif
-
-#define traceMOVED_TASK_TO_READY_STATE(pxTCB)       SEGGER_SYSVIEW_OnTaskStartReady((U32)pxTCB)
-#define traceREADDED_TASK_TO_READY_STATE(pxTCB)
-
-#define traceMOVED_TASK_TO_DELAYED_LIST()           SEGGER_SYSVIEW_OnTaskStopReady((U32)prvGetTCBFromHandle(NULL),  (1u << 2))
-#define traceMOVED_TASK_TO_OVERFLOW_DELAYED_LIST()  SEGGER_SYSVIEW_OnTaskStopReady((U32)prvGetTCBFromHandle(NULL),  (1u << 2))
-#define traceMOVED_TASK_TO_SUSPENDED_LIST(pxTCB)    SEGGER_SYSVIEW_OnTaskStopReady((U32)pxTCB,         ((3u << 3) | 3))
-
-
-#define traceISR_EXIT_TO_SCHEDULER()                SEGGER_SYSVIEW_RecordExitISRToScheduler()
-#define traceISR_EXIT()                             SEGGER_SYSVIEW_RecordExitISR()
-#define traceISR_ENTER(n)                           SEGGER_SYSVIEW_RecordEnterISR(n)
-
-/*********************************************************************
-*
-*       API functions
-*
-**********************************************************************
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-void SYSVIEW_AddTask      (U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32  pxStack, unsigned uStackHighWaterMark);
-void SYSVIEW_UpdateTask   (U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32 pxStack, unsigned uStackHighWaterMark);
-void SYSVIEW_DeleteTask   (U32 xHandle);
-void SYSVIEW_SendTaskInfo (U32 TaskID, const char* sName, unsigned Prio, U32 StackBase, unsigned StackSize);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/*************************** End of file ****************************/

components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c

@@ -0,0 +1,290 @@
+/*********************************************************************
+*                SEGGER Microcontroller GmbH & Co. KG                *
+*                        The Embedded Experts                        *
+**********************************************************************
+*                                                                    *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       SEGGER SystemView * Real-time application analysis           *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* SEGGER strongly recommends to not make any changes                 *
+* to or modify the source code of this software in order to stay     *
+* compatible with the RTT protocol and J-Link.                       *
+*                                                                    *
+* Redistribution and use in source and binary forms, with or         *
+* without modification, are permitted provided that the following    *
+* conditions are met:                                                *
+*                                                                    *
+* o Redistributions of source code must retain the above copyright   *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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           *
+* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
+* OR BUSINESS INTERRUPTION) HOWEVER 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.                                                            *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       SystemView version: V2.42                                    *
+*                                                                    *
+**********************************************************************
+-------------------------- END-OF-HEADER -----------------------------
+
+File    : SEGGER_SYSVIEW_FreeRTOS.c
+Purpose : Interface between FreeRTOS and SystemView.
+Revision: $Rev: 3734 $
+*/
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "SEGGER_SYSVIEW.h"
+#include "SEGGER_SYSVIEW_FreeRTOS.h"
+#include "string.h" // Required for memset
+
+
+
+typedef struct SYSVIEW_FREERTOS_TASK_STATUS SYSVIEW_FREERTOS_TASK_STATUS;
+
+struct SYSVIEW_FREERTOS_TASK_STATUS {
+  U32         xHandle;
+  const char* pcTaskName;
+  unsigned    uxCurrentPriority;
+  U32         pxStack;
+  unsigned    uStackHighWaterMark;
+};
+
+static SYSVIEW_FREERTOS_TASK_STATUS _aTasks[SYSVIEW_FREERTOS_MAX_NOF_TASKS];
+
+/*********************************************************************
+*
+*       _cbSendTaskList()
+*
+*  Function description
+*    This function is part of the link between FreeRTOS and SYSVIEW.
+*    Called from SystemView when asked by the host, it uses SYSVIEW
+*    functions to send the entire task list to the host.
+*/
+static void _cbSendTaskList(void) {
+  unsigned n;
+
+  for (n = 0; n < SYSVIEW_FREERTOS_MAX_NOF_TASKS; n++) {
+    if (_aTasks[n].xHandle) {
+#if INCLUDE_uxTaskGetStackHighWaterMark // Report Task Stack High Watermark
+      _aTasks[n].uStackHighWaterMark = uxTaskGetStackHighWaterMark((TaskHandle_t)_aTasks[n].xHandle);
+#endif
+      SYSVIEW_SendTaskInfo((U32)_aTasks[n].xHandle, _aTasks[n].pcTaskName, (unsigned)_aTasks[n].uxCurrentPriority, (U32)_aTasks[n].pxStack, (unsigned)_aTasks[n].uStackHighWaterMark);
+    }
+  }
+}
+
+/*********************************************************************
+*
+*       _cbGetTime()
+*
+*  Function description
+*    This function is part of the link between FreeRTOS and SYSVIEW.
+*    Called from SystemView when asked by the host, returns the
+*    current system time in micro seconds.
+*/
+static U64 _cbGetTime(void) {
+  U64 Time;
+
+  Time = xTaskGetTickCountFromISR();
+  Time *= portTICK_PERIOD_MS;
+  Time *= 1000;
+  return Time;
+}
+
+/*********************************************************************
+*
+*       Global functions
+*
+**********************************************************************
+*/
+/*********************************************************************
+*
+*       SYSVIEW_AddTask()
+*
+*  Function description
+*    Add a task to the internal list and record its information.
+*/
+void SYSVIEW_AddTask(U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32  pxStack, unsigned uStackHighWaterMark) {
+  unsigned n;
+
+  if (memcmp(pcTaskName, "IDLE", 5) == 0) {
+    return;
+  }
+
+  for (n = 0; n < SYSVIEW_FREERTOS_MAX_NOF_TASKS; n++) {
+    if (_aTasks[n].xHandle == 0) {
+      break;
+    }
+  }
+  if (n == SYSVIEW_FREERTOS_MAX_NOF_TASKS) {
+    SEGGER_SYSVIEW_Warn("SYSTEMVIEW: Could not record task information. Maximum number of tasks reached.");
+    return;
+  }
+
+  _aTasks[n].xHandle = xHandle;
+  _aTasks[n].pcTaskName = pcTaskName;
+  _aTasks[n].uxCurrentPriority = uxCurrentPriority;
+  _aTasks[n].pxStack = pxStack;
+  _aTasks[n].uStackHighWaterMark = uStackHighWaterMark;
+
+  SYSVIEW_SendTaskInfo(xHandle, pcTaskName,uxCurrentPriority, pxStack, uStackHighWaterMark);
+
+}
+
+/*********************************************************************
+*
+*       SYSVIEW_UpdateTask()
+*
+*  Function description
+*    Update a task in the internal list and record its information.
+*/
+void SYSVIEW_UpdateTask(U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32 pxStack, unsigned uStackHighWaterMark) {
+  unsigned n;
+
+  if (memcmp(pcTaskName, "IDLE", 5) == 0) {
+    return;
+  }
+
+  for (n = 0; n < SYSVIEW_FREERTOS_MAX_NOF_TASKS; n++) {
+    if (_aTasks[n].xHandle == xHandle) {
+      break;
+    }
+  }
+  if (n < SYSVIEW_FREERTOS_MAX_NOF_TASKS) {
+    _aTasks[n].pcTaskName = pcTaskName;
+    _aTasks[n].uxCurrentPriority = uxCurrentPriority;
+    _aTasks[n].pxStack = pxStack;
+    _aTasks[n].uStackHighWaterMark = uStackHighWaterMark;
+
+    SYSVIEW_SendTaskInfo(xHandle, pcTaskName, uxCurrentPriority, pxStack, uStackHighWaterMark);
+  } else {
+    SYSVIEW_AddTask(xHandle, pcTaskName, uxCurrentPriority, pxStack, uStackHighWaterMark);
+  }
+}
+
+/*********************************************************************
+*
+*       SYSVIEW_DeleteTask()
+*
+*  Function description
+*    Delete a task from the internal list.
+*/
+void SYSVIEW_DeleteTask(U32 xHandle) {
+  unsigned n;
+
+  for (n = 0; n < SYSVIEW_FREERTOS_MAX_NOF_TASKS; n++) {
+    if (_aTasks[n].xHandle == xHandle) {
+      break;
+    }
+  }
+  if (n == SYSVIEW_FREERTOS_MAX_NOF_TASKS) {
+    SEGGER_SYSVIEW_Warn("SYSTEMVIEW: Could not find task information. Cannot delete task.");
+    return;
+  }
+
+  _aTasks[n].xHandle = 0;
+}
+
+/*********************************************************************
+*
+*       SYSVIEW_SendTaskInfo()
+*
+*  Function description
+*    Record task information.
+*/
+void SYSVIEW_SendTaskInfo(U32 TaskID, const char* sName, unsigned Prio, U32 StackBase, unsigned StackSize) {
+  SEGGER_SYSVIEW_TASKINFO TaskInfo;
+
+  memset(&TaskInfo, 0, sizeof(TaskInfo)); // Fill all elements with 0 to allow extending the structure in future version without breaking the code
+  TaskInfo.TaskID     = TaskID;
+  TaskInfo.sName      = sName;
+  TaskInfo.Prio       = Prio;
+  TaskInfo.StackBase  = StackBase;
+  TaskInfo.StackSize  = StackSize;
+  SEGGER_SYSVIEW_SendTaskInfo(&TaskInfo);
+}
+
+/*********************************************************************
+*
+*       SYSVIEW_RecordU32x4()
+*
+*  Function description
+*    Record an event with 4 parameters
+*/
+void SYSVIEW_RecordU32x4(unsigned Id, U32 Para0, U32 Para1, U32 Para2, U32 Para3) {
+      U8  aPacket[SEGGER_SYSVIEW_INFO_SIZE + 4 * SEGGER_SYSVIEW_QUANTA_U32];
+      U8* pPayload;
+      //
+      pPayload = SEGGER_SYSVIEW_PREPARE_PACKET(aPacket);                // Prepare the packet for SystemView
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para0);             // Add the first parameter to the packet
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para1);             // Add the second parameter to the packet
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para2);             // Add the third parameter to the packet
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para3);             // Add the fourth parameter to the packet
+      //
+      SEGGER_SYSVIEW_SendPacket(&aPacket[0], pPayload, Id);             // Send the packet
+}
+
+/*********************************************************************
+*
+*       SYSVIEW_RecordU32x5()
+*
+*  Function description
+*    Record an event with 5 parameters
+*/
+void SYSVIEW_RecordU32x5(unsigned Id, U32 Para0, U32 Para1, U32 Para2, U32 Para3, U32 Para4) {
+      U8  aPacket[SEGGER_SYSVIEW_INFO_SIZE + 5 * SEGGER_SYSVIEW_QUANTA_U32];
+      U8* pPayload;
+      //
+      pPayload = SEGGER_SYSVIEW_PREPARE_PACKET(aPacket);                // Prepare the packet for SystemView
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para0);             // Add the first parameter to the packet
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para1);             // Add the second parameter to the packet
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para2);             // Add the third parameter to the packet
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para3);             // Add the fourth parameter to the packet
+      pPayload = SEGGER_SYSVIEW_EncodeU32(pPayload, Para4);             // Add the fifth parameter to the packet
+      //
+      SEGGER_SYSVIEW_SendPacket(&aPacket[0], pPayload, Id);             // Send the packet
+}
+
+/*********************************************************************
+*
+*       Public API structures
+*
+**********************************************************************
+*/
+// Callbacks provided to SYSTEMVIEW by FreeRTOS
+const SEGGER_SYSVIEW_OS_API SYSVIEW_X_OS_TraceAPI = {
+  _cbGetTime,
+  _cbSendTaskList,
+};
+
+/*************************** End of file ****************************/

components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.h

@@ -0,0 +1,336 @@
+/*********************************************************************
+*                SEGGER Microcontroller GmbH & Co. KG                *
+*                        The Embedded Experts                        *
+**********************************************************************
+*                                                                    *
+*       (c) 2015 - 2017  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       SEGGER SystemView * Real-time application analysis           *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* SEGGER strongly recommends to not make any changes                 *
+* to or modify the source code of this software in order to stay     *
+* compatible with the RTT protocol and J-Link.                       *
+*                                                                    *
+* Redistribution and use in source and binary forms, with or         *
+* without modification, are permitted provided that the following    *
+* conditions are met:                                                *
+*                                                                    *
+* o Redistributions of source code must retain the above copyright   *
+*   notice, this list of conditions and the following disclaimer.    *
+*                                                                    *
+* o 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.                                           *
+*                                                                    *
+* o Neither the name of SEGGER Microcontroller GmbH & Co. KG         *
+*   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           *
+* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
+* OR BUSINESS INTERRUPTION) HOWEVER 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.                                                            *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       SystemView version: V2.42                                    *
+*                                                                    *
+**********************************************************************
+-------------------------- END-OF-HEADER -----------------------------
+
+File    : SEGGER_SYSVIEW_FreeRTOS.h
+Purpose : Interface between FreeRTOS and SystemView.
+Revision: $Rev: 3734 $
+
+Notes:
+  (1) Include this file at the end of FreeRTOSConfig.h
+*/
+
+#ifndef SYSVIEW_FREERTOS_H
+#define SYSVIEW_FREERTOS_H
+
+#include "SEGGER_SYSVIEW.h"
+
+/*********************************************************************
+*
+*       Defines, configurable
+*
+**********************************************************************
+*/
+
+#define SYSVIEW_FREERTOS_MAX_NOF_TASKS  CONFIG_APPTRACE_SV_MAX_TASKS
+
+/*********************************************************************
+*
+*       Defines, fixed
+*
+**********************************************************************
+*/
+
+// for dual-core targets we use event ID to keep core ID bit (0 or 1)
+// use the highest - 1 bit of event ID to indicate core ID
+// the highest bit can not be used due to event ID encoding method
+// this reduces supported ID range to [0..63] (for 1 byte IDs) plus [128..16383] (for 2 bytes IDs)
+// so original continuous event IDs range is split into two sub-ranges for 1-bytes IDs and 2-bytes ones
+
+// events which use apiFastID_OFFSET will have 1 byte ID,
+// so for the sake of bandwidth economy events which are generated more frequently should use this ID offset
+// currently all used events fall into this range
+#define apiFastID_OFFSET                          (32u)
+
+#define apiID_VTASKDELETE                         (1u)
+#define apiID_VTASKDELAY                          (2u)
+#define apiID_VTASKDELAYUNTIL                     (3u)
+#define apiID_VTASKSUSPEND                        (4u)
+#define apiID_ULTASKNOTIFYTAKE                    (5u)
+#define apiID_VTASKNOTIFYGIVEFROMISR              (6u)
+#define apiID_VTASKPRIORITYINHERIT                (7u)
+#define apiID_VTASKRESUME                         (8u)
+#define apiID_VTASKSTEPTICK                       (9u)
+#define apiID_XTASKPRIORITYDISINHERIT             (10u)
+#define apiID_XTASKRESUMEFROMISR                  (11u)
+#define apiID_XTASKGENERICNOTIFY                  (12u)
+#define apiID_XTASKGENERICNOTIFYFROMISR           (13u)
+#define apiID_XTASKNOTIFYWAIT                     (14u)
+#define apiID_XQUEUEGENERICCREATE                 (15u)
+#define apiID_VQUEUEDELETE                        (16u)
+#define apiID_XQUEUEGENERICRECEIVE                (17u)
+#define apiID_XQUEUEPEEKFROMISR                   (18u)
+#define apiID_XQUEUERECEIVEFROMISR                (19u)
+#define apiID_VQUEUEADDTOREGISTRY                 (20u)
+#define apiID_XQUEUEGENERICSEND                   (21u)
+#define apiID_XQUEUEGENERICSENDFROMISR            (22u)
+#define apiID_VTASKPRIORITYSET                    (23u)
+#define apiID_UXTASKPRIORITYGETFROMISR            (24u)
+#define apiID_XTASKGETTICKCOUNTFROMISR            (25u)
+#define apiID_XEVENTGROUPCLEARBITSFROMISR         (26u)
+#define apiID_XEVENTGROUPSETBITSFROMISR           (27u)
+#define apiID_XEVENTGROUPGETBITSFROMISR           (28u)
+#define apiID_XQUEUEGIVEFROMISR                   (29u)
+#define apiID_XQUEUEISQUEUEEMPTYFROMISR           (30u)
+#define apiID_XQUEUEISQUEUEFULLFROMISR            (31u) // the maximum allowed apiID for the first ID range
+
+// events which use apiSlowID_OFFSET will have 2-bytes ID
+#define apiSlowID_OFFSET                          (127u)
+
+#define apiID_VTASKALLOCATEMPUREGIONS             (1u)
+#define apiID_UXTASKPRIORITYGET                   (2u)
+#define apiID_ETASKGETSTATE                       (3u)
+#define apiID_VTASKSTARTSCHEDULER                 (4u)
+#define apiID_VTASKENDSCHEDULER                   (5u)
+#define apiID_VTASKSUSPENDALL                     (6u)
+#define apiID_XTASKRESUMEALL                      (7u)
+#define apiID_XTASKGETTICKCOUNT                   (8u)
+#define apiID_UXTASKGETNUMBEROFTASKS              (9u)
+#define apiID_PCTASKGETTASKNAME                   (10u)
+#define apiID_UXTASKGETSTACKHIGHWATERMARK         (11u)
+#define apiID_VTASKSETAPPLICATIONTASKTAG          (12u)
+#define apiID_XTASKGETAPPLICATIONTASKTAG          (13u)
+#define apiID_VTASKSETTHREADLOCALSTORAGEPOINTER   (14u)
+#define apiID_PVTASKGETTHREADLOCALSTORAGEPOINTER  (15u)
+#define apiID_XTASKCALLAPPLICATIONTASKHOOK        (16u)
+#define apiID_XTASKGETIDLETASKHANDLE              (17u)
+#define apiID_UXTASKGETSYSTEMSTATE                (18u)
+#define apiID_VTASKLIST                           (19u)
+#define apiID_VTASKGETRUNTIMESTATS                (20u)
+#define apiID_XTASKNOTIFYSTATECLEAR               (21u)
+#define apiID_XTASKGETCURRENTTASKHANDLE           (22u)
+#define apiID_VTASKSETTIMEOUTSTATE                (23u)
+#define apiID_XTASKCHECKFORTIMEOUT                (24u)
+#define apiID_VTASKMISSEDYIELD                    (25u)
+#define apiID_XTASKGETSCHEDULERSTATE              (26u)
+#define apiID_XTASKGENERICCREATE                  (27u)
+#define apiID_UXTASKGETTASKNUMBER                 (28u)
+#define apiID_VTASKSETTASKNUMBER                  (29u)
+#define apiID_ETASKCONFIRMSLEEPMODESTATUS         (30u)
+#define apiID_XTIMERCREATE                        (31u)
+#define apiID_PVTIMERGETTIMERID                   (32u)
+#define apiID_VTIMERSETTIMERID                    (33u)
+#define apiID_XTIMERISTIMERACTIVE                 (34u)
+#define apiID_XTIMERGETTIMERDAEMONTASKHANDLE      (35u)
+#define apiID_XTIMERPENDFUNCTIONCALLFROMISR       (36u)
+#define apiID_XTIMERPENDFUNCTIONCALL              (37u)
+#define apiID_PCTIMERGETTIMERNAME                 (38u)
+#define apiID_XTIMERCREATETIMERTASK               (39u)
+#define apiID_XTIMERGENERICCOMMAND                (40u)
+#define apiID_UXQUEUEMESSAGESWAITING              (41u)
+#define apiID_UXQUEUESPACESAVAILABLE              (42u)
+#define apiID_UXQUEUEMESSAGESWAITINGFROMISR       (43u)
+#define apiID_XQUEUEALTGENERICSEND                (44u)
+#define apiID_XQUEUEALTGENERICRECEIVE             (45u)
+#define apiID_XQUEUECRSENDFROMISR                 (46u)
+#define apiID_XQUEUECRRECEIVEFROMISR              (47u)
+#define apiID_XQUEUECRSEND                        (48u)
+#define apiID_XQUEUECRRECEIVE                     (49u)
+#define apiID_XQUEUECREATEMUTEX                   (50u)
+#define apiID_XQUEUECREATECOUNTINGSEMAPHORE       (51u)
+#define apiID_XQUEUEGETMUTEXHOLDER                (52u)
+#define apiID_XQUEUETAKEMUTEXRECURSIVE            (53u)
+#define apiID_XQUEUEGIVEMUTEXRECURSIVE            (54u)
+#define apiID_VQUEUEUNREGISTERQUEUE               (55u)
+#define apiID_XQUEUECREATESET                     (56u)
+#define apiID_XQUEUEADDTOSET                      (57u)
+#define apiID_XQUEUEREMOVEFROMSET                 (58u)
+#define apiID_XQUEUESELECTFROMSET                 (59u)
+#define apiID_XQUEUESELECTFROMSETFROMISR          (60u)
+#define apiID_XQUEUEGENERICRESET                  (61u)
+#define apiID_VLISTINITIALISE                     (62u)
+#define apiID_VLISTINITIALISEITEM                 (63u)
+#define apiID_VLISTINSERT                         (64u)
+#define apiID_VLISTINSERTEND                      (65u)
+#define apiID_UXLISTREMOVE                        (66u)
+#define apiID_XEVENTGROUPCREATE                   (67u)
+#define apiID_XEVENTGROUPWAITBITS                 (68u)
+#define apiID_XEVENTGROUPCLEARBITS                (69u)
+#define apiID_XEVENTGROUPSETBITS                  (70u)
+#define apiID_XEVENTGROUPSYNC                     (71u)
+#define apiID_VEVENTGROUPDELETE                   (72u)
+#define apiID_UXEVENTGROUPGETNUMBER               (73u)
+
+#define traceTASK_NOTIFY_TAKE( uxIndexToWait )                        SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_ULTASKNOTIFYTAKE, xClearCountOnExit, xTicksToWait)
+#define traceTASK_DELAY()                                             SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VTASKDELAY, xTicksToDelay)
+#define traceTASK_DELAY_UNTIL()                                       SEGGER_SYSVIEW_RecordVoid(apiFastID_OFFSET + apiID_VTASKDELAYUNTIL)
+#define traceTASK_DELETE( pxTCB )                                     if (pxTCB != NULL) {                                              \
+						                                                SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VTASKDELETE,  \
+						                                                                      SEGGER_SYSVIEW_ShrinkId((U32)pxTCB)); 	\
+					                                                    SYSVIEW_DeleteTask((U32)pxTCB);                                 \
+					                                                  }
+#define traceTASK_NOTIFY_GIVE_FROM_ISR( uxIndexToNotify )             SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_VTASKNOTIFYGIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), (U32)pxHigherPriorityTaskWoken)
+#define traceTASK_PRIORITY_INHERIT( pxTCB, uxPriority )               SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VTASKPRIORITYINHERIT, (U32)pxMutexHolder)
+#define traceTASK_RESUME( pxTCB )                                     SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VTASKRESUME, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB))
+#define traceINCREASE_TICK_COUNT( xTicksToJump )                      SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VTASKSTEPTICK, xTicksToJump)
+#define traceTASK_SUSPEND( pxTCB )                                    SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VTASKSUSPEND, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB))
+#define traceTASK_PRIORITY_DISINHERIT( pxTCB, uxBasePriority )        SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_XTASKPRIORITYDISINHERIT, (U32)pxMutexHolder)
+#define traceTASK_RESUME_FROM_ISR( pxTCB )                            SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_XTASKRESUMEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB))
+#define traceTASK_NOTIFY( uxIndexToNotify )                           SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XTASKGENERICNOTIFY, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), ulValue, eAction, (U32)pulPreviousNotificationValue)
+#define traceTASK_NOTIFY_FROM_ISR( uxIndexToNotify )                  SYSVIEW_RecordU32x5(apiFastID_OFFSET + apiID_XTASKGENERICNOTIFYFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), ulValue, eAction, (U32)pulPreviousNotificationValue, (U32)pxHigherPriorityTaskWoken)
+#define traceTASK_NOTIFY_WAIT( uxIndexToWait )                        SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XTASKNOTIFYWAIT, ulBitsToClearOnEntry, ulBitsToClearOnExit, (U32)pulNotificationValue, xTicksToWait)
+
+#define traceQUEUE_CREATE( pxNewQueue )                               SEGGER_SYSVIEW_RecordU32x3(apiFastID_OFFSET + apiID_XQUEUEGENERICCREATE, uxQueueLength, uxItemSize, ucQueueType)
+#define traceQUEUE_DELETE( pxQueue )                                  SEGGER_SYSVIEW_RecordU32(apiFastID_OFFSET + apiID_VQUEUEDELETE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue))
+#define traceQUEUE_PEEK( pxQueue )                                    SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer), xTicksToWait, 0)
+#define traceQUEUE_PEEK_FROM_ISR( pxQueue )                           SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEPEEKFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer))
+#define traceQUEUE_PEEK_FROM_ISR_FAILED( pxQueue )                    SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEPEEKFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer))
+#define traceQUEUE_RECEIVE( pxQueue )                                 SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)0), xTicksToWait, 1)
+#define traceQUEUE_RECEIVE_FAILED( pxQueue )                          SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)0), xTicksToWait, 1)
+#define traceQUEUE_SEMAPHORE_RECEIVE( pxQueue )                       SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICRECEIVE, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)0), xTicksToWait, 0)
+#define traceQUEUE_RECEIVE_FROM_ISR( pxQueue )                        SEGGER_SYSVIEW_RecordU32x3(apiFastID_OFFSET + apiID_XQUEUERECEIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer), (U32)pxHigherPriorityTaskWoken)
+#define traceQUEUE_RECEIVE_FROM_ISR_FAILED( pxQueue )                 SEGGER_SYSVIEW_RecordU32x3(apiFastID_OFFSET + apiID_XQUEUERECEIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), SEGGER_SYSVIEW_ShrinkId((U32)pvBuffer), (U32)pxHigherPriorityTaskWoken)
+#define traceQUEUE_REGISTRY_ADD( xQueue, pcQueueName )                SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_VQUEUEADDTOREGISTRY, SEGGER_SYSVIEW_ShrinkId((U32)xQueue), (U32)pcQueueName)
+#if ( configUSE_QUEUE_SETS != 1 )
+  #define traceQUEUE_SEND( pxQueue )                                    SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSEND, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, xTicksToWait, xCopyPosition)
+#else
+  #define traceQUEUE_SEND( pxQueue )                                    SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSEND, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), 0, 0, xCopyPosition)
+#endif
+#define traceQUEUE_SEND_FAILED( pxQueue )                             SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSEND, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, xTicksToWait, xCopyPosition)
+#define traceQUEUE_SEND_FROM_ISR( pxQueue )                           SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSENDFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, (U32)pxHigherPriorityTaskWoken, xCopyPosition)
+#define traceQUEUE_SEND_FROM_ISR_FAILED( pxQueue )                    SEGGER_SYSVIEW_RecordU32x4(apiFastID_OFFSET + apiID_XQUEUEGENERICSENDFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pvItemToQueue, (U32)pxHigherPriorityTaskWoken, xCopyPosition)
+#define traceQUEUE_GIVE_FROM_ISR( pxQueue )                           SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEGIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pxHigherPriorityTaskWoken)
+#define traceQUEUE_GIVE_FROM_ISR_FAILED( pxQueue )                    SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET + apiID_XQUEUEGIVEFROMISR, SEGGER_SYSVIEW_ShrinkId((U32)pxQueue), (U32)pxHigherPriorityTaskWoken)
+
+#if( portSTACK_GROWTH < 0 )
+#define traceTASK_CREATE(pxNewTCB)                  if (pxNewTCB != NULL) {                                             \
+                                                      SEGGER_SYSVIEW_OnTaskCreate((U32)pxNewTCB);                       \
+                                                      SYSVIEW_AddTask((U32)pxNewTCB,                                    \
+                                                                      &(pxNewTCB->pcTaskName[0]),                       \
+                                                                      pxNewTCB->uxPriority,                             \
+                                                                      (U32)pxNewTCB->pxStack,                           \
+                                                                      ((U32)pxNewTCB->pxTopOfStack - (U32)pxNewTCB->pxStack) \
+                                                                      );                                                \
+                                                    }
+#else
+#define traceTASK_CREATE(pxNewTCB)                  if (pxNewTCB != NULL) {                                             \
+                                                      SEGGER_SYSVIEW_OnTaskCreate((U32)pxNewTCB);                       \
+                                                      SYSVIEW_AddTask((U32)pxNewTCB,                                    \
+                                                                      &(pxNewTCB->pcTaskName[0]),                       \
+                                                                      pxNewTCB->uxPriority,                             \
+                                                                      (U32)pxNewTCB->pxStack,                           \
+                                                                      (U32)(pxNewTCB->pxStack-pxNewTCB->pxTopOfStack)   \
+                                                                      );                                                \
+                                                    }
+#endif
+#define traceTASK_PRIORITY_SET(pxTask, uxNewPriority) {                                                                 \
+                                                        SEGGER_SYSVIEW_RecordU32x2(apiFastID_OFFSET+apiID_VTASKPRIORITYSET, \
+                                                                                   SEGGER_SYSVIEW_ShrinkId((U32)pxTCB), \
+                                                                                   uxNewPriority                        \
+                                                                                  );                                    \
+                                                        SYSVIEW_UpdateTask((U32)pxTask,                                 \
+                                                                           &(pxTask->pcTaskName[0]),                    \
+                                                                           uxNewPriority,                               \
+                                                                           (U32)pxTask->pxStack,                        \
+                                                                           0                                            \
+                                                                          );                                            \
+                                                      }
+//
+// Define INCLUDE_xTaskGetIdleTaskHandle as 1 in FreeRTOSConfig.h to allow identification of Idle state.
+//
+#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )
+  #define traceTASK_SWITCHED_IN()                   if(prvGetTCBFromHandle(NULL) == xTaskGetIdleTaskHandle()) {           \
+                                                      SEGGER_SYSVIEW_OnIdle();                                          \
+                                                    } else {                                                            \
+                                                      SEGGER_SYSVIEW_OnTaskStartExec((U32)pxCurrentTCB[cpu_hal_get_core_id()]); \
+                                                    }
+#else
+  #define traceTASK_SWITCHED_IN()                   {                                                                   \
+                                                      if (memcmp(pxCurrentTCB[cpu_hal_get_core_id()]->pcTaskName, "IDLE", 5) != 0) { \
+                                                        SEGGER_SYSVIEW_OnTaskStartExec((U32)pxCurrentTCB[cpu_hal_get_core_id()]);    \
+                                                      } else {                                                          \
+                                                        SEGGER_SYSVIEW_OnIdle();                                        \
+                                                      }                                                                 \
+                                                    }
+#endif
+
+#define traceMOVED_TASK_TO_READY_STATE(pxTCB)       SEGGER_SYSVIEW_OnTaskStartReady((U32)pxTCB)
+#define traceREADDED_TASK_TO_READY_STATE(pxTCB)
+
+#define traceMOVED_TASK_TO_DELAYED_LIST()           SEGGER_SYSVIEW_OnTaskStopReady((U32)pxCurrentTCB[cpu_hal_get_core_id()],  (1u << 2))
+#define traceMOVED_TASK_TO_OVERFLOW_DELAYED_LIST()  SEGGER_SYSVIEW_OnTaskStopReady((U32)pxCurrentTCB[cpu_hal_get_core_id()],  (1u << 2))
+#define traceMOVED_TASK_TO_SUSPENDED_LIST(pxTCB)    SEGGER_SYSVIEW_OnTaskStopReady((U32)pxTCB,         ((3u << 3) | 3))
+
+#define traceISR_EXIT_TO_SCHEDULER()                SEGGER_SYSVIEW_RecordExitISRToScheduler()
+#define traceISR_EXIT()                             SEGGER_SYSVIEW_RecordExitISR()
+#define traceISR_ENTER(_n_)                         SEGGER_SYSVIEW_RecordEnterISR(_n_)
+
+
+/*********************************************************************
+*
+*       API functions
+*
+**********************************************************************
+*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+void SYSVIEW_AddTask      (U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32  pxStack, unsigned uStackHighWaterMark);
+void SYSVIEW_UpdateTask   (U32 xHandle, const char* pcTaskName, unsigned uxCurrentPriority, U32 pxStack, unsigned uStackHighWaterMark);
+void SYSVIEW_DeleteTask   (U32 xHandle);
+void SYSVIEW_SendTaskInfo (U32 TaskID, const char* sName, unsigned Prio, U32 StackBase, unsigned StackSize);
+void SYSVIEW_RecordU32x4  (unsigned Id, U32 Para0, U32 Para1, U32 Para2, U32 Para3);
+void SYSVIEW_RecordU32x5  (unsigned Id, U32 Para0, U32 Para1, U32 Para2, U32 Para3, U32 Para4);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/*************************** End of file ****************************/

components/app_trace/sys_view/esp/SEGGER_RTT_esp.c

@@ -12,8 +12,6 @@
 
 #include "esp_app_trace.h"
 #include "esp_log.h"
-#include "esp_cpu.h"
-#include "esp_private/startup_internal.h"
 
 const static char *TAG = "segger_rtt";
 
@@ -32,19 +30,6 @@ static uint8_t s_events_buf[SYSVIEW_EVENTS_BUF_SZ];
 static uint16_t s_events_buf_filled;
 static uint8_t s_down_buf[SYSVIEW_DOWN_BUF_SIZE];
 
-#if CONFIG_APPTRACE_SV_DEST_UART
-
-#define ESP_APPTRACE_DEST_SYSVIEW ESP_APPTRACE_DEST_UART
-#if CONFIG_APPTRACE_SV_DEST_CPU_0 || CONFIG_FREERTOS_UNICORE
-#define APPTRACE_SV_DEST_CPU 0
-#else
-#define APPTRACE_SV_DEST_CPU 1
-#endif // CONFIG_APPTRACE_SV_DEST_CPU_0
-
-#elif CONFIG_APPTRACE_SV_DEST_JTAG || (CONFIG_APPTRACE_ENABLE && CONFIG_APPTRACE_DEST_UART_NONE)
-#define ESP_APPTRACE_DEST_SYSVIEW ESP_APPTRACE_DEST_TRAX
-#endif
-
 /*********************************************************************
 *
 *       Public code
@@ -70,13 +55,13 @@ void SEGGER_RTT_ESP_FlushNoLock(unsigned long min_sz, unsigned long tmo)
 {
     esp_err_t res;
     if (s_events_buf_filled > 0) {
-      res = esp_apptrace_write(ESP_APPTRACE_DEST_SYSVIEW, s_events_buf, s_events_buf_filled, tmo);
+      res = esp_apptrace_write(ESP_APPTRACE_DEST_TRAX, s_events_buf, s_events_buf_filled, tmo);
       if (res != ESP_OK) {
         ESP_LOGE(TAG, "Failed to flush buffered events (%d)!\n", res);
       }
     }
     // flush even if we failed to write buffered events, because no new events will be sent after STOP
-    res = esp_apptrace_flush_nolock(ESP_APPTRACE_DEST_SYSVIEW, min_sz, tmo);
+    res = esp_apptrace_flush_nolock(ESP_APPTRACE_DEST_TRAX, min_sz, tmo);
     if (res != ESP_OK) {
       ESP_LOGE(TAG, "Failed to flush apptrace data (%d)!\n", res);
     }
@@ -123,7 +108,7 @@ void SEGGER_RTT_ESP_Flush(unsigned long min_sz, unsigned long tmo)
 */
 unsigned SEGGER_RTT_ReadNoLock(unsigned BufferIndex, void* pData, unsigned BufferSize) {
   uint32_t size = BufferSize;
-  esp_err_t res = esp_apptrace_read(ESP_APPTRACE_DEST_SYSVIEW, pData, &size, 0);
+  esp_err_t res = esp_apptrace_read(ESP_APPTRACE_DEST_TRAX, pData, &size, 0);
   if (res != ESP_OK) {
     return 0;
   }
@@ -157,40 +142,12 @@ unsigned SEGGER_RTT_ReadNoLock(unsigned BufferIndex, void* pData, unsigned Buffe
 unsigned SEGGER_RTT_WriteSkipNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes) {
   uint8_t *pbuf = (uint8_t *)pBuffer;
   uint8_t event_id = *pbuf;
-#if CONFIG_APPTRACE_SV_DEST_UART
-  if (
-    (APPTRACE_SV_DEST_CPU != esp_cpu_get_core_id()) &&
-    (
-      (event_id == SYSVIEW_EVTID_ISR_ENTER) ||
-      (event_id == SYSVIEW_EVTID_ISR_EXIT) ||
-      (event_id == SYSVIEW_EVTID_TASK_START_EXEC) ||
-      (event_id == SYSVIEW_EVTID_TASK_STOP_EXEC) ||
-      (event_id == SYSVIEW_EVTID_TASK_START_READY) ||
-      (event_id == SYSVIEW_EVTID_TASK_STOP_READY) ||
-      (event_id == SYSVIEW_EVTID_USER_START) ||
-      (event_id == SYSVIEW_EVTID_USER_STOP) ||
-      (event_id == SYSVIEW_EVTID_TIMER_ENTER) ||
-      (event_id == SYSVIEW_EVTID_TIMER_EXIT) ||
-      (event_id == SYSVIEW_EVTID_STACK_INFO) ||
-      (event_id == SYSVIEW_EVTID_MODULEDESC)
-    )
-  ){
-    return NumBytes;
-  }
-
-// This is workaround for SystemView!
-// Without this line SystemView will hangs on when heap tracing enabled.
-  if(event_id == SYSVIEW_EVTID_MODULEDESC){
-    return NumBytes;
-  }
-#endif // CONFIG_APPTRACE_SV_DEST_UART
 
   if (NumBytes > SYSVIEW_EVENTS_BUF_SZ) {
       ESP_LOGE(TAG, "Too large event %u bytes!", NumBytes);
       return 0;
   }
-#if CONFIG_APPTRACE_SV_DEST_JTAG
-  if (esp_cpu_get_core_id()) { // dual core specific code
+  if (cpu_hal_get_core_id()) { // dual core specific code
     // use the highest - 1 bit of event ID to indicate core ID
     // the highest bit can not be used due to event ID encoding method
     // this reduces supported ID range to [0..63] (for 1 byte IDs) plus [128..16383] (for 2 bytes IDs)
@@ -200,31 +157,16 @@ unsigned SEGGER_RTT_WriteSkipNoLock(unsigned BufferIndex, const void* pBuffer, u
       *pbuf |= (1 << 6);
     }
   }
-#endif // CONFIG_APPTRACE_SV_DEST_JTAG
-#if CONFIG_APPTRACE_SV_DEST_JTAG
   if (s_events_buf_filled + NumBytes > SYSVIEW_EVENTS_BUF_SZ) {
-
-    esp_err_t res = esp_apptrace_write(ESP_APPTRACE_DEST_SYSVIEW, s_events_buf, s_events_buf_filled, SEGGER_HOST_WAIT_TMO);
+    esp_err_t res = esp_apptrace_write(ESP_APPTRACE_DEST_TRAX, s_events_buf, s_events_buf_filled, SEGGER_HOST_WAIT_TMO);
     if (res != ESP_OK) {
       return 0; // skip current data buffer only, accumulated events are kept
     }
     s_events_buf_filled = 0;
   }
-#endif
   memcpy(&s_events_buf[s_events_buf_filled], pBuffer, NumBytes);
   s_events_buf_filled += NumBytes;
-
-#if CONFIG_APPTRACE_SV_DEST_UART
-  esp_err_t res = esp_apptrace_write(ESP_APPTRACE_DEST_SYSVIEW, pBuffer, NumBytes, SEGGER_HOST_WAIT_TMO);
-  if (res != ESP_OK)
-  {
-    return 0; // skip current data buffer only, accumulated events are kept
-  }
-  s_events_buf_filled = 0;
-#endif
-
-  if (event_id == SYSVIEW_EVTID_TRACE_STOP)
-  {
+  if (event_id == SYSVIEW_EVTID_TRACE_STOP) {
     SEGGER_RTT_ESP_FlushNoLock(0, SEGGER_STOP_WAIT_TMO);
   }
   return NumBytes;
@@ -290,17 +232,4 @@ int SEGGER_RTT_ConfigDownBuffer(unsigned BufferIndex, const char* sName, void* p
   return 0;
 }
 
-/*************************** Init hook ****************************
- *
- * This init function is placed here because this port file will be
- * linked whenever SystemView is used.
- */
-
-ESP_SYSTEM_INIT_FN(sysview_init, BIT(0), 120)
-{
-    SEGGER_SYSVIEW_Conf();
-    return ESP_OK;
-}
-
-
 /*************************** End of file ****************************/

components/app_trace/test/CMakeLists.txt

@@ -1,4 +1,3 @@
 idf_component_register(SRC_DIRS "."
                     PRIV_INCLUDE_DIRS "."
                     PRIV_REQUIRES cmock driver)
-target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

components/app_trace/test/component.mk

@@ -0,0 +1,5 @@
+#
+#Component Makefile
+#
+
+COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive

components/app_trace/test/test_trace.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -9,10 +9,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "unity.h"
-#include "driver/gptimer.h"
-#include "esp_intr_alloc.h"
+#include "driver/timer.h"
 #include "esp_rom_sys.h"
-#include "esp_cpu.h"
+#include "soc/cpu.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/semphr.h"
 #include "freertos/task.h"
@@ -66,6 +65,29 @@ const static char *TAG = "esp_apptrace_test";
 #define ESP_APPTRACE_TEST_LOGV( format, ... )  ESP_APPTRACE_TEST_LOG_LEVEL(V, ESP_LOG_VERBOSE, format, ##__VA_ARGS__)
 #define ESP_APPTRACE_TEST_LOGO( format, ... )  ESP_APPTRACE_TEST_LOG_LEVEL(E, ESP_LOG_NONE, format, ##__VA_ARGS__)
 
+static void esp_apptrace_test_timer_init(int timer_group, int timer_idx, uint32_t period)
+{
+    timer_config_t config;
+    uint64_t alarm_val = (period * (TIMER_BASE_CLK / 1000000UL)) / 2;
+
+    config.alarm_en = 1;
+    config.auto_reload = 1;
+    config.counter_dir = TIMER_COUNT_UP;
+    config.divider = 2;     //Range is 2 to 65536
+    config.intr_type = TIMER_INTR_LEVEL;
+    config.counter_en = TIMER_PAUSE;
+    /*Configure timer*/
+    timer_init(timer_group, timer_idx, &config);
+    /*Stop timer counter*/
+    timer_pause(timer_group, timer_idx);
+    /*Load counter value */
+    timer_set_counter_value(timer_group, timer_idx, 0x00000000ULL);
+    /*Set alarm value*/
+    timer_set_alarm_value(timer_group, timer_idx, alarm_val);
+    /*Enable timer interrupt*/
+    timer_enable_intr(timer_group, timer_idx);
+}
+
 #if CONFIG_APPTRACE_SV_ENABLE == 0
 #define ESP_APPTRACE_TEST_WRITE(_b_, _s_)            esp_apptrace_write(ESP_APPTRACE_DEST_TRAX, _b_, _s_, ESP_APPTRACE_TMO_INFINITE)
 #define ESP_APPTRACE_TEST_WRITE_FROM_ISR(_b_, _s_)   esp_apptrace_write(ESP_APPTRACE_DEST_TRAX, _b_, _s_, 0UL)
@@ -81,8 +103,9 @@ typedef struct {
 } esp_apptrace_test_gen_data_t;
 
 typedef struct {
-    gptimer_handle_t gptimer;
-    bool (*isr_func)(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx);
+    int  group;
+    int  id;
+    void (*isr_func)(void *);
     esp_apptrace_test_gen_data_t data;
 } esp_apptrace_test_timer_arg_t;
 
@@ -94,6 +117,7 @@ typedef struct {
     esp_apptrace_test_gen_data_t data;
     volatile int stop;
     SemaphoreHandle_t done;
+
     uint32_t timers_num;
     esp_apptrace_test_timer_arg_t *timers;
 } esp_apptrace_test_task_arg_t;
@@ -109,87 +133,103 @@ static SemaphoreHandle_t s_print_lock;
 
 static uint64_t esp_apptrace_test_ts_get(void);
 
-static bool esp_apptrace_test_timer_isr(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx)
+static void esp_apptrace_test_timer_isr(void *arg)
 {
-    esp_apptrace_test_timer_arg_t *tim_arg = (esp_apptrace_test_timer_arg_t *)user_ctx;
+    esp_apptrace_test_timer_arg_t *tim_arg = (esp_apptrace_test_timer_arg_t *)arg;
 
     uint32_t *ts = (uint32_t *)(tim_arg->data.buf + sizeof(uint32_t));
     *ts = (uint32_t)esp_apptrace_test_ts_get();
     memset(tim_arg->data.buf + 2 * sizeof(uint32_t), tim_arg->data.wr_cnt & tim_arg->data.mask, tim_arg->data.buf_sz - 2 * sizeof(uint32_t));
     int res = ESP_APPTRACE_TEST_WRITE_FROM_ISR(tim_arg->data.buf, tim_arg->data.buf_sz);
-    if (res == ESP_OK) {
+    if (res != ESP_OK) {
+    } else {
+        if (0) {
+            esp_rom_printf("tim-%d-%d: Written chunk%d %d bytes, %x\n",
+                       tim_arg->group, tim_arg->id, tim_arg->data.wr_cnt, tim_arg->data.buf_sz, tim_arg->data.wr_cnt & tim_arg->data.mask);
+        }
         tim_arg->data.wr_err = 0;
     }
 
     tim_arg->data.wr_cnt++;
-    return true;
+    timer_group_clr_intr_status_in_isr(tim_arg->group, tim_arg->id);
+    timer_group_enable_alarm_in_isr(tim_arg->group, tim_arg->id);
 }
 
-static bool esp_apptrace_test_timer_isr_crash(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx)
+static void esp_apptrace_test_timer_isr_crash(void *arg)
 {
-    esp_apptrace_test_timer_arg_t *tim_arg = (esp_apptrace_test_timer_arg_t *)user_ctx;
+    esp_apptrace_test_timer_arg_t *tim_arg = (esp_apptrace_test_timer_arg_t *)arg;
 
+    timer_group_clr_intr_status_in_isr(tim_arg->group, tim_arg->id);
+    timer_group_enable_alarm_in_isr(tim_arg->group, tim_arg->id);
     if (tim_arg->data.wr_cnt < ESP_APPTRACE_TEST_BLOCKS_BEFORE_CRASH) {
         uint32_t *ts = (uint32_t *)(tim_arg->data.buf + sizeof(uint32_t));
         *ts = (uint32_t)esp_apptrace_test_ts_get();//xthal_get_ccount();//xTaskGetTickCount();
         memset(tim_arg->data.buf + 2 * sizeof(uint32_t), tim_arg->data.wr_cnt & tim_arg->data.mask, tim_arg->data.buf_sz - 2 * sizeof(uint32_t));
         int res = ESP_APPTRACE_TEST_WRITE_FROM_ISR(tim_arg->data.buf, tim_arg->data.buf_sz);
         if (res != ESP_OK) {
-            esp_rom_printf("tim-%x: Failed to write trace %d %x!\n", tim_arg->gptimer, res, tim_arg->data.wr_cnt & tim_arg->data.mask);
+            esp_rom_printf("tim-%d-%d: Failed to write trace %d %x!\n", tim_arg->group, tim_arg->id, res, tim_arg->data.wr_cnt & tim_arg->data.mask);
         } else {
-            esp_rom_printf("tim-%x: Written chunk%d %d bytes, %x\n",
-                           timer, tim_arg->data.wr_cnt, tim_arg->data.buf_sz, tim_arg->data.wr_cnt & tim_arg->data.mask);
+            esp_rom_printf("tim-%d-%d: Written chunk%d %d bytes, %x\n",
+                       tim_arg->group, tim_arg->id, tim_arg->data.wr_cnt, tim_arg->data.buf_sz, tim_arg->data.wr_cnt & tim_arg->data.mask);
             tim_arg->data.wr_cnt++;
         }
     } else {
         uint32_t *ptr = 0;
         *ptr = 1000;
     }
-    return true;
 }
 
 static void esp_apptrace_dummy_task(void *p)
 {
     esp_apptrace_test_task_arg_t *arg = (esp_apptrace_test_task_arg_t *) p;
+    int res, flags = 0, i;
+    timer_isr_handle_t *inth = NULL;
     TickType_t tmo_ticks = arg->data.period / (1000 * portTICK_PERIOD_MS);
 
     ESP_APPTRACE_TEST_LOGI("%x: run dummy task (period %u us, %u timers)", xTaskGetCurrentTaskHandle(), arg->data.period, arg->timers_num);
 
-    for (int i = 0; i < arg->timers_num; i++) {
-        gptimer_config_t timer_config = {
-            .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-            .direction = GPTIMER_COUNT_UP,
-            .resolution_hz = 1000000,
-        };
-        TEST_ESP_OK(gptimer_new_timer(&timer_config, &arg->timers[i].gptimer));
-        *(uint32_t *)arg->timers[i].data.buf = (uint32_t)arg->timers[i].gptimer | (1 << 31);
-        ESP_APPTRACE_TEST_LOGI("%x: start timer %x period %u us", xTaskGetCurrentTaskHandle(), arg->timers[i].gptimer, arg->timers[i].data.period);
-        gptimer_alarm_config_t alarm_config = {
-            .reload_count = 0,
-            .alarm_count = arg->timers[i].data.period,
-            .flags.auto_reload_on_alarm = true,
-        };
-        gptimer_event_callbacks_t cbs = {
-            .on_alarm = arg->timers[i].isr_func,
-        };
-        TEST_ESP_OK(gptimer_register_event_callbacks(arg->timers[i].gptimer, &cbs, &arg->timers[i]));
-        TEST_ESP_OK(gptimer_enable(arg->timers[i].gptimer));
-        TEST_ESP_OK(gptimer_set_alarm_action(arg->timers[i].gptimer, &alarm_config));
-        TEST_ESP_OK(gptimer_start(arg->timers[i].gptimer));
+    if (arg->timers_num > 0) {
+        inth = pvPortMalloc(arg->timers_num * sizeof(timer_isr_handle_t));
+        if (!inth) {
+            ESP_APPTRACE_TEST_LOGE("Failed to alloc timer ISR handles!");
+            goto on_fail;
+        }
+        memset(inth, 0, arg->timers_num * sizeof(timer_isr_handle_t));
+        for (int i = 0; i < arg->timers_num; i++) {
+            esp_apptrace_test_timer_init(arg->timers[i].group, arg->timers[i].id, arg->timers[i].data.period);
+            res = timer_isr_register(arg->timers[i].group, arg->timers[i].id, arg->timers[i].isr_func, &arg->timers[i], flags, &inth[i]);
+            if (res != ESP_OK) {
+                ESP_APPTRACE_TEST_LOGE("Failed to timer_isr_register (%d)!", res);
+                goto on_fail;
+            }
+            *(uint32_t *)arg->timers[i].data.buf = (uint32_t)inth[i] | (1 << 31);
+            ESP_APPTRACE_TEST_LOGI("%x: start timer %x period %u us", xTaskGetCurrentTaskHandle(), inth[i], arg->timers[i].data.period);
+            res = timer_start(arg->timers[i].group, arg->timers[i].id);
+            if (res != ESP_OK) {
+                ESP_APPTRACE_TEST_LOGE("Failed to timer_start (%d)!", res);
+                goto on_fail;
+            }
+        }
     }
 
-    int i = 0;
+    i = 0;
     while (!arg->stop) {
-        ESP_APPTRACE_TEST_LOGD("%x: dummy task work %d.%d", xTaskGetCurrentTaskHandle(), esp_cpu_get_core_id(), i++);
+        ESP_APPTRACE_TEST_LOGD("%x: dummy task work %d.%d", xTaskGetCurrentTaskHandle(), cpu_hal_get_core_id(), i++);
         if (tmo_ticks) {
             vTaskDelay(tmo_ticks);
         }
     }
 
-    for (int i = 0; i < arg->timers_num; i++) {
-        TEST_ESP_OK(gptimer_stop(arg->timers[i].gptimer));
-        TEST_ESP_OK(gptimer_disable(arg->timers[i].gptimer));
-        TEST_ESP_OK(gptimer_del_timer(arg->timers[i].gptimer));
+on_fail:
+    if (inth) {
+        for (int i = 0; i < arg->timers_num; i++) {
+            timer_pause(arg->timers[i].group, arg->timers[i].id);
+            timer_disable_intr(arg->timers[i].group, arg->timers[i].id);
+            if (inth[i]) {
+                esp_intr_free(inth[i]);
+            }
+        }
+        vPortFree(inth);
     }
     xSemaphoreGive(arg->done);
     vTaskDelay(1);
@@ -199,35 +239,37 @@ static void esp_apptrace_dummy_task(void *p)
 static void esp_apptrace_test_task(void *p)
 {
     esp_apptrace_test_task_arg_t *arg = (esp_apptrace_test_task_arg_t *) p;
-    int res;
+    int res, flags = 0;
+    timer_isr_handle_t *inth = NULL;
     TickType_t tmo_ticks = arg->data.period / (1000 * portTICK_PERIOD_MS);
 
     ESP_APPTRACE_TEST_LOGI("%x: run (period %u us, stamp mask %x, %u timers)", xTaskGetCurrentTaskHandle(), arg->data.period, arg->data.mask, arg->timers_num);
 
-    for (int i = 0; i < arg->timers_num; i++) {
-        gptimer_config_t timer_config = {
-            .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-            .direction = GPTIMER_COUNT_UP,
-            .resolution_hz = 1000000,
-        };
-        TEST_ESP_OK(gptimer_new_timer(&timer_config, &arg->timers[i].gptimer));
-        *(uint32_t *)arg->timers[i].data.buf = ((uint32_t)arg->timers[i].gptimer) | (1 << 31) | (esp_cpu_get_core_id() ? 0x1 : 0);
-        ESP_APPTRACE_TEST_LOGI("%x: start timer %x period %u us", xTaskGetCurrentTaskHandle(), arg->timers[i].gptimer, arg->timers[i].data.period);
-        gptimer_alarm_config_t alarm_config = {
-            .reload_count = 0,
-            .alarm_count = arg->timers[i].data.period,
-            .flags.auto_reload_on_alarm = true,
-        };
-        gptimer_event_callbacks_t cbs = {
-            .on_alarm = arg->timers[i].isr_func,
-        };
-        TEST_ESP_OK(gptimer_register_event_callbacks(arg->timers[i].gptimer, &cbs, &arg->timers[i]));
-        TEST_ESP_OK(gptimer_enable(arg->timers[i].gptimer));
-        TEST_ESP_OK(gptimer_set_alarm_action(arg->timers[i].gptimer, &alarm_config));
-        TEST_ESP_OK(gptimer_start(arg->timers[i].gptimer));
+    if (arg->timers_num > 0) {
+        inth = pvPortMalloc(arg->timers_num * sizeof(timer_isr_handle_t));
+        if (!inth) {
+            ESP_APPTRACE_TEST_LOGE("Failed to alloc timer ISR handles!");
+            goto on_fail;
+        }
+        memset(inth, 0, arg->timers_num * sizeof(timer_isr_handle_t));
+        for (int i = 0; i < arg->timers_num; i++) {
+            esp_apptrace_test_timer_init(arg->timers[i].group, arg->timers[i].id, arg->timers[i].data.period);
+            res = timer_isr_register(arg->timers[i].group, arg->timers[i].id, arg->timers[i].isr_func, &arg->timers[i], flags, &inth[i]);
+            if (res != ESP_OK) {
+                ESP_APPTRACE_TEST_LOGE("Failed to timer_isr_register (%d)!", res);
+                goto on_fail;
+            }
+            *(uint32_t *)arg->timers[i].data.buf = ((uint32_t)inth[i]) | (1 << 31) | (cpu_hal_get_core_id() ? 0x1 : 0);
+            ESP_APPTRACE_TEST_LOGI("%x: start timer %x period %u us", xTaskGetCurrentTaskHandle(), inth[i], arg->timers[i].data.period);
+            res = timer_start(arg->timers[i].group, arg->timers[i].id);
+            if (res != ESP_OK) {
+                ESP_APPTRACE_TEST_LOGE("Failed to timer_start (%d)!", res);
+                goto on_fail;
+            }
+        }
     }
 
-    *(uint32_t *)arg->data.buf = (uint32_t)xTaskGetCurrentTaskHandle() | (esp_cpu_get_core_id() ? 0x1 : 0);
+    *(uint32_t *)arg->data.buf = (uint32_t)xTaskGetCurrentTaskHandle() | (cpu_hal_get_core_id() ? 0x1 : 0);
     arg->data.wr_cnt = 0;
     arg->data.wr_err = 0;
     while (!arg->stop) {
@@ -241,7 +283,7 @@ static void esp_apptrace_test_task(void *p)
             res = ESP_APPTRACE_TEST_WRITE(arg->data.buf, arg->data.buf_sz);
         }
         if (res) {
-            if (1) { //arg->data.wr_err++ < ESP_APPTRACE_TEST_PRN_WRERR_MAX) {
+            if (1){//arg->data.wr_err++ < ESP_APPTRACE_TEST_PRN_WRERR_MAX) {
                 ESP_APPTRACE_TEST_LOGE("%x: Failed to write trace %d %x!", xTaskGetCurrentTaskHandle(), res, arg->data.wr_cnt & arg->data.mask);
                 if (arg->data.wr_err == ESP_APPTRACE_TEST_PRN_WRERR_MAX) {
                     ESP_APPTRACE_TEST_LOGE("\n");
@@ -259,10 +301,16 @@ static void esp_apptrace_test_task(void *p)
         }
     }
 
-    for (int i = 0; i < arg->timers_num; i++) {
-        TEST_ESP_OK(gptimer_stop(arg->timers[i].gptimer));
-        TEST_ESP_OK(gptimer_disable(arg->timers[i].gptimer));
-        TEST_ESP_OK(gptimer_del_timer(arg->timers[i].gptimer));
+on_fail:
+    if (inth) {
+        for (int i = 0; i < arg->timers_num; i++) {
+            timer_pause(arg->timers[i].group, arg->timers[i].id);
+            timer_disable_intr(arg->timers[i].group, arg->timers[i].id);
+            if (inth[i]) {
+                esp_intr_free(inth[i]);
+            }
+        }
+        vPortFree(inth);
     }
     xSemaphoreGive(arg->done);
     vTaskDelay(1);
@@ -272,16 +320,17 @@ static void esp_apptrace_test_task(void *p)
 static void esp_apptrace_test_task_crash(void *p)
 {
     esp_apptrace_test_task_arg_t *arg = (esp_apptrace_test_task_arg_t *) p;
+    int res, i;
 
     ESP_APPTRACE_TEST_LOGE("%x: run (period %u us, stamp mask %x, %u timers)", xTaskGetCurrentTaskHandle(), arg->data.period, arg->data.mask, arg->timers_num);
 
     arg->data.wr_cnt = 0;
     *(uint32_t *)arg->data.buf = (uint32_t)xTaskGetCurrentTaskHandle();
-    for (int i = 0; i < ESP_APPTRACE_TEST_BLOCKS_BEFORE_CRASH; i++) {
+    for (i = 0; i < ESP_APPTRACE_TEST_BLOCKS_BEFORE_CRASH; i++) {
         uint32_t *ts = (uint32_t *)(arg->data.buf + sizeof(uint32_t));
         *ts = (uint32_t)esp_apptrace_test_ts_get();
         memset(arg->data.buf + sizeof(uint32_t), arg->data.wr_cnt & arg->data.mask, arg->data.buf_sz - sizeof(uint32_t));
-        int res = ESP_APPTRACE_TEST_WRITE(arg->data.buf, arg->data.buf_sz);
+        res = ESP_APPTRACE_TEST_WRITE(arg->data.buf, arg->data.buf_sz);
         if (res) {
             ESP_APPTRACE_TEST_LOGE("%x: Failed to write trace %d %x!", xTaskGetCurrentTaskHandle(), res, arg->data.wr_cnt & arg->data.mask);
         } else {
@@ -298,49 +347,66 @@ static void esp_apptrace_test_task_crash(void *p)
     vTaskDelete(NULL);
 }
 
-static gptimer_handle_t ts_gptimer;
+static int s_ts_timer_group, s_ts_timer_idx;
 
 static uint64_t esp_apptrace_test_ts_get(void)
 {
     uint64_t ts = 0;
-    gptimer_get_raw_count(ts_gptimer, &ts);
+    timer_get_counter_value(s_ts_timer_group, s_ts_timer_idx, &ts);
     return ts;
 }
 
-static void esp_apptrace_test_ts_init(void)
+static void esp_apptrace_test_ts_init(int timer_group, int timer_idx)
 {
-    gptimer_config_t timer_config = {
-        .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-        .direction = GPTIMER_COUNT_UP,
-        .resolution_hz = 10000000,
-    };
-    TEST_ESP_OK(gptimer_new_timer(&timer_config, &ts_gptimer));
-    ESP_APPTRACE_TEST_LOGI("Use timer %x for TS", ts_gptimer);
-    TEST_ESP_OK(gptimer_enable(ts_gptimer));
-    TEST_ESP_OK(gptimer_start(ts_gptimer));
+    timer_config_t config;
+    //uint64_t alarm_val = period * (TIMER_BASE_CLK / 1000000UL);
+
+    ESP_APPTRACE_TEST_LOGI("Use timer%d.%d for TS", timer_group, timer_idx);
+
+    s_ts_timer_group = timer_group;
+    s_ts_timer_idx = timer_idx;
+
+    config.alarm_en = 0;
+    config.auto_reload = 0;
+    config.counter_dir = TIMER_COUNT_UP;
+    config.divider = 2;     //Range is 2 to 65536
+    config.counter_en = 0;
+    /*Configure timer*/
+    timer_init(timer_group, timer_idx, &config);
+    /*Load counter value */
+    timer_set_counter_value(timer_group, timer_idx, 0x00000000ULL);
+    /*Enable timer interrupt*/
+    timer_start(timer_group, timer_idx);
 }
 
 static void esp_apptrace_test_ts_cleanup(void)
 {
-    TEST_ESP_OK(gptimer_stop(ts_gptimer));
-    TEST_ESP_OK(gptimer_disable(ts_gptimer));
-    TEST_ESP_OK(gptimer_del_timer(ts_gptimer));
-    ts_gptimer = NULL;
+    timer_config_t config;
+
+    config.alarm_en = 0;
+    config.auto_reload = 0;
+    config.counter_dir = TIMER_COUNT_UP;
+    config.divider = 2;     //Range is 2 to 65536
+    config.counter_en = 0;
+    /*Configure timer*/
+    timer_init(s_ts_timer_group, s_ts_timer_idx, &config);
 }
 
 static void esp_apptrace_test(esp_apptrace_test_cfg_t *test_cfg)
 {
-    esp_apptrace_test_task_arg_t dummy_task_arg = {
-        .core = 0,
-        .prio = 3,
-        .task_func = esp_apptrace_test_task_crash,
-        .data.buf = NULL,
-        .data.buf_sz = 0,
-        .data.period = 500000,
-        .timers_num = 0,
-        .timers = NULL,
-    };
+    int i, k;
+    int tims_in_use[TIMER_GROUP_MAX][TIMER_MAX] = {{0, 0}, {0, 0}};
+    esp_apptrace_test_task_arg_t dummy_task_arg[1];
 
+    memset(dummy_task_arg, 0, sizeof(dummy_task_arg));
+    dummy_task_arg[0].core = 0;
+    dummy_task_arg[0].prio = 3;
+    dummy_task_arg[0].task_func = esp_apptrace_test_task_crash;
+    dummy_task_arg[0].data.buf = NULL;
+    dummy_task_arg[0].data.buf_sz = 0;
+    dummy_task_arg[0].data.period = 500000;
+    dummy_task_arg[0].timers_num = 0;
+    dummy_task_arg[0].timers = NULL;
 #if ESP_APPTRACE_TEST_USE_PRINT_LOCK == 1
     s_print_lock = xSemaphoreCreateBinary();
     if (!s_print_lock) {
@@ -351,17 +417,38 @@ static void esp_apptrace_test(esp_apptrace_test_cfg_t *test_cfg)
 #else
 #endif
 
-    for (int i = 0; i < test_cfg->tasks_num; i++) {
+    for (i = 0; i < test_cfg->tasks_num; i++) {
         test_cfg->tasks[i].data.mask = 0xFF;
         test_cfg->tasks[i].stop = 0;
         test_cfg->tasks[i].done = xSemaphoreCreateBinary();
-        TEST_ASSERT_NOT_NULL(test_cfg->tasks[i].done);
-        for (int k = 0; k < test_cfg->tasks[i].timers_num; k++) {
+        if (!test_cfg->tasks[i].done) {
+            ESP_APPTRACE_TEST_LOGE("Failed to create task completion semaphore!");
+            goto on_fail;
+        }
+        for (k = 0; k < test_cfg->tasks[i].timers_num; k++) {
             test_cfg->tasks[i].timers[k].data.mask = 0xFF;
+            tims_in_use[test_cfg->tasks[i].timers[k].group][test_cfg->tasks[i].timers[k].id] = 1;
         }
     }
 
-    esp_apptrace_test_ts_init();
+    int found = 0;
+    for (i = 0; i < TIMER_GROUP_MAX; i++) {
+        for (k = 0; k < TIMER_MAX; k++) {
+            if (!tims_in_use[i][k]) {
+                ESP_APPTRACE_TEST_LOGD("Found timer%d.%d", i, k);
+                found = 1;
+                break;
+            }
+        }
+        if (found) {
+            break;
+        }
+    }
+    if (!found) {
+        ESP_APPTRACE_TEST_LOGE("No free timer for TS!");
+        goto on_fail;
+    }
+    esp_apptrace_test_ts_init(i, k);
 
     for (int i = 0; i < test_cfg->tasks_num; i++) {
         char name[30];
@@ -370,15 +457,16 @@ static void esp_apptrace_test(esp_apptrace_test_cfg_t *test_cfg)
         xTaskCreatePinnedToCore(test_cfg->tasks[i].task_func, name, 2048, &test_cfg->tasks[i], test_cfg->tasks[i].prio, &thnd, test_cfg->tasks[i].core);
         ESP_APPTRACE_TEST_LOGI("Created task %x", thnd);
     }
-    xTaskCreatePinnedToCore(esp_apptrace_dummy_task, "dummy0", 2048, &dummy_task_arg, dummy_task_arg.prio, NULL, 0);
+    xTaskCreatePinnedToCore(esp_apptrace_dummy_task, "dummy0", 2048, &dummy_task_arg[0], dummy_task_arg[0].prio, NULL, 0);
 #if CONFIG_FREERTOS_UNICORE == 0
-    xTaskCreatePinnedToCore(esp_apptrace_dummy_task, "dummy1", 2048, &dummy_task_arg, dummy_task_arg.prio, NULL, 1);
+    xTaskCreatePinnedToCore(esp_apptrace_dummy_task, "dummy1", 2048, &dummy_task_arg[0], dummy_task_arg[0].prio, NULL, 1);
 #endif
     for (int i = 0; i < test_cfg->tasks_num; i++) {
         //arg1.stop = 1;
         xSemaphoreTake(test_cfg->tasks[i].done, portMAX_DELAY);
     }
 
+on_fail:
     for (int i = 0; i < test_cfg->tasks_num; i++) {
         if (test_cfg->tasks[i].done) {
             vSemaphoreDelete(test_cfg->tasks[i].done);
@@ -406,6 +494,8 @@ TEST_CASE("App trace test (1 task + 1 crashed timer ISR @ 1 core)", "[trace][ign
     memset(s_test_timers, 0, sizeof(s_test_timers));
     memset(s_test_tasks, 0, sizeof(s_test_tasks));
 
+    s_test_timers[0].group = TIMER_GROUP_0;
+    s_test_timers[0].id = TIMER_0;
     s_test_timers[0].isr_func = esp_apptrace_test_timer_isr_crash;
     s_test_timers[0].data.buf = s_bufs[0];
     s_test_timers[0].data.buf_sz = sizeof(s_bufs[0]);
@@ -458,11 +548,15 @@ TEST_CASE("App trace test (2 tasks + 1 timer @ each core", "[trace][ignore]")
     memset(s_test_tasks, 0, sizeof(s_test_tasks));
     memset(s_test_timers, 0, sizeof(s_test_timers));
 
+    s_test_timers[0].group = TIMER_GROUP_0;
+    s_test_timers[0].id = TIMER_0;
     s_test_timers[0].isr_func = esp_apptrace_test_timer_isr;
     s_test_timers[0].data.buf = s_bufs[0];
     s_test_timers[0].data.buf_sz = sizeof(s_bufs[0]);
     s_test_timers[0].data.period = 150;
 
+    s_test_timers[1].group = TIMER_GROUP_1;
+    s_test_timers[1].id = TIMER_0;
     s_test_timers[1].isr_func = esp_apptrace_test_timer_isr;
     s_test_timers[1].data.buf = s_bufs[1];
     s_test_timers[1].data.buf_sz = sizeof(s_bufs[1]);
@@ -518,6 +612,8 @@ TEST_CASE("App trace test (1 task + 1 timer @ 1 core)", "[trace][ignore]")
     memset(s_test_timers, 0, sizeof(s_test_timers));
     memset(s_test_tasks, 0, sizeof(s_test_tasks));
 
+    s_test_timers[0].group = TIMER_GROUP_0;
+    s_test_timers[0].id = TIMER_0;
     s_test_timers[0].isr_func = esp_apptrace_test_timer_isr;
     s_test_timers[0].data.buf = s_bufs[0];
     s_test_timers[0].data.buf_sz = sizeof(s_bufs[0]);
@@ -653,7 +749,7 @@ static void esp_logtrace_task(void *p)
         ESP_LOGI(TAG, "%p: sample print 4 %c", xTaskGetCurrentTaskHandle(), ((i & 0xFF) % 95) + 32);
         ESP_LOGI(TAG, "%p: sample print 5 %f", xTaskGetCurrentTaskHandle(), 1.0);
         ESP_LOGI(TAG, "%p: sample print 6 %f", xTaskGetCurrentTaskHandle(), 3.45);
-        ESP_LOGI(TAG, "%p: logtrace task work %d.%d", xTaskGetCurrentTaskHandle(), esp_cpu_get_core_id(), i);
+        ESP_LOGI(TAG, "%p: logtrace task work %d.%d", xTaskGetCurrentTaskHandle(), cpu_hal_get_core_id(), i);
         if (++i == 10000) {
             break;
         }
@@ -696,11 +792,11 @@ TEST_CASE("Log trace test (2 tasks)", "[trace][ignore]")
     vSemaphoreDelete(arg2.done);
 }
 
-#else // #if CONFIG_APPTRACE_SV_ENABLE == 0
+#else
 
 typedef struct {
-    gptimer_handle_t gptimer;
-    uint32_t period;
+    int group;
+    int timer;
     int flags;
     uint32_t id;
 } esp_sysviewtrace_timer_arg_t;
@@ -714,47 +810,50 @@ typedef struct {
     uint32_t id;
 } esp_sysviewtrace_task_arg_t;
 
-static bool esp_sysview_test_timer_isr(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx)
+static void esp_sysview_test_timer_isr(void *arg)
 {
-    esp_sysviewtrace_timer_arg_t *tim_arg = (esp_sysviewtrace_timer_arg_t *)user_ctx;
-    return false;
+    esp_sysviewtrace_timer_arg_t *tim_arg = (esp_sysviewtrace_timer_arg_t *)arg;
+
+    //ESP_APPTRACE_TEST_LOGI("tim-%d: IRQ %d/%d\n", tim_arg->id, tim_arg->group, tim_arg->timer);
+
+    timer_group_clr_intr_status_in_isr(tim_arg->group, tim_arg->id);
+    timer_group_enable_alarm_in_isr(tim_arg->group, tim_arg->id);
 }
 
 static void esp_sysviewtrace_test_task(void *p)
 {
     esp_sysviewtrace_task_arg_t *arg = (esp_sysviewtrace_task_arg_t *) p;
     volatile uint32_t tmp = 0;
+    timer_isr_handle_t inth;
+
     printf("%x: run sysview task\n", (uint32_t)xTaskGetCurrentTaskHandle());
 
     if (arg->timer) {
-        gptimer_alarm_config_t alarm_config = {
-            .reload_count = 0,
-            .alarm_count = arg->timer->period,
-            .flags.auto_reload_on_alarm = true,
-        };
-        gptimer_event_callbacks_t cbs = {
-            .on_alarm = esp_sysview_test_timer_isr,
-        };
-        TEST_ESP_OK(gptimer_register_event_callbacks(arg->timer->gptimer, &cbs, arg->timer));
-        TEST_ESP_OK(gptimer_enable(arg->timer->gptimer));
-        TEST_ESP_OK(gptimer_set_alarm_action(arg->timer->gptimer, &alarm_config));
-        TEST_ESP_OK(gptimer_start(arg->timer->gptimer));
+        esp_err_t res = timer_isr_register(arg->timer->group, arg->timer->timer, esp_sysview_test_timer_isr, arg->timer, arg->timer->flags, &inth);
+        if (res != ESP_OK) {
+            printf("%x: failed to register timer ISR\n", (uint32_t)xTaskGetCurrentTaskHandle());
+        }
+        else {
+            res = timer_start(arg->timer->group, arg->timer->timer);
+            if (res != ESP_OK) {
+                printf("%x: failed to start timer\n", (uint32_t)xTaskGetCurrentTaskHandle());
+            }
+        }
     }
 
     int i = 0;
     while (1) {
         static uint32_t count;
         printf("%d", arg->id);
-        if ((++count % 80) == 0) {
+        if((++count % 80) == 0)
             printf("\n");
-        }
         if (arg->sync) {
             xSemaphoreTake(*arg->sync, portMAX_DELAY);
         }
         for (uint32_t k = 0; k < arg->work_count; k++) {
             tmp++;
         }
-        vTaskDelay(arg->sleep_tmo / portTICK_PERIOD_MS);
+        vTaskDelay(arg->sleep_tmo/portTICK_PERIOD_MS);
         i++;
         if (arg->sync) {
             xSemaphoreGive(*arg->sync);
@@ -772,9 +871,10 @@ TEST_CASE("SysView trace test 1", "[trace][ignore]")
     TaskHandle_t thnd;
 
     esp_sysviewtrace_timer_arg_t tim_arg1 = {
+        .group = TIMER_GROUP_1,
+        .timer = TIMER_1,
         .flags = ESP_INTR_FLAG_SHARED,
         .id = 0,
-        .period = 500,
     };
     esp_sysviewtrace_task_arg_t arg1 = {
         .done = xSemaphoreCreateBinary(),
@@ -785,9 +885,10 @@ TEST_CASE("SysView trace test 1", "[trace][ignore]")
         .id = 0,
     };
     esp_sysviewtrace_timer_arg_t tim_arg2 = {
+        .group = TIMER_GROUP_1,
+        .timer = TIMER_0,
         .flags = 0,
         .id = 1,
-        .period = 100,
     };
     esp_sysviewtrace_task_arg_t arg2 = {
         .done = xSemaphoreCreateBinary(),
@@ -798,15 +899,8 @@ TEST_CASE("SysView trace test 1", "[trace][ignore]")
         .id = 1,
     };
 
-    gptimer_config_t timer_config = {
-        .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-        .direction = GPTIMER_COUNT_UP,
-        .resolution_hz = 1000000,
-    };
-    timer_config.flags.intr_shared = (tim_arg1.flags & ESP_INTR_FLAG_SHARED) == ESP_INTR_FLAG_SHARED;
-    TEST_ESP_OK(gptimer_new_timer(&timer_config, &tim_arg1.gptimer));
-    timer_config.flags.intr_shared = (tim_arg2.flags & ESP_INTR_FLAG_SHARED) == ESP_INTR_FLAG_SHARED;
-    TEST_ESP_OK(gptimer_new_timer(&timer_config, &tim_arg2.gptimer));
+    esp_apptrace_test_timer_init(TIMER_GROUP_1, TIMER_1, 500);
+    esp_apptrace_test_timer_init(TIMER_GROUP_1, TIMER_0, 100);
 
     xTaskCreatePinnedToCore(esp_sysviewtrace_test_task, "svtrace0", 2048, &arg1, 3, &thnd, 0);
     ESP_APPTRACE_TEST_LOGI("Created task %x", thnd);
@@ -821,12 +915,6 @@ TEST_CASE("SysView trace test 1", "[trace][ignore]")
     vSemaphoreDelete(arg1.done);
     xSemaphoreTake(arg2.done, portMAX_DELAY);
     vSemaphoreDelete(arg2.done);
-    TEST_ESP_OK(gptimer_stop(tim_arg1.gptimer));
-    TEST_ESP_OK(gptimer_disable(tim_arg1.gptimer));
-    TEST_ESP_OK(gptimer_del_timer(tim_arg1.gptimer));
-    TEST_ESP_OK(gptimer_stop(tim_arg2.gptimer));
-    TEST_ESP_OK(gptimer_disable(tim_arg2.gptimer));
-    TEST_ESP_OK(gptimer_del_timer(tim_arg2.gptimer));
 }
 
 TEST_CASE("SysView trace test 2", "[trace][ignore]")
@@ -834,9 +922,10 @@ TEST_CASE("SysView trace test 2", "[trace][ignore]")
     TaskHandle_t thnd;
 
     esp_sysviewtrace_timer_arg_t tim_arg1 = {
+        .group = TIMER_GROUP_1,
+        .timer = TIMER_1,
         .flags = ESP_INTR_FLAG_SHARED,
         .id = 0,
-        .period = 500,
     };
     esp_sysviewtrace_task_arg_t arg1 = {
         .done = xSemaphoreCreateBinary(),
@@ -847,9 +936,10 @@ TEST_CASE("SysView trace test 2", "[trace][ignore]")
         .id = 0,
     };
     esp_sysviewtrace_timer_arg_t tim_arg2 = {
+        .group = TIMER_GROUP_1,
+        .timer = TIMER_0,
         .flags = 0,
         .id = 1,
-        .period = 100,
     };
     esp_sysviewtrace_task_arg_t arg2 = {
         .done = xSemaphoreCreateBinary(),
@@ -879,15 +969,8 @@ TEST_CASE("SysView trace test 2", "[trace][ignore]")
         .id = 3,
     };
 
-    gptimer_config_t timer_config = {
-        .clk_src = GPTIMER_CLK_SRC_DEFAULT,
-        .direction = GPTIMER_COUNT_UP,
-        .resolution_hz = 1000000,
-    };
-    timer_config.flags.intr_shared = (tim_arg1.flags & ESP_INTR_FLAG_SHARED) == ESP_INTR_FLAG_SHARED;
-    TEST_ESP_OK(gptimer_new_timer(&timer_config, &tim_arg1.gptimer));
-    timer_config.flags.intr_shared = (tim_arg2.flags & ESP_INTR_FLAG_SHARED) == ESP_INTR_FLAG_SHARED;
-    TEST_ESP_OK(gptimer_new_timer(&timer_config, &tim_arg2.gptimer));
+    esp_apptrace_test_timer_init(TIMER_GROUP_1, TIMER_1, 500);
+    esp_apptrace_test_timer_init(TIMER_GROUP_1, TIMER_0, 100);
 
     xTaskCreatePinnedToCore(esp_sysviewtrace_test_task, "svtrace0", 2048, &arg1, 3, &thnd, 0);
     printf("Created task %x\n", (uint32_t)thnd);
@@ -916,12 +999,6 @@ TEST_CASE("SysView trace test 2", "[trace][ignore]")
     xSemaphoreTake(arg4.done, portMAX_DELAY);
     vSemaphoreDelete(arg4.done);
     vSemaphoreDelete(test_sync);
-    TEST_ESP_OK(gptimer_stop(tim_arg1.gptimer));
-    TEST_ESP_OK(gptimer_disable(tim_arg1.gptimer));
-    TEST_ESP_OK(gptimer_del_timer(tim_arg1.gptimer));
-    TEST_ESP_OK(gptimer_stop(tim_arg2.gptimer));
-    TEST_ESP_OK(gptimer_disable(tim_arg2.gptimer));
-    TEST_ESP_OK(gptimer_del_timer(tim_arg2.gptimer));
 }
-#endif // #if CONFIG_APPTRACE_SV_ENABLE == 0
-#endif // #if CONFIG_APPTRACE_ENABLE == 1
+#endif
+#endif

components/app_update/.build-test-rules.yml

@@ -1,7 +0,0 @@
-# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
-
-components/app_update/test_apps:
-  disable:
-    - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2"
-      temporary: true
-      reason: target esp32c6, esp32h2 is not supported yet

components/app_update/CMakeLists.txt

@@ -1,7 +1,30 @@
-idf_component_register(SRCS "esp_ota_ops.c" "esp_ota_app_desc.c"
+idf_component_register(SRCS "esp_ota_ops.c"
+                            "esp_app_desc.c"
                     INCLUDE_DIRS "include"
-                    REQUIRES partition_table bootloader_support esp_app_format esp_partition
-                    PRIV_REQUIRES esptool_py efuse spi_flash)
+                    REQUIRES spi_flash partition_table bootloader_support
+                    PRIV_REQUIRES esptool_py efuse)
+
+# esp_app_desc structure is added as an undefined symbol because otherwise the
+# linker will ignore this structure as it has no other files depending on it.
+target_link_libraries(${COMPONENT_LIB} INTERFACE "-u esp_app_desc")
+
+if(CONFIG_APP_PROJECT_VER_FROM_CONFIG)
+    # Ignore current PROJECT_VER (which was set in __project_get_revision()).
+    # Gets the version from the CONFIG_APP_PROJECT_VER.
+    idf_build_set_property(PROJECT_VER "${CONFIG_APP_PROJECT_VER}")
+endif()
+
+# cut PROJECT_VER and PROJECT_NAME to required 32 characters.
+idf_build_get_property(project_ver PROJECT_VER)
+idf_build_get_property(project_name PROJECT_NAME)
+string(SUBSTRING "${project_ver}" 0 31 PROJECT_VER_CUT)
+string(SUBSTRING "${project_name}" 0 31 PROJECT_NAME_CUT)
+message(STATUS "App \"${PROJECT_NAME_CUT}\" version: ${PROJECT_VER_CUT}")
+
+set_source_files_properties(
+    SOURCE "esp_app_desc.c"
+    PROPERTIES COMPILE_DEFINITIONS
+    "PROJECT_VER=\"${PROJECT_VER_CUT}\"; PROJECT_NAME=\"${PROJECT_NAME_CUT}\"")
 
 if(NOT BOOTLOADER_BUILD)
     partition_table_get_partition_info(otadata_offset "--partition-type data --partition-subtype ota" "offset")
@@ -25,37 +48,34 @@ if(NOT BOOTLOADER_BUILD)
         add_dependencies(flash blank_ota_data)
         add_dependencies(encrypted-flash blank_ota_data)
 
-        set(otatool_py "${python}" "${COMPONENT_DIR}/otatool.py")
-
-        set(esptool_args --esptool-args before=${CONFIG_ESPTOOLPY_BEFORE} after=${CONFIG_ESPTOOLPY_AFTER})
-        set(otatool_args --partition-table-file ${PARTITION_CSV_PATH})
-        list(APPEND otatool_args --partition-table-offset ${PARTITION_TABLE_OFFSET})
+        set(otatool_py ${python} ${COMPONENT_DIR}/otatool.py)
 
+        set(esptool_args "--esptool-args;before=${CONFIG_ESPTOOLPY_BEFORE};after=${CONFIG_ESPTOOLPY_AFTER}")
+        set(otatool_args "--partition-table-file;${PARTITION_CSV_PATH}"
+                         "--partition-table-offset;${PARTITION_TABLE_OFFSET}")
         idf_component_get_property(esptool_py_dir esptool_py COMPONENT_DIR)
 
         add_custom_target(read-otadata DEPENDS "${PARTITION_CSV_PATH}"
             COMMAND ${CMAKE_COMMAND}
-            -D "IDF_PATH=${idf_path}"
-            -D "SERIAL_TOOL=${otatool_py}"
-            -D "SERIAL_TOOL_ARGS=${esptool_args};${otatool_args};read_otadata"
-            -D "WORKING_DIRECTORY=${build_dir}"
+            -D IDF_PATH="${idf_path}"
+            -D SERIAL_TOOL="${otatool_py}"
+            -D SERIAL_TOOL_ARGS="${esptool_args};${otatool_args};read_otadata"
+            -D WORKING_DIRECTORY="${build_dir}"
             -P ${esptool_py_dir}/run_serial_tool.cmake
-            WORKING_DIRECTORY "${build_dir}"
+            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
             USES_TERMINAL
-            VERBATIM
             )
         add_deprecated_target_alias(read_otadata read-otadata)
 
         add_custom_target(erase-otadata DEPENDS "${PARTITION_CSV_PATH}"
             COMMAND ${CMAKE_COMMAND}
-            -D "IDF_PATH=${idf_path}"
-            -D "SERIAL_TOOL=${otatool_py}"
-            -D "SERIAL_TOOL_ARGS=${esptool_args};${otatool_args};erase_otadata"
-            -D "WORKING_DIRECTORY=${build_dir}"
+            -D IDF_PATH="${idf_path}"
+            -D SERIAL_TOOL="${otatool_py}"
+            -D SERIAL_TOOL_ARGS="${esptool_args};${otatool_args};erase_otadata"
+            -D WORKING_DIRECTORY="${build_dir}"
             -P ${esptool_py_dir}/run_serial_tool.cmake
-            WORKING_DIRECTORY "${build_dir}"
+            WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
             USES_TERMINAL
-            VERBATIM
             )
         add_deprecated_target_alias(erase_otadata erase-otadata)
 

components/app_update/Makefile.projbuild

@@ -0,0 +1,54 @@
+# Generate partition binary
+#
+.PHONY: blank_ota_data erase_otadata read_otadata
+
+OTATOOL_PY := $(PYTHON) $(COMPONENT_PATH)/otatool.py
+PARTTOOL_PY := $(PYTHON) $(IDF_PATH)/components/partition_table/parttool.py
+
+# Generate blank partition file
+BLANK_OTA_DATA_FILE = $(BUILD_DIR_BASE)/ota_data_initial.bin
+
+# Copy PARTITION_TABLE_CSV_PATH definition here from $IDF_PATH/components/partition_table/Makefile.projbuild
+# to avoid undefined variables warning for PARTITION_TABLE_CSV_PATH
+ifndef PARTITION_TABLE_CSV_PATH
+PARTITION_TABLE_ROOT := $(call dequote,$(if $(CONFIG_PARTITION_TABLE_CUSTOM),$(PROJECT_PATH),$(IDF_PATH)/components/partition_table))
+PARTITION_TABLE_CSV_PATH := $(call dequote,$(abspath $(PARTITION_TABLE_ROOT)/$(call dequote,$(CONFIG_PARTITION_TABLE_FILENAME))))
+endif
+
+$(BLANK_OTA_DATA_FILE): partition_table_get_info $(PARTITION_TABLE_CSV_PATH) | check_python_dependencies
+	$(shell if [ "$(OTA_DATA_OFFSET)" != "" ] && [ "$(OTA_DATA_SIZE)" != "" ]; then \
+				$(PYTHON) $(IDF_PATH)/components/partition_table/gen_empty_partition.py $(OTA_DATA_SIZE) $(BLANK_OTA_DATA_FILE); \
+			fi; )
+	$(eval BLANK_OTA_DATA_FILE = $(shell if [ "$(OTA_DATA_OFFSET)" != "" ] && [ "$(OTA_DATA_SIZE)" != "" ]; then \
+			echo $(BLANK_OTA_DATA_FILE); else echo " "; fi) )
+
+blank_ota_data: $(BLANK_OTA_DATA_FILE)
+
+# If there is no otadata partition, both OTA_DATA_OFFSET and BLANK_OTA_DATA_FILE
+# expand to empty values.
+ESPTOOL_ALL_FLASH_ARGS += $(OTA_DATA_OFFSET) $(BLANK_OTA_DATA_FILE)
+
+ESPTOOL_ARGS := --esptool-args port=$(CONFIG_ESPTOOLPY_PORT) baud=$(CONFIG_ESPTOOLPY_BAUD) before=$(CONFIG_ESPTOOLPY_BEFORE) after=$(CONFIG_ESPTOOLPY_AFTER)
+
+erase_otadata: $(PARTITION_TABLE_CSV_PATH) partition_table_get_info | check_python_dependencies
+	$(OTATOOL_PY) $(ESPTOOL_ARGS) --partition-table-file $(PARTITION_TABLE_CSV_PATH) \
+	--partition-table-offset $(PARTITION_TABLE_OFFSET) \
+	erase_otadata
+
+read_otadata: $(PARTITION_TABLE_CSV_PATH) partition_table_get_info | check_python_dependencies
+	$(OTATOOL_PY) $(ESPTOOL_ARGS) --partition-table-file $(PARTITION_TABLE_CSV_PATH) \
+	--partition-table-offset $(partition_table_offset) \
+	read_otadata
+
+all: blank_ota_data
+flash: blank_ota_data
+ifdef CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
+encrypted-flash: blank_ota_data
+endif
+
+TMP_DEFINES := $(BUILD_DIR_BASE)/app_update/tmp_cppflags.txt
+export TMP_DEFINES
+
+clean:
+	rm -f $(BLANK_OTA_DATA_FILE)
+	rm -f $(TMP_DEFINES)