Skip to content

Commit 1ebe574

Browse files
valerosvaleros
committed
Merge branch 'release/v3.5.0'
2 parents 1bbd672 + 3f31c1d commit 1ebe574

File tree

45 files changed

+588
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+588
-734
lines changed

‎boards/esp32-s2-franzininho.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"build": {
3+
"arduino":{
4+
"ld": "esp32s2_out.ld"
5+
},
6+
"core": "esp32",
7+
"f_cpu": "240000000L",
8+
"f_flash": "80000000L",
9+
"flash_mode": "dio",
10+
"mcu": "esp32s2",
11+
"variant": "esp32s2"
12+
},
13+
"connectivity": [
14+
"wifi"
15+
],
16+
"debug": {
17+
"openocd_target": "esp32s2.cfg"
18+
},
19+
"frameworks": [
20+
"espidf"
21+
],
22+
"name": "Franzininho WiFi Board",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 327680,
26+
"maximum_size": 4194304,
27+
"require_upload_port": true,
28+
"speed": 460800
29+
},
30+
"url": "https://github.com/Franzininho/Franzininho-WIFI",
31+
"vendor": "Franzininho"
32+
}

‎boards/lionbit.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"build": {
3+
"arduino":{
4+
"ldscript": "esp32_out.ld"
5+
},
6+
"core": "esp32",
7+
"extra_flags": "-DARDUINO_ESP32_DEV",
8+
"f_cpu": "240000000L",
9+
"f_flash": "40000000L",
10+
"flash_mode": "dio",
11+
"flags" : "-DCORE_DEBUG_LEVEL=5",
12+
"mcu": "esp32",
13+
"variant": "esp32"
14+
},
15+
"connectivity": [
16+
"wifi",
17+
"bluetooth",
18+
"ethernet",
19+
"can"
20+
],
21+
"debug": {
22+
"openocd_board": "esp-wroom-32.cfg"
23+
},
24+
"frameworks": [
25+
"arduino",
26+
"espidf"
27+
],
28+
"name": "LionBit",
29+
"upload": {
30+
"flash_size": "4MB",
31+
"maximum_ram_size": 327680,
32+
"maximum_size": 4194304,
33+
"require_upload_port": true,
34+
"speed": 115200
35+
},
36+
"monitor": {
37+
"speed" : 115200
38+
},
39+
"url": "http://lionbit.lk/",
40+
"vendor": "Lion::Bit"
41+
}

‎boards/m5stack-core2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"partitions": "default_16MB.csv"
66
},
77
"core": "esp32",
8-
"extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
8+
"extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM",
99
"f_cpu": "240000000L",
1010
"f_flash": "40000000L",
1111
"flash_mode": "dio",

‎builder/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def __fetch_spiffs_size(target, source, env):
233233
target_elf = env.BuildProgram()
234234
if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
235235
target_firm = env.DataToBin(
236-
join("$BUILD_DIR", "${ESP32_SPIFFS_IMAGE_NAME}"), "$PROJECTDATA_DIR")
236+
join("$BUILD_DIR", "${ESP32_SPIFFS_IMAGE_NAME}"), "$PROJECT_DATA_DIR")
237237
env.NoCache(target_firm)
238238
AlwaysBuild(target_firm)
239239
else:

‎examples/arduino-blink/README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
How to build PlatformIO based project
2+
=====================================
3+
4+
1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
5+
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
6+
3. Extract ZIP archive
7+
4. Run these commands:
8+
9+
```shell
10+
# Change directory to example
11+
$ cd platform-espressif32/examples/arduino-blink
12+
13+
# Build project
14+
$ pio run
15+
16+
# Upload firmware
17+
$ pio run --target upload
18+
19+
# Build specific environment
20+
$ pio run -e esp32dev
21+
22+
# Upload firmware for the specific environment
23+
$ pio run -e esp32dev --target upload
24+
25+
# Clean build files
26+
$ pio run --target clean
27+
```

‎examples/arduino-blink/README.rst

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎examples/arduino-briki-internal-libs/README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
How to build PlatformIO based project
2+
=====================================
3+
4+
1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
5+
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
6+
3. Extract ZIP archive
7+
4. Run these commands:
8+
9+
```shell
10+
# Change directory to example
11+
$ cd platform-espressif32/examples/arduino-briki-internal-libs
12+
13+
# Build project
14+
$ pio run
15+
16+
# Upload firmware
17+
$ pio run --target upload
18+
19+
# Build specific environment
20+
$ pio run -e briki_abc_esp32
21+
22+
# Upload firmware for the specific environment
23+
$ pio run -e briki_abc_esp32 --target upload
24+
25+
# Clean build files
26+
$ pio run --target clean
27+
```

‎examples/arduino-briki-internal-libs/README.rst

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎examples/arduino-wifiscan/README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
How to build PlatformIO based project
2+
=====================================
3+
4+
1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
5+
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
6+
3. Extract ZIP archive
7+
4. Run these commands:
8+
9+
```shell
10+
# Change directory to example
11+
$ cd platform-espressif32/examples/arduino-wifiscan
12+
13+
# Build project
14+
$ pio run
15+
16+
# Upload firmware
17+
$ pio run --target upload
18+
19+
# Build specific environment
20+
$ pio run -e quantum
21+
22+
# Upload firmware for the specific environment
23+
$ pio run -e quantum --target upload
24+
25+
# Clean build files
26+
$ pio run --target clean
27+
```

‎examples/arduino-wifiscan/README.rst

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)