Merge branch 'master' into fix/nand_flash_not_working_with_esp32p4

Author: RathiSonika

.build-test-rules.yml

@@ -34,6 +34,11 @@ esp_jpeg/examples/get_started:
     - if: IDF_VERSION_MAJOR > 4 and IDF_TARGET in ["esp32", "esp32s2", "esp32s3"]
       reason: Example depends on BSP, which is supported only for IDF >= 5.0 and limited targets
 
+esp_schedule/examples/get_started:
+  enable:
+    - if: ((IDF_VERSION_MAJOR == 5 and IDF_VERSION_MINOR >= 1) or (IDF_VERSION_MAJOR > 5)) and SOC_WIFI_SUPPORTED == 1
+      reason: Network provisioning component has dependencies IDF >= 5.1; example only supports Wi-Fi enabled targets
+
 catch2/examples/catch2-test:
   enable:
     - if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -38,6 +38,7 @@ body:
         - esp_isotp
         - esp_jpeg
         - esp_lcd_qemu_rgb
+        - esp_schedule
         - esp_serial_slave_link
         - expat
         - fmt

.github/filter_sarif.py

@@ -3,45 +3,94 @@
 import argparse
 import copy
 import json
-import typing
+import typing as t
 
 
-def process(in_file: typing.TextIO, out_file: typing.TextIO, include_prefix_list: typing.List[str]) -> None:
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-o', '--output', type=argparse.FileType('w'), help='Output filtered SARIF file')
+    parser.add_argument('--include-prefix', required=True, action='append',
+                        help='File prefix for source code to include in analysis')
+    parser.add_argument('--exclude-text-contains', action='append', default=[],
+                        help='Exclude results whose message.text contains this substring (may be repeated)')
+    parser.add_argument('input_file', type=argparse.FileType('r'), help='Input SARIF file')
+    args = parser.parse_args()
+    process(args.input_file, args.output, args.include_prefix, args.exclude_text_contains)
+
+
+def process(in_file: t.TextIO, out_file: t.TextIO, include_prefix_list: t.List[str], exclude_text_contains_list: t.List[str]) -> None:
     in_json = json.load(in_file)
     if len(in_json['runs']) != 1:
         raise NotImplementedError('Only 1 run is supported')
     in_results = in_json['runs'][0]['results']
     out_results = []
     for result in in_results:
