Skip to content

Commit 475b00a

Browse files
josesimoesjosesimoes
committed
Merge branch 'main' of https://github.com/nanoframework/nf-interpreter into skyworks-evb
2 parents e74d66e + 2cbd142 commit 475b00a

File tree

5 files changed

+48
-34
lines changed

5 files changed

+48
-34
lines changed

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ We also have a [Community Targets](https://github.com/nanoframework/nf-Community
6464
### ESP32_S2 boards
6565
| Target | Note | Version |
6666
|:---|---|---|
67-
| FEATHER_S2 | Adafruit | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/FEATHER_S2/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/FEATHER_S2/latest/) |
68-
| KALUGA_1 | Espressif | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/KALUGA_1/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/KALUGA_1/latest/) |
67+
| ESP32_S2_USB | S2 boards with direct USB connection to chip. Including Adafruit Feather_S2 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_USB/latest/) |
68+
| ESP32_S2_UART | S2 boards with onboard USB->UART. This includes the Kaluga dev. board from Espressif | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_UART/latest/) |
6969

7070
### ESP32_S3 boards
7171
| Target | Note | Version |
7272
|:---|---|---|
73-
| ESP32_S3 | Quad spiram support | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3/latest/) |
73+
| ESP32_S3 | Display & Quad spiram support | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3/latest/) |
7474
| ESP32_S3_BLE | Display, BLE, Quad spiram support | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_BLE/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_BLE/latest/) |
7575
| ESP32_S3_ALL | Display, BLE, Octal spiram support | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_ALL/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_ALL/latest/) |
7676

@@ -141,8 +141,8 @@ The above .NET nanoFramework interpreter builds include support for the class li
141141
| ESP_WROVER_KIT | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: |
142142
| ESP32_PICO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
143143
| ESP32_LILYGO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: Wi-Fi + Ethernet | | | |
144-
| FEATHER_S2 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
145-
| KALUGA_1 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
144+
| ESP32_S2_USB | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
145+
| ESP32_S2_UART | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
146146
| ESP32_C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
147147
| XIAO_ESP32C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
148148
| ESP32_C6 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |

‎README.zh-cn.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
| ESP_WROVER_KIT | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP_WROVER_KIT/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP_WROVER_KIT/latest/) |
3737
| ESP32_PICO | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_PICO/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_PICO/latest/) |
3838
| ESP32_LILYGO | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_LILYGO/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_LILYGO/latest/) |
39-
| FEATHER_S2 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/FEATHER_S2/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/FEATHER_S2/latest/) |
40-
| KALUGA_1 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/KALUGA_1/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/KALUGA_1/latest/) |
39+
| ESP32_S2_USB | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_USB/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_USB/latest/) |
40+
| ESP32_S2_UART | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_UART/latest/) |
4141
| ESP32_C3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_C3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_C3/latest/) |
4242
| ESP32_C3_REV3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_C3_REV3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_C3_REV3/latest/) |
4343
| XIAO_ESP32C3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/XIAO_ESP32C3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/XIAO_ESP32C3/latest/) |
@@ -108,8 +108,8 @@
108108
| ESP_WROVER_KIT | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: |
109109
| ESP32_PICO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
110110
| ESP32_LILYGO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: Wi-Fi + Ethernet | | | |
111-
| FEATHER_S2 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
112-
| KALUGA_1 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
111+
| ESP32_S2_USB | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
112+
| ESP32_S2_UART | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
113113
| ESP32_C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
114114
| XIAO_ESP32C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
115115
| ESP32_OLIMEX | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: Wi-Fi + Ethernet | | :heavy_check_mark: | |

‎azure-pipelines-nightly.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,14 +381,23 @@ jobs:
381381
PackageName: ESP32_PICO
382382
CMakePreset: ESP32_PICO
383383

384-
KALUGA_1:
384+
ESP32_S2_UART:
385385
TargetBoard: ESP32_S2
386386
TargetSeries: "esp32_s2"
387387
BuildOptions:
388388
IDF_Target: esp32s2
389-
TargetName: KALUGA_1
390-
PackageName: KALUGA_1
391-
CMakePreset: KALUGA_1
389+
TargetName: ESP32_S2_UART
390+
PackageName: ESP32_S2_UART
391+
CMakePreset: ESP32_S2_UART
392+
393+
ESP32_S2_USB:
394+
TargetBoard: ESP32_S2
395+
TargetSeries: "esp32_s2"
396+
BuildOptions:
397+
IDF_Target: esp32s2
398+
TargetName: ESP32_S2_USB
399+
PackageName: ESP32_S2_USB
400+
CMakePreset: ESP32_S2_USB
392401

393402
ESP32_BLE_REV3:
394403
TargetBoard: ESP32

‎azure-pipelines.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -496,15 +496,6 @@ jobs:
496496
PackageName: ESP32_LILYGO
497497
CMakePreset: ESP32_LILYGO
498498

