Skip to content

Commit eae666d

Browse files
josesimoesjosesimoes
committed
Merge branch 'main' of https://github.com/nanoframework/nf-interpreter into add-generics-readme
2 parents d885771 + 8f92554 commit eae666d

File tree

26 files changed

+459
-98
lines changed

26 files changed

+459
-98
lines changed

‎.github/workflows/devcontainer-all.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727

2828
- name: Checkout Repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Free Disk Space (Ubuntu)
3232
uses: jlumbroso/free-disk-space@main
@@ -55,7 +55,7 @@ jobs:
5555
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
5656

5757
- name: Build and Push Docker Image
58-
uses: docker/build-push-action@v5
58+
uses: docker/build-push-action@v6
5959
with:
6060
file: ${{ env.CONTAINER_SRC_FILE }}
6161
push: true # Will only build if this is not here

‎.github/workflows/devcontainer-azurertos.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727

2828
- name: Checkout Repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Free Disk Space (Ubuntu)
3232
uses: jlumbroso/free-disk-space@main
@@ -55,7 +55,7 @@ jobs:
5555
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
5656

5757
- name: Build and Push Docker Image
58-
uses: docker/build-push-action@v5
58+
uses: docker/build-push-action@v6
5959
with:
6060
file: ${{ env.CONTAINER_SRC_FILE }}
6161
push: true # Will only build if this is not here

‎.github/workflows/devcontainer-chibios.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727

2828
- name: Checkout Repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Free Disk Space (Ubuntu)
3232
uses: jlumbroso/free-disk-space@main
@@ -55,7 +55,7 @@ jobs:
5555
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
5656

5757
- name: Build and Push Docker Image
58-
uses: docker/build-push-action@v5
58+
uses: docker/build-push-action@v6
5959
with:
6060
file: ${{ env.CONTAINER_SRC_FILE }}
6161
push: true # Will only build if this is not here

‎.github/workflows/devcontainer-esp32.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727

2828
- name: Checkout Repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Free Disk Space (Ubuntu)
3232
uses: jlumbroso/free-disk-space@main
@@ -55,7 +55,7 @@ jobs:
5555
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
5656

5757
- name: Build and Push Docker Image
58-
uses: docker/build-push-action@v5
58+
uses: docker/build-push-action@v6
5959
with:
6060
file: ${{ env.CONTAINER_SRC_FILE }}
6161
push: true # Will only build if this is not here

‎.github/workflows/devcontainer-freertos-nxp.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727

2828
- name: Checkout Repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Free Disk Space (Ubuntu)
3232
uses: jlumbroso/free-disk-space@main
@@ -55,7 +55,7 @@ jobs:
5555
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
5656

5757
- name: Build and Push Docker Image
58-
uses: docker/build-push-action@v5
58+
uses: docker/build-push-action@v6
5959
with:
6060
file: ${{ env.CONTAINER_SRC_FILE }}
6161
push: true # Will only build if this is not here

‎.github/workflows/devcontainer-smoketest.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
{ target: SL_STK3701A, build-type: Debug, container: All},
1818
{ target: ST_STM32F769I_DISCOVERY, build-type: Debug, container: ChibiOS },
1919
{ target: ST_STM32F769I_DISCOVERY, build-type: Debug, container: All },
20+
{ target: ORGPAL_PALTHREE, build-type: Debug, container: ChibiOS },
2021
{ target: M5Core2, build-type: Debug, container: ESP32 },
2122
{ target: ESP_WROVER_KIT, build-type: Debug, container: ESP32 },
2223
{ target: ESP32_S2_USB, build-type: Debug, container: ESP32 },
@@ -35,7 +36,7 @@ jobs:
3536
contents: read
3637

3738
steps:
38-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
3940
with:
4041
submodules: true
4142

@@ -47,10 +48,6 @@ jobs:
4748
tool-cache: true
4849
large-packages: false
4950

50-
- name: Update repo submodules
51-
run: |
52-
git submodule update --init
53-
5451
- name: Adjust config templates for a devcontainer
5552
run: |
5653
# Move into the config directory
@@ -61,7 +58,9 @@ jobs:
6158
mv user-tools-repos.TEMPLATE.json user-tools-repos.json
6259
6360
# Adjust the file content for a valid radio frequency (TI targets)
64-
sed -i -- 's|"RADIO_FREQUENCY": "CHANGE_ME_TO_A_VALID_VALUE_868_OR_915"|"RADIO_FREQUENCY": "${{ matrix.radio-freq }}"|g' user-prefs.json
61+
if [[ -n "${{ matrix.radio-freq }}" ]]; then
62+
sed -i -- 's|"RADIO_FREQUENCY": "CHANGE_ME_TO_A_VALID_VALUE_868_OR_915"|"RADIO_FREQUENCY": "${{ matrix.radio-freq }}"|g' user-prefs.json
63+
fi
6564
6665
# Adjust the file content for a devcontainer
6766
sed -i -- 's|"name": "user-tools-repos-container"|"name": "user-tools-repos"|g' user-tools-repos.json

‎.github/workflows/devcontainer-ti.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727

2828
- name: Checkout Repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Free Disk Space (Ubuntu)
3232
uses: jlumbroso/free-disk-space@main
@@ -55,7 +55,7 @@ jobs:
5555
password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
5656

5757
- name: Build and Push Docker Image
58-
uses: docker/build-push-action@v5
58+
uses: docker/build-push-action@v6
5959
with:
6060
file: ${{ env.CONTAINER_SRC_FILE }}
6161
push: true # Will only build if this is not here

‎CMake/Modules/FindSystem.Device.Adc.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ list(APPEND System.Device.Adc_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/System.Device
1717

1818
# source files
1919
set(System.Device.Adc_SRCS
20-
2120
sys_dev_adc_native.cpp
2221

2322
sys_dev_adc_native_System_Device_Adc_AdcChannel.cpp

‎CMake/binutils.ChibiOS.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ macro(nf_add_platform_packages)
8484
# littlefs
8585
if(NF_FEATURE_USE_LITTLEFS_OPTION)
8686
find_package(STM32F7_CubePackage REQUIRED QUIET)
87-
find_package(littlefs REQUIRED QUIET)
87+
find_package(LITTLEFS REQUIRED QUIET)
8888
endif()
8989

9090
if(STM32_CUBE_PACKAGE_REQUIRED)

‎CMake/binutils.ESP32.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ macro(nf_setup_partition_tables_generator)
484484
endif()
485485

486486
if(${TARGET_SERIES_SHORT} STREQUAL "esp32" OR
487+
${TARGET_SERIES_SHORT} STREQUAL "esp32c3" OR
487488
${TARGET_SERIES_SHORT} STREQUAL "esp32c5" OR
488489
${TARGET_SERIES_SHORT} STREQUAL "esp32c6" OR
489490
${TARGET_SERIES_SHORT} STREQUAL "esp32p4" OR
@@ -687,6 +688,7 @@ macro(nf_add_idf_as_library)
687688
esp_netif
688689
esp_eth
689690
esp_psram
691+
esp_adc
690692
littlefs
691693
)
692694

@@ -702,6 +704,7 @@ macro(nf_add_idf_as_library)
702704
idf::esp_netif
703705
idf::esp_eth
704706
idf::esp_psram
707+
idf::esp_adc
705708
idf::littlefs
706709
)
707710

0 commit comments

Comments
 (0)