Skip to content

Commit

Permalink
Merge branch 'release/v3.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Jan 28, 2022
2 parents 1bbd672 + 3f31c1d commit 1ebe574
Show file tree
Hide file tree
Showing 45 changed files with 588 additions and 734 deletions.
32 changes: 32 additions & 0 deletions boards/esp32-s2-franzininho.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"build": {
"arduino":{
"ld": "esp32s2_out.ld"
},
"core": "esp32",
"f_cpu": "240000000L",
"f_flash": "80000000L",
"flash_mode": "dio",
"mcu": "esp32s2",
"variant": "esp32s2"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32s2.cfg"
},
"frameworks": [
"espidf"
],
"name": "Franzininho WiFi Board",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"require_upload_port": true,
"speed": 460800
},
"url": "https://github.com/Franzininho/Franzininho-WIFI",
"vendor": "Franzininho"
}
41 changes: 41 additions & 0 deletions boards/lionbit.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"build": {
"arduino":{
"ldscript": "esp32_out.ld"
},
"core": "esp32",
"extra_flags": "-DARDUINO_ESP32_DEV",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
"flags" : "-DCORE_DEBUG_LEVEL=5",
"mcu": "esp32",
"variant": "esp32"
},
"connectivity": [
"wifi",
"bluetooth",
"ethernet",
"can"
],
"debug": {
"openocd_board": "esp-wroom-32.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "LionBit",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"require_upload_port": true,
"speed": 115200
},
"monitor": {
"speed" : 115200
},
"url": "http://lionbit.lk/",
"vendor": "Lion::Bit"
}
2 changes: 1 addition & 1 deletion boards/m5stack-core2.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"partitions": "default_16MB.csv"
},
"core": "esp32",
"extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
"extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM",
"f_cpu": "240000000L",
"f_flash": "40000000L",
"flash_mode": "dio",
Expand Down
2 changes: 1 addition & 1 deletion builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def __fetch_spiffs_size(target, source, env):
target_elf = env.BuildProgram()
if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
target_firm = env.DataToBin(
join("$BUILD_DIR", "${ESP32_SPIFFS_IMAGE_NAME}"), "$PROJECTDATA_DIR")
join("$BUILD_DIR", "${ESP32_SPIFFS_IMAGE_NAME}"), "$PROJECT_DATA_DIR")
env.NoCache(target_firm)
AlwaysBuild(target_firm)
else:
Expand Down
27 changes: 27 additions & 0 deletions examples/arduino-blink/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-espressif32/examples/arduino-blink

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Build specific environment
$ pio run -e esp32dev

# Upload firmware for the specific environment
$ pio run -e esp32dev --target upload

# Clean build files
$ pio run --target clean
```
38 changes: 0 additions & 38 deletions examples/arduino-blink/README.rst

This file was deleted.

27 changes: 27 additions & 0 deletions examples/arduino-briki-internal-libs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-espressif32/examples/arduino-briki-internal-libs

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Build specific environment
$ pio run -e briki_abc_esp32

# Upload firmware for the specific environment
$ pio run -e briki_abc_esp32 --target upload

# Clean build files
$ pio run --target clean
```
38 changes: 0 additions & 38 deletions examples/arduino-briki-internal-libs/README.rst

This file was deleted.

27 changes: 27 additions & 0 deletions examples/arduino-wifiscan/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-espressif32/examples/arduino-wifiscan

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Build specific environment
$ pio run -e quantum

# Upload firmware for the specific environment
$ pio run -e quantum --target upload

# Clean build files
$ pio run --target clean
```
38 changes: 0 additions & 38 deletions examples/arduino-wifiscan/README.rst

This file was deleted.

27 changes: 27 additions & 0 deletions examples/espidf-arduino-blink/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-espressif32/examples/espidf-arduino-blink

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Build specific environment
$ pio run -e esp32dev

# Upload firmware for the specific environment
$ pio run -e esp32dev --target upload

# Clean build files
$ pio run --target clean
```
38 changes: 0 additions & 38 deletions examples/espidf-arduino-blink/README.rst

This file was deleted.

27 changes: 27 additions & 0 deletions examples/espidf-arduino-wifiscan/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-espressif32/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-espressif32/examples/espidf-arduino-wifiscan

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Build specific environment
$ pio run -e esp32dev

# Upload firmware for the specific environment
$ pio run -e esp32dev --target upload

# Clean build files
$ pio run --target clean
```
Loading

0 comments on commit 1ebe574

Please sign in to comment.