Fix github workflows and build issues
This commit is contained in:
parent
323e0b2e76
commit
649b30cef2
2
.github/workflows/js-port-v9.yml
vendored
2
.github/workflows/js-port-v9.yml
vendored
@ -55,7 +55,7 @@ jobs:
|
|||||||
working-directory: ports/javascript
|
working-directory: ports/javascript
|
||||||
- name: Retrieve version
|
- name: Retrieve version
|
||||||
run: |
|
run: |
|
||||||
echo "::set-output name=VERSION_NAME::$(lib/lv_bindings/lvgl/scripts/find_version.sh)"
|
echo "::set-output name=VERSION_NAME::$(user_modules/lv_binding_micropython/lvgl/scripts/find_version.sh)"
|
||||||
id: version
|
id: version
|
||||||
- name: Deploy
|
- name: Deploy
|
||||||
uses: JamesIves/github-pages-deploy-action@4.1.3
|
uses: JamesIves/github-pages-deploy-action@4.1.3
|
||||||
|
|||||||
6
.github/workflows/rp2_port.yml
vendored
6
.github/workflows/rp2_port.yml
vendored
@ -17,13 +17,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
|
release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
|
||||||
- name: Initialize lv_bindings submodule
|
- name: Initialize lv_bindings submodule
|
||||||
run: git submodule update --init --recursive lib/lv_bindings
|
run: git submodule update --init --recursive user_modules/lv_binding_micropython
|
||||||
- name: Initialize Micropython submodules
|
- name: Initialize Micropython submodules
|
||||||
run: make -C ports/rp2 BOARD=${{ matrix.board }} USER_C_MODULES=../../lib/lv_bindings/bindings.cmake submodules
|
run: make -C ports/rp2 BOARD=${{ matrix.board }} USER_C_MODULES=../../user_modules/lv_binding_micropython/bindings.cmake submodules
|
||||||
- name: Build mpy-cross
|
- name: Build mpy-cross
|
||||||
run: make -j $(nproc) -C mpy-cross
|
run: make -j $(nproc) -C mpy-cross
|
||||||
- name: Build ${{ matrix.board }}
|
- name: Build ${{ matrix.board }}
|
||||||
run: make -j $(nproc) -C ports/rp2 BOARD=${{ matrix.board }} USER_C_MODULES=../../lib/lv_bindings/bindings.cmake
|
run: make -j $(nproc) -C ports/rp2 BOARD=${{ matrix.board }} USER_C_MODULES=../../user_modules/lv_binding_micropython/bindings.cmake
|
||||||
- uses: actions/upload-artifact@v2
|
- uses: actions/upload-artifact@v2
|
||||||
if: ${{ env.GITHUB_EVENT_NAME }} == 'push'
|
if: ${{ env.GITHUB_EVENT_NAME }} == 'push'
|
||||||
with:
|
with:
|
||||||
|
|||||||
2
.github/workflows/ruff.yml
vendored
2
.github/workflows/ruff.yml
vendored
@ -7,6 +7,8 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: Initialize lv_bindings submodule
|
||||||
|
run: git submodule update --init --recursive user_modules/lv_binding_micropython
|
||||||
# ruff version should be kept in sync with .pre-commit-config.yaml
|
# ruff version should be kept in sync with .pre-commit-config.yaml
|
||||||
- run: pip install --user ruff==0.1.3
|
- run: pip install --user ruff==0.1.3
|
||||||
- run: ruff check --output-format=github .
|
- run: ruff check --output-format=github .
|
||||||
|
|||||||
4
.github/workflows/unix_port.yml
vendored
4
.github/workflows/unix_port.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
|||||||
sudo apt-get update -y -qq
|
sudo apt-get update -y -qq
|
||||||
sudo apt-get install libsdl2-dev parallel libfreetype-dev librlottie-dev libavformat-dev libavcodec-dev libswscale-dev libavutil-dev
|
sudo apt-get install libsdl2-dev parallel libfreetype-dev librlottie-dev libavformat-dev libavcodec-dev libswscale-dev libavutil-dev
|
||||||
- name: Initialize lv_bindings submodule
|
- name: Initialize lv_bindings submodule
|
||||||
run: git submodule update --init --recursive lib/lv_bindings
|
run: git submodule update --init --recursive user_modules/lv_binding_micropython
|
||||||
- name: Update submodules
|
- name: Update submodules
|
||||||
run: make -C ports/unix DEBUG=1 submodules
|
run: make -C ports/unix DEBUG=1 submodules
|
||||||
- name: Build mpy-cross
|
- name: Build mpy-cross
|
||||||
@ -27,5 +27,5 @@ jobs:
|
|||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: |
|
run: |
|
||||||
export XDG_RUNTIME_DIR=/tmp
|
export XDG_RUNTIME_DIR=/tmp
|
||||||
lib/lv_bindings/tests/run.sh
|
user_modules/lv_binding_micropython/tests/run.sh
|
||||||
|
|
||||||
|
|||||||
@ -83,7 +83,7 @@ make -C mpy-cross
|
|||||||
make -C ports/esp32 LV_CFLAGS="-DLV_COLOR_DEPTH=16" BOARD=GENERIC_SPIRAM deploy
|
make -C ports/esp32 LV_CFLAGS="-DLV_COLOR_DEPTH=16" BOARD=GENERIC_SPIRAM deploy
|
||||||
```
|
```
|
||||||
|
|
||||||
Explanation about the paramters:
|
Explanation about the parameters:
|
||||||
- `LV_CFLAGS` are used to override color depth, for ILI9341 compatibility.
|
- `LV_CFLAGS` are used to override color depth, for ILI9341 compatibility.
|
||||||
- `LV_COLOR_DEPTH=16` is needed if you plan to use the ILI9341 driver.
|
- `LV_COLOR_DEPTH=16` is needed if you plan to use the ILI9341 driver.
|
||||||
- `BOARD` - I use WROVER board with SPIRAM. You can choose other boards from `ports/esp32/boards/` directory.
|
- `BOARD` - I use WROVER board with SPIRAM. You can choose other boards from `ports/esp32/boards/` directory.
|
||||||
@ -148,7 +148,7 @@ import lvgl as lv
|
|||||||
from ili9341 import ili9341
|
from ili9341 import ili9341
|
||||||
disp = ili9341()
|
disp = ili9341()
|
||||||
|
|
||||||
# Import XPT2046 driver and initalize it
|
# Import XPT2046 driver and initialize it
|
||||||
|
|
||||||
from xpt2046 import xpt2046
|
from xpt2046 import xpt2046
|
||||||
touch = xpt2046()
|
touch = xpt2046()
|
||||||
@ -160,7 +160,7 @@ By default, both ILI9341 and XPT2046 are initialized on the same SPI bus with th
|
|||||||
- XPT2046: `cs=25, spihost=esp.HSPI_HOST, mhz=5, max_cmds=16, cal_x0 = 3783, cal_y0 = 3948, cal_x1 = 242, cal_y1 = 423, transpose = True, samples = 3`
|
- XPT2046: `cs=25, spihost=esp.HSPI_HOST, mhz=5, max_cmds=16, cal_x0 = 3783, cal_y0 = 3948, cal_x1 = 242, cal_y1 = 423, transpose = True, samples = 3`
|
||||||
|
|
||||||
You can change any of these parameters on ili9341/xpt2046 constructor.
|
You can change any of these parameters on ili9341/xpt2046 constructor.
|
||||||
You can also initalize them on different SPI buses if you want, by providing miso/mosi/clk parameters. Set them to -1 to use existing (initialized) spihost bus.
|
You can also initialize them on different SPI buses if you want, by providing miso/mosi/clk parameters. Set them to -1 to use existing (initialized) spihost bus.
|
||||||
|
|
||||||
Now you can create the GUI itself:
|
Now you can create the GUI itself:
|
||||||
|
|
||||||
|
|||||||
@ -6,18 +6,14 @@
|
|||||||
"features": [
|
"features": [
|
||||||
"BLE",
|
"BLE",
|
||||||
"WiFi",
|
"WiFi",
|
||||||
"SPIRAM",
|
"External Flash",
|
||||||
"LCD",
|
"External RAM",
|
||||||
"LED",
|
|
||||||
"IMU",
|
|
||||||
"RTC",
|
|
||||||
"PMU",
|
|
||||||
"SDCard",
|
"SDCard",
|
||||||
"Button",
|
"IMU",
|
||||||
"Speaker",
|
"USB-C",
|
||||||
"Microphone",
|
"Battery Charging",
|
||||||
"Vibration Motor",
|
"Display",
|
||||||
"USB-C"
|
"Microphone"
|
||||||
],
|
],
|
||||||
"images": [
|
"images": [
|
||||||
"m5core2.jpg"
|
"m5core2.jpg"
|
||||||
|
|||||||
@ -74,7 +74,7 @@ class Power():
|
|||||||
|
|
||||||
# True turns on at 2V, False or 0 turns off. Alternatively, specify a voltage in range 1.8 - 3.3 volts.
|
# True turns on at 2V, False or 0 turns off. Alternatively, specify a voltage in range 1.8 - 3.3 volts.
|
||||||
def vibrator(self, state):
|
def vibrator(self, state):
|
||||||
if type(state) == bool and state:
|
if isinstance(state, bool) and state:
|
||||||
self.axp.write(VIBRATOR, 2.0)
|
self.axp.write(VIBRATOR, 2.0)
|
||||||
else:
|
else:
|
||||||
self.axp.write(VIBRATOR, state)
|
self.axp.write(VIBRATOR, state)
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit b9c5cb84221d52e07a51100987d68f47c34acd0b
|
Subproject commit 1c7258270d9b2fef5839c1327d762ec71c212b98
|
||||||
Loading…
x
Reference in New Issue
Block a user