499-
FEATHER_S2:
500-
TargetBoard: ESP32_S2
501-
TargetSeries: "esp32_s2"
502-
BuildOptions:
503-
IDF_Target: esp32s2
504-
TargetName: FEATHER_S2
505-
PackageName: FEATHER_S2
506-
CMakePreset: FEATHER_S2
507-
508499
ESP32_C3:
509500
TargetBoard: ESP32_C3
510501
TargetSeries: "esp32c3"

‎targets/ESP32/CMakePresets.json‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"API_nanoFramework.System.Collections": "ON",
8181
"API_nanoFramework.System.Text": "ON",
8282
"API_nanoFramework.Networking.Thread": "ON",
83+
"API_nanoFramework.Graphics": "ON",
8384
"GRAPHICS_DISPLAY": "Generic_SPI.cpp",
8485
"TOUCHPANEL_DEVICE": "XPT2046.cpp",
8586
"GRAPHICS_DISPLAY_INTERFACE": "Spi_To_Display.cpp",
@@ -337,7 +338,13 @@
337338
"NF_FEATURE_DEBUGGER": "ON",
338339
"NF_FEATURE_RTC": "ON",
339340
"NF_FEATURE_HAS_SDCARD": "ON",
340-
"ESP32_USB_CDC": "ON"
341+
"ESP32_USB_CDC": "ON",
342+
"API_nanoFramework.Graphics": "ON",
343+
"GRAPHICS_DISPLAY": "Generic_SPI.cpp",
344+
"TOUCHPANEL_DEVICE": "XPT2046.cpp",
345+
"GRAPHICS_DISPLAY_INTERFACE": "Spi_To_Display.cpp",
346+
"TOUCHPANEL_INTERFACE": "Spi_To_TouchPanel.cpp",
347+
"ESP32_SPIRAM_FOR_IDF_ALLOCATION": "1024 * 1024"
341348
}
342349
},
343350
{
@@ -796,7 +803,7 @@
796803
}
797804
},
798805
{
799-
"name": "FEATHER_S2",
806+
"name": "ESP32_S2_USB",
800807
"inherits": [
801808
"xtensa-esp32s2-preset",
802809
"user-tools-repos",
@@ -814,11 +821,17 @@
814821
"ESP32_CONFIG_PIN_PHY_POWER": "",
815822
"ESP32_CONFIG_PHY_CLOCK_MODE": "",
816823
"ESP32_USB_CDC": "ON",
817-
"API_nanoFramework.Device.OneWire": "OFF"
824+
"API_nanoFramework.Device.OneWire": "OFF",
825+
"API_nanoFramework.Graphics": "ON",
826+
"GRAPHICS_DISPLAY": "Generic_SPI.cpp",
827+
"TOUCHPANEL_DEVICE": "XPT2046.cpp",
828+
"GRAPHICS_DISPLAY_INTERFACE": "Spi_To_Display.cpp",
829+
"TOUCHPANEL_INTERFACE": "Spi_To_TouchPanel.cpp",
830+
"ESP32_SPIRAM_FOR_IDF_ALLOCATION": "1024 * 1024"
818831
}
819832
},
820833
{
821-
"name": "KALUGA_1",
834+
"name": "ESP32_S2_UART",
822835
"inherits": [
823836
"xtensa-esp32s2-preset",
824837
"user-tools-repos",
@@ -832,10 +845,11 @@
832845
"NF_FEATURE_DEBUGGER": "ON",
833846
"NF_FEATURE_RTC": "ON",
834847
"API_nanoFramework.Graphics": "ON",
835-
"GRAPHICS_DISPLAY": "ILI9341_240x320_SPI.cpp",
848+
"GRAPHICS_DISPLAY": "Generic_SPI.cpp",
836849
"TOUCHPANEL_DEVICE": "XPT2046.cpp",
837850
"GRAPHICS_DISPLAY_INTERFACE": "Spi_To_Display.cpp",
838-
"TOUCHPANEL_INTERFACE": "Spi_To_TouchPanel.cpp"
851+
"TOUCHPANEL_INTERFACE": "Spi_To_TouchPanel.cpp",
852+
"ESP32_SPIRAM_FOR_IDF_ALLOCATION": "1024 * 1024"
839853
}
840854
}
841855
],
@@ -1046,15 +1060,15 @@
10461060
},
10471061
{
10481062
"inherits": "base-user",
1049-
"name": "FEATHER_S2",
1050-
"displayName": "FEATHER_S2",
1051-
"configurePreset": "FEATHER_S2"
1063+
"name": "ESP32_S2_USB",
1064+
"displayName": "ESP32_S2_USB",
1065+
"configurePreset": "ESP32_S2_USB"
10521066
},
10531067
{
10541068
"inherits": "base-user",
1055-
"name": "KALUGA_1",
1056-
"displayName": "KALUGA_1",
1057-
"configurePreset": "KALUGA_1"
1069+
"name": "ESP32_S2_UART",
1070+
"displayName": "ESP32_S2_UART",
1071+
"configurePreset": "ESP32_S2_UART"
10581072
}
10591073
]
10601074
}

0 commit comments

Comments
 (0)