-        locations = result['locations']
-        if len(locations) != 1:
-            raise NotImplementedError('Only 1 location is supported')
-        artifact_location = locations[0]['physicalLocation']['artifactLocation']
-        uri = artifact_location['uri']
-        new_uri = None
-        for include_prefix in include_prefix_list:
-            if uri.startswith(include_prefix):
-                new_uri = uri.replace(include_prefix, '')
-                break
-        if not new_uri:
-            continue
-        new_result = copy.deepcopy(result)
-        new_result['locations'][0]['physicalLocation']['artifactLocation']['uri'] = new_uri
-        out_results.append(new_result)
+        transformed = transform_result(result, include_prefix_list, exclude_text_contains_list)
+        if transformed is not None:
+            out_results.append(transformed)
 
     out_json = copy.deepcopy(in_json)
     out_json['runs'][0]['results'] = out_results
     json.dump(out_json, out_file, indent=True)
 
 
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-o', '--output', type=argparse.FileType('w'), help='Output filtered SARIF file')
-    parser.add_argument('--include-prefix', required=True, action='append',
-                        help='File prefix for source code to include in analysis')
-    parser.add_argument('input_file', type=argparse.FileType('r'), help='Input SARIF file')
-    args = parser.parse_args()
-    process(args.input_file, args.output, args.include_prefix)
+def normalize_uri_optional(uri: t.Optional[str], include_prefix_list: t.List[str], strict: bool) -> t.Optional[str]:
+    if uri is None:
+        return None
+    for include_prefix in include_prefix_list:
+        if uri.startswith(include_prefix):
+            return uri.replace(include_prefix, '')
+    return None if strict else uri
+
+
+def message_contains_any(text: str, substrings: t.List[str]) -> bool:
+    return any(substr in text for substr in substrings)
+
+
+def dedupe_related_locations(related_locations: t.Any, include_prefix_list: t.List[str]) -> t.List[t.Dict[str, t.Any]]:
+    if not isinstance(related_locations, list) or not related_locations:
+        return []
+    seen_keys: t.Set[t.Tuple[t.Any, ...]] = set()
+    deduped: t.List[t.Dict[str, t.Any]] = []
+    for rel in related_locations:
+        if not isinstance(rel, dict):
+            continue
+        rel_msg_text = rel['message']['text']
+        rel_uri = rel['physicalLocation']['artifactLocation']['uri']
+        rel_uri_norm = normalize_uri_optional(rel_uri, include_prefix_list, strict=False)
+        rel['physicalLocation']['artifactLocation']['uri'] = rel_uri_norm
+        key = (rel_msg_text,
+               rel_uri_norm,
+               rel['physicalLocation']['region']['startLine'],
+               rel['physicalLocation']['region']['startColumn'])
+        if key in seen_keys:
+            continue
+        seen_keys.add(key)
+        deduped.append(rel)
+    return deduped
+
+
+def transform_result(result: t.Dict[str, t.Any], include_prefix_list: t.List[str], exclude_text_contains_list: t.List[str]) -> t.Optional[t.Dict[str, t.Any]]:
+    locations = result['locations']
+    if len(locations) != 1:
+        raise NotImplementedError('Only 1 location is supported')
+    artifact_location = locations[0]['physicalLocation']['artifactLocation']
+    uri = artifact_location['uri']
+    normalized_uri = normalize_uri_optional(uri, include_prefix_list, strict=True)
+    if not normalized_uri:
+        return None
+    message_text = result['message']['text']
+    if message_contains_any(message_text, exclude_text_contains_list):
+        return None
+    new_result = copy.deepcopy(result)
+    new_result['locations'][0]['physicalLocation']['artifactLocation']['uri'] = normalized_uri
+    deduped_related = dedupe_related_locations(new_result.get('relatedLocations'), include_prefix_list)
+    if deduped_related:
+        new_result['relatedLocations'] = deduped_related
+    elif 'relatedLocations' in new_result:
+        # Ensure we have a list per schema even if empty
+        new_result['relatedLocations'] = []
+    return new_result
 
 
 if __name__ == '__main__':

.github/workflows/clang-tidy.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: Run clang-tidy
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container: espressif/idf:latest
     steps:
       - uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
           ${IDF_PATH}/tools/idf_tools.py --non-interactive install esp-clang
       - name: Install clang-tidy-sarif
         run: |
-          curl -sSL https://github.com/psastras/sarif-rs/releases/download/clang-tidy-sarif-v0.3.3/clang-tidy-sarif-x86_64-unknown-linux-gnu -o clang-tidy-sarif
+          curl -sSL https://github.com/psastras/sarif-rs/releases/download/clang-tidy-sarif-v0.8.0/clang-tidy-sarif-x86_64-unknown-linux-gnu -o clang-tidy-sarif
           chmod +x clang-tidy-sarif
       - name: Install pyclang
         shell: bash
@@ -42,8 +42,18 @@ jobs:
       - name: Convert clang-tidy results into SARIF output
         run: |
           export PATH=$PWD:$PATH
-          ./clang-tidy-sarif -o results.sarif.raw warnings.txt
-          python3 $GITHUB_WORKSPACE/.github/filter_sarif.py -o results.sarif --include-prefix ${GITHUB_WORKSPACE}/ results.sarif.raw
+          ./clang-tidy-sarif -o results.sarif.raw -i warnings.txt
+          # Remove warnings which recommend using functions not supported in newlib.
+          python3 $GITHUB_WORKSPACE/.github/filter_sarif.py -o results.sarif \
+            --include-prefix ${GITHUB_WORKSPACE}/ \
+            --exclude-text-contains memset_s \
+            --exclude-text-contains memmove_s \
+            --exclude-text-contains memcpy_s \
+            --exclude-text-contains fprintf_s \
+            --exclude-text-contains snprintf_s \
+            --exclude-text-contains strncpy_s \
+            --exclude-text-contains sscanf_s \
+            results.sarif.raw
       - uses: actions/upload-artifact@v4
         with:
           path: |

.github/workflows/upload_component.yml

@@ -42,6 +42,7 @@ jobs:
             esp_lcd_qemu_rgb
             esp_linenoise
             esp_jpeg
