Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd0ccac8

Browse files
Get rid of absolute paths
This closes, or shouldclose#2
1 parentc7e8677 commitd0ccac8

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

‎manifest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
freeze('internal_filesystem/','boot.py')# Hardware initialization
22
freeze('internal_filesystem/','main.py')# User Interface initialization
33
freeze('internal_filesystem/lib','')# Additional libraries
4-
freeze('/home/user/projects/MicroPythonOS/freezeFS/','freezefs_mount_builtin.py')# Built-in apps
4+
freeze('../freezeFS/','freezefs_mount_builtin.py')# Built-in apps

‎manifest_fri3d-2024.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
freeze('/tmp/','boot.py')# Hardware initialization - this file is copied from boot_fri3d-2024.py to /tmp by the build script to have it named boot.py
22
freeze('internal_filesystem/','main.py')# User Interface initialization
33
freeze('internal_filesystem/lib','')# Additional libraries
4-
freeze('/home/user/projects/MicroPythonOS/freezeFS/','freezefs_mount_builtin.py')# Built-in apps
4+
freeze('../freezeFS/','freezefs_mount_builtin.py')# Built-in apps

‎manifest_unix.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
freeze('internal_filesystem/','boot_unix.py')# Hardware initialization
22
freeze('internal_filesystem/','main.py')# User Interface initialization
33
freeze('internal_filesystem/lib','')# Additional libraries
4-
freeze('/home/user/projects/MicroPythonOS/freezeFS/','freezefs_mount_builtin.py')# Built-in apps
4+
freeze('../freezeFS/','freezefs_mount_builtin.py')# Built-in apps

‎scripts/build_lvgl_micropython.sh‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#!/bin/bash
2+
3+
mydir=$(readlink -f"$0")
4+
mydir=$(dirname"$mydir")
15

26
target="$1"
37
buildtype="$2"
@@ -20,15 +24,16 @@ if [ "$buildtype" == "prod" ]; then
2024
./scripts/freezefs_mount_builtin.sh
2125
fi
2226

23-
manifest=""
2427

28+
29+
manifest=""
2530
if ["$target"=="esp32" ];then
2631
if ["$buildtype"=="prod" ];then
2732
if ["$subtarget"=="fri3d-2024" ];then
2833
cp internal_filesystem/boot_fri3d-2024.py /tmp/boot.py# dirty hack to have it included as boot.py by the manifest
29-
manifest="FROZEN_MANIFEST=/home/user/projects/MicroPythonOS/MicroPythonOS/manifest_fri3d-2024.py"
34+
manifest="manifest_fri3d-2024.py"
3035
else
31-
manifest="FROZEN_MANIFEST=/home/user/projects/MicroPythonOS/MicroPythonOS/manifest.py"
36+
manifest="manifest.py"
3237
fi
3338
else
3439
echo"Note that you can also prevent the builtin filesystem from being mounted by umounting it and creating a builtin/ folder."
@@ -46,17 +51,21 @@ if [ "$target" == "esp32" ]; then
4651
# CONFIG_FREERTOS_USE_TRACE_FACILITY=y
4752
# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
4853
# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
54+
[!-z"$manifest" ]&& frozenmanifest="FROZEN_MANIFEST="$(readlink -f"$manifest")
55+
twoup=$(readlink -f"$mydir"/../..)# build process needs absolute paths
56+
oneup=$(readlink -f"$mydir"/..)# build process needs absolute paths
4957
pushd~/projects/MicroPythonOS/lvgl_micropython
50-
python3 make.py --ota --partition-size=4194304 --flash-size=16 esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=st7789 INDEV=cst816s USER_C_MODULE=/home/user/projects/MicroPythonOS/micropython-camera-API/src/micropython.cmake USER_C_MODULE=/home/user/projects/MicroPythonOS/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE=/home/user/projects/MicroPythonOS/MicroPythonOS/c_mpos/micropython.cmake CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y"$manifest"
58+
python3 make.py --ota --partition-size=4194304 --flash-size=16 esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=st7789 INDEV=cst816s USER_C_MODULE="$twoup"/micropython-camera-API/src/micropython.cmake USER_C_MODULE="$twoup"/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE="$oneup"/c_mpos/micropython.cmake CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y"$frozenmanifest"
5159
popd
5260
elif ["$target"=="unix"-o"$target"=="macos" ];then
5361
if ["$buildtype"=="prod" ];then
54-
manifest="FROZEN_MANIFEST=/home/user/projects/MicroPythonOS/MicroPythonOS/manifest_unix.py"
62+
manifest="manifest_unix.py"
5563
fi
5664
# build for desktop
5765
#python3 make.py "$target" DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
5866
# LV_CFLAGS are passed to USER_C_MODULES
5967
# STRIP= makes it so that debug symbols are kept
68+
[!-z"$manifest" ]&& frozenmanifest="FROZEN_MANIFEST="$(readlink -f"$manifest")
6069
pushd~/projects/MicroPythonOS/lvgl_micropython
6170
python3 make.py"$target" LV_CFLAGS="-g -O0 -ggdb -ljpeg" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard"$manifest"
6271
popd

‎scripts/bundleapps.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
output=/home/user/projects/MicroPythonOS/apps/
1+
output=../apps/
22
outputjson="$output"/app_index.json
33
output=$(readlink -f"$output")
44
outputjson=$(readlink -f"$outputjson")

‎scripts/flash_over_usb.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
fwfile="/home/user/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin"
1+
fwfile="../lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin"
22
ls -al$fwfile
33
echo"Add --erase-all if needed"
44
sleep 5
5+
# This needs python and the esptool
56
~/.espressif/python_env/idf5.2_py3.9_env/bin/python -m esptool --chip esp32s3 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_size 16MB --flash_freq 80m$1 0x0$fwfile
67

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp