Skip to content

Commit 39fd811

Browse files
merge into v4.4 release branch
1 parent d4a770a commit 39fd811

File tree

15 files changed

+19857
-45
lines changed

15 files changed

+19857
-45
lines changed

CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# CMakeLists in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5+
set(ENV{BLUEPAD32_ARDUINO} TRUE)
6+
57
set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
68
set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
79

@@ -11,28 +13,28 @@ project(arduino-lib-builder)
1113
idf_build_get_property(elf EXECUTABLE GENERATOR_EXPRESSION)
1214

1315
add_custom_command(
14-
OUTPUT "idf_libs"
16+
OUTPUT "idf_libs"
1517
COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}" "${CONFIG_IDF_TARGET_ARCH_XTENSA}"
16-
DEPENDS ${elf}
17-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
18+
DEPENDS ${elf}
19+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
1820
VERBATIM
1921
)
2022
add_custom_target(idf-libs DEPENDS "idf_libs")
2123

2224
add_custom_command(
23-
OUTPUT "copy_bootloader"
25+
OUTPUT "copy_bootloader"
2426
COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-bootloader.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_LIB_BUILDER_FLASHFREQ}"
25-
DEPENDS bootloader
26-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
27+
DEPENDS bootloader
28+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
2729
VERBATIM
2830
)
2931
add_custom_target(copy-bootloader DEPENDS "copy_bootloader")
3032

3133
add_custom_command(
32-
OUTPUT "mem_variant"
34+
OUTPUT "mem_variant"
3335
COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-mem-variant.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}"
3436
DEPENDS ${elf}
35-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
37+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
3638
VERBATIM
3739
)
3840
add_custom_target(mem-variant DEPENDS "mem_variant")

README.md

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder)
1+
# ESP32 Arduino Lib Builder [![ESP32 Arduino Libs CI](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml)
22

33
This repository contains the scripts that produce the libraries included with esp32-arduino.
44

@@ -11,4 +11,48 @@ sudo pip install --upgrade pip
1111
git clone https://github.com/espressif/esp32-arduino-lib-builder
1212
cd esp32-arduino-lib-builder
1313
./build.sh
14+
15+
### Build for Bluepad32
16+
17+
Copy Bluepad32 componetns.
18+
19+
```sh
20+
cd components
21+
cp -r ~/esp-idf-arduino-bluepad32-template/components/* .
22+
```
23+
24+
Build it
25+
26+
```sh
27+
# All targets. esp32-s2 already removed from the supported boards
28+
./build.sh -s
29+
```
30+
31+
Update:
32+
33+
```sh
34+
# Already patched to copy to ~/Arduino/hardware/retro.moe/esp32-bluepad32
35+
. ./tools/copy-to-arduino.sh
36+
```
37+
38+
#### When ESP32 releases a new version
39+
40+
1. Download the .zip
41+
2. Unzip it in ~/Arduino/hardware/retro.moe/...
42+
3. rename it to esp32-bluepad32
43+
4. create `package` folder: `mkdir esp32-bluepad32/package`
44+
45+
And repeat previous steps.
46+
47+
### Release
48+
49+
1. Copy `bluepad32_files/boards.txt` and `bluepad32_files/platform.txt` to `~/Arduino/hardware/retro.moe/esp32-bluepad32`
50+
2. Copy `bluepad32_files/libraries/` to `~/Arduino/hardware/retro.moe/esp32-bluepad32/libraries/`
51+
3. Upload .zip to https://github.com/ricardoquesada/esp32-arduino-lib-builder
52+
4. Update `bluepad32_files/package_esp32_bluepad32_index.json` accordingly
53+
54+
55+
```sh
56+
cp bluepad32_files/boards.txt bluepad32_files/platform.txt ~/Arduino/hardware/retro.moe/esp32-bluepad32
57+
cp -r bluepad32_files/libraries/* ~/Arduino/hardware/retro.moe/esp32-bluepad32/libraries/
1458
```

0 commit comments

Comments
 (0)