+            esp_schedule
             esp_serial_slave_link
             expat
             fmt

.idf_build_apps.toml

@@ -13,6 +13,7 @@ manifest_file = [
     "esp_gcov/.build-test-rules.yml",
     "esp_jpeg/.build-test-rules.yml",
     "esp_linenoise/.build-test-rules.yml",
+    "esp_schedule/.build-test-rules.yml",
     "esp_serial_slave_link/.build-test-rules.yml",
     "expat/.build-test-rules.yml",
     "iqmath/.build-test-rules.yml",

coap/sbom_libcoap.yml

@@ -12,3 +12,5 @@ cve-exclude-list:
     reason: Resolved in version 4.3.5-rc1
   - cve: CVE-2024-46304
     reason: Resolved in version 4.3.5-rc3
+  - cve: CVE-2025-50518
+    reason: Not applicable as per comment https://github.com/obgm/libcoap/issues/1724#issuecomment-3296780541

esp_linenoise/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.0.0"
+version: "1.0.1"
 description: "ESP Linenoise - Line editing C library"
 url: https://github.com/espressif/idf-extra-components/tree/master/esp_linenoise
 license: Apache-2.0

esp_linenoise/include/esp_linenoise.h

@@ -307,6 +307,48 @@ esp_err_t esp_linenoise_set_max_cmd_line_length(esp_linenoise_handle_t handle, s
  */
 esp_err_t esp_linenoise_get_max_cmd_line_length(esp_linenoise_handle_t handle, size_t *max_cmd_line_length);
 
+/**
+ * @brief Return the output file descriptor used by esp_linenoise
+ *
+ * @param handle The esp_linenoise handle from which to get
+ * the file descriptor
+ * @param fd Return value containing the output file descriptor
+ * @return ESP_OK on success, ESP_ERR_INVALID_ARG otherwise
+ */
+esp_err_t esp_linenoise_get_out_fd(esp_linenoise_handle_t handle, int *fd);
+
+/**
+ * @brief Return the input file descriptor used by esp_linenoise
+ *
+ * @param handle The esp_linenoise handle from which to get
+ * the file descriptor
+ * @param fd Return value containing the input file descriptor
+ * @return ESP_OK on success, ESP_ERR_INVALID_ARG otherwise
+ */
+esp_err_t esp_linenoise_get_in_fd(esp_linenoise_handle_t handle, int *fd);
+
+/**
+ * @brief Return the read function used by linenoise
+ *
+ * @param handle The esp_linenoise handle from which to get
+ * the file descriptor
+ * @param read_func Return the read_func as set in the configuration structure
+ * of the given esp_linenoise instance
+ * @return ESP_OK on success, ESP_ERR_INVALID_ARG otherwise
+ */
+esp_err_t esp_linenoise_get_read(esp_linenoise_handle_t handle, esp_linenoise_read_bytes_t *read_func);
+
+/**
+ * @brief Return the write function used by linenoise
+ *
+ * @param handle The esp_linenoise handle from which to get
+ * the file descriptor
+ * @param write_func Return the write_func as set in the configuration structure
+ * of the given esp_linenoise instance
+ * @return ESP_OK on success, ESP_ERR_INVALID_ARG otherwise
+ */
+esp_err_t esp_linenoise_get_write(esp_linenoise_handle_t handle, esp_linenoise_write_bytes_t *write_func);
+
 #ifdef __cplusplus
 }
 #endif

esp_linenoise/private_include/esp_linenoise_private.h

@@ -62,7 +62,6 @@ typedef struct esp_linenoise_state {
 } esp_linenoise_state_t;
 
 typedef struct esp_linenoise_instance {
-    esp_linenoise_handle_t self;
     esp_linenoise_config_t config;
     esp_linenoise_state_t state;
 } esp_linenoise_instance_t;
@@ -82,7 +81,6 @@ esp_linenoise_instance_t *esp_linenoise_create_instance_static(void)
     esp_linenoise_instance_t *instance = malloc(sizeof(esp_linenoise_instance_t));
     assert(instance != NULL);
 
-    instance->self = instance;
     esp_linenoise_get_instance_config_default(&instance->config);
 
     /* set the state part of the esp_linenoise_instance_t to 0 to init all values to 0 (or NULL) */