From 889e24f550e5ae18e22592a1b8668ef2fb81d759 Mon Sep 17 00:00:00 2001 From: Rocky Sherriff Date: Thu, 29 Feb 2024 16:49:25 -0500 Subject: [PATCH 1/6] Add WICED make file for components/json --- components/json/json.mk | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 components/json/json.mk diff --git a/components/json/json.mk b/components/json/json.mk new file mode 100644 index 000000000000..96fa3145819e --- /dev/null +++ b/components/json/json.mk @@ -0,0 +1,38 @@ +# +# Copyright 2020, Cypress Semiconductor Corporation or a subsidiary of + # Cypress Semiconductor Corporation. All Rights Reserved. + # This software, including source code, documentation and related + # materials ("Software"), is owned by Cypress Semiconductor Corporation + # or one of its subsidiaries ("Cypress") and is protected by and subject to + # worldwide patent protection (United States and foreign), + # United States copyright laws and international treaty provisions. + # Therefore, you may use this Software only as provided in the license + # agreement accompanying the software package from which you + # obtained this Software ("EULA"). + # If no EULA applies, Cypress hereby grants you a personal, non-exclusive, + # non-transferable license to copy, modify, and compile the Software + # source code solely for use in connection with Cypress's + # integrated circuit products. Any reproduction, modification, translation, + # compilation, or representation of this Software except as specified + # above is prohibited without the express written permission of Cypress. + # + # Disclaimer: THIS SOFTWARE IS PROVIDED AS-IS, WITH NO WARRANTY OF ANY KIND, + # EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, NONINFRINGEMENT, IMPLIED + # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Cypress + # reserves the right to make changes to the Software without notice. Cypress + # does not assume any liability arising out of the application or use of the + # Software or any product or circuit described in the Software. Cypress does + # not authorize its products for use in any products where a malfunction or + # failure of the Cypress product may reasonably be expected to result in + # significant property damage, injury or death ("High Risk Product"). By + # including Cypress's product in a High Risk Product, the manufacturer + # of such system or application assumes all risk of such use and in doing + # so agrees to indemnify Cypress against all liability. +# + +NAME := Lib_Json + +GLOBAL_INCLUDES := ./cJSON + +$(NAME)_SOURCES := cJSON/cJSON.c \ + cJSON/cJSON_Utils.c From 8b1381a71aea8b4fcf7f24b69a2521113634fe2e Mon Sep 17 00:00:00 2001 From: Rocky Sherriff <106687856+rockys-spindance@users.noreply.github.com> Date: Fri, 1 Mar 2024 09:37:22 -0500 Subject: [PATCH 2/6] Add include/freertos to FreeRTOS cmake to get common path across ports --- components/freertos/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt index 78a8e4ae4efc..4e339a21b341 100644 --- a/components/freertos/CMakeLists.txt +++ b/components/freertos/CMakeLists.txt @@ -82,6 +82,7 @@ else() set(include_dirs FreeRTOS-Kernel/include + FreeRTOS-Kernel/include/freertos esp_additions/include/freertos # For files with #include "FreeRTOSConfig.h" FreeRTOS-Kernel/portable/xtensa/include # For arch-specific FreeRTOSConfig_arch.h in portable//include esp_additions/include) # For files with #include "freertos/FreeRTOSConfig.h" From a5445512cf1c26e6eadf0ce503da23a770e51f9a Mon Sep 17 00:00:00 2001 From: Rocky Sherriff Date: Tue, 9 Sep 2025 14:59:37 -0400 Subject: [PATCH 3/6] Update python version in the precommit github workflow --- .github/workflows/pre_commit_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre_commit_check.yml b/.github/workflows/pre_commit_check.yml index 177d10a57369..c233078cb233 100644 --- a/.github/workflows/pre_commit_check.yml +++ b/.github/workflows/pre_commit_check.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@master with: - python-version: v3.7 + python-version: v3.11 - name: Install python packages run: | pip install pre-commit From c4136fb1487d7dd1b4103023b3e86351cf4bb5f3 Mon Sep 17 00:00:00 2001 From: Rocky Sherriff Date: Tue, 9 Sep 2025 15:07:39 -0400 Subject: [PATCH 4/6] Try python 3.10 for precommit workflow --- .github/workflows/pre_commit_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre_commit_check.yml b/.github/workflows/pre_commit_check.yml index c233078cb233..022af884c519 100644 --- a/.github/workflows/pre_commit_check.yml +++ b/.github/workflows/pre_commit_check.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@master with: - python-version: v3.11 + python-version: v3.10 - name: Install python packages run: | pip install pre-commit From 13922e98c4b500980276cd0c675bac1ee144fe65 Mon Sep 17 00:00:00 2001 From: Rocky Sherriff Date: Tue, 9 Sep 2025 15:10:03 -0400 Subject: [PATCH 5/6] Try python 3.8 for precommit workflow --- .github/workflows/pre_commit_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre_commit_check.yml b/.github/workflows/pre_commit_check.yml index 022af884c519..17d549c6cf5c 100644 --- a/.github/workflows/pre_commit_check.yml +++ b/.github/workflows/pre_commit_check.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@master with: - python-version: v3.10 + python-version: v3.8 - name: Install python packages run: | pip install pre-commit From b45d224a76f43e4636285dd259477d41c298b3f8 Mon Sep 17 00:00:00 2001 From: Rocky Sherriff Date: Tue, 9 Sep 2025 15:19:50 -0400 Subject: [PATCH 6/6] Remove trailing whitespace in components/json/json.mk --- components/json/json.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/json/json.mk b/components/json/json.mk index 96fa3145819e..e51bfadff0b9 100644 --- a/components/json/json.mk +++ b/components/json/json.mk @@ -1,5 +1,5 @@ # -# Copyright 2020, Cypress Semiconductor Corporation or a subsidiary of +# Copyright 2020, Cypress Semiconductor Corporation or a subsidiary of # Cypress Semiconductor Corporation. All Rights Reserved. # This software, including source code, documentation and related # materials ("Software"), is owned by Cypress Semiconductor Corporation