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

Commitc2b3490

Browse files
Move from ~/sources to ~/projects
1 parentaf37bf2 commitc2b3490

File tree

9 files changed

+29
-47
lines changed

9 files changed

+29
-47
lines changed

‎.gitignore‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
1-
output/
2-
3-
notes.txt
4-
51
trash/
62

7-
appstore_backend/bundled_apps/
8-
9-
icons/
10-
11-
meeting_minutes/
12-
13-
notes/
14-
15-
apps_disabled/
16-
173
*.sh
184
conf.json*
195

@@ -23,5 +9,3 @@ internal_filesystem/SDLPointer_2
239
# config files etc:
2410
internal_filesystem/data
2511

26-
# private info
27-
draft_code/nostr_publish.py

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ cd ~/MicroPythonOS
6868
git clone https://github.com/MicroPythonOS/MicroPythonOS.git
6969
7070
git clone https://github.com/MicroPythonOS/freezeFS
71-
~/sources/MicroPythonOS/scripts/freezefs_mount_builtin.sh
7271
7372
git clone https://github.com/cnadler86/micropython-camera-API
74-
echo 'include("~/sources/lvgl_micropython/build/manifest.py")' >> micropython-camera-API/src/manifest.py
73+
echo 'include("~/MicroPythonOS/lvgl_micropython/build/manifest.py")' >> micropython-camera-API/src/manifest.py
7574
7675
git clone https://github.com/MicroPythonOS/lvgl_micropython
7776

‎c_mpos/micropython.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This must be passed as:
2-
# USER_C_MODULE=/home/user/sources/MicroPythonOS/c_mpos/micropython.cmake
2+
# USER_C_MODULE=/path/to/c_mpos/micropython.cmake
33
# ...to make.py when building for esp32 to ensure it gets compiled.
44

55
add_library(usermod_c_mposINTERFACE)

‎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/sources/freezeFS/','freezefs_mount_builtin.py')# Built-in apps
4+
freeze('/home/user/projects/MicroPythonOS/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/sources/freezeFS/','freezefs_mount_builtin.py')# Built-in apps
4+
freeze('/home/user/projects/MicroPythonOS/freezeFS/','freezefs_mount_builtin.py')# Built-in apps

‎scripts/build_lvgl_micropython.sh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ if [ "$buildtype" == "prod" ]; then
1717
./scripts/freezefs_mount_builtin.sh
1818
fi
1919

20-
pushd~/sources/lvgl_micropython
20+
pushd~/projects/MicroPythonOS/lvgl_micropython
2121

2222
manifest=""
2323

2424
if ["$target"=="esp32" ];then
2525
if ["$buildtype"=="prod" ];then
26-
manifest="FROZEN_MANIFEST=/home/user/sources/MicroPythonOS/manifest.py"
26+
manifest="FROZEN_MANIFEST=/home/user/projects/MicroPythonOS/MicroPythonOS/manifest.py"
2727
fi
2828
# Build for https://www.waveshare.com/wiki/ESP32-S3-Touch-LCD-2.
2929
# See https://github.com/lvgl-micropython/lvgl_micropython
@@ -38,13 +38,10 @@ if [ "$target" == "esp32" ]; then
3838
# CONFIG_FREERTOS_USE_TRACE_FACILITY=y
3939
# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
4040
# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
41-
#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/sources/micropython-camera-API/src/micropython.cmake USER_C_MODULE=/home/user/projects/MicroPythonOS/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE=/home/user/sources/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"
42-
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/sources/micropython-camera-API/src/micropython.cmake USER_C_MODULE=/home/user/projects/MicroPythonOS/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE=/home/user/sources/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"
43-
# ffmpeg failed because time_t conflict time.h /home/user/sources/lvgl_micropython/lib/esp-idf/components/mbedtls/mbedtls/include/mbedtls/platform_time.h
44-
#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/sources/micropython-camera-API/src/micropython.cmake USER_C_MODULE=/home/user/projects/MicroPythonOS/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE=/home/user/sources/MicroPythonOS/c_mpos/micropython.cmake USER_C_MODULE=/home/user/sources/MicroPythonOS/c_mpos/ffmpeg.cmake CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y "$manifest"
41+
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"
4542
elif ["$target"=="unix"-o"$target"=="macos" ];then
4643
if ["$buildtype"=="prod" ];then
47-
manifest="FROZEN_MANIFEST=/home/user/sources/MicroPythonOS/manifest_unix.py"
44+
manifest="FROZEN_MANIFEST=/home/user/projects/MicroPythonOS/manifest_unix.py"
4845
fi
4946
# build for desktop
5047
#python3 make.py "$target" DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"

‎scripts/flash_over_usb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fwfile="/home/user/sources/lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin"
1+
fwfile="/home/user/projects/MicroPythonOS/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

‎scripts/freezefs_mount_builtin.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pushd~/projects/MicroPythonOS/freezeFS
2-
python3 -m freezefs --target /builtin --on-import mount~/sources/MicroPythonOS/internal_filesystem/builtin freezefs_mount_builtin.py
2+
python3 -m freezefs --target /builtin --on-import mount~/projects/MicroPythonOS/MicroPythonOS/internal_filesystem/builtin freezefs_mount_builtin.py
33
popd

‎scripts/install.sh‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ if [ -z "$appname" ]; then
1111
sleep 2
1212
fi
1313

14+
mpremote=~/MicroPythonOS/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py
15+
1416
pushd internal_filesystem/
1517

1618
if [!-z"$appname" ];then
@@ -26,32 +28,32 @@ if [ ! -z "$appname" ]; then
2628
exit 1
2729
fi
2830
fi
29-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py mkdir"/apps"
30-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py mkdir"/builtin"
31-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py mkdir"/builtin/apps"
32-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r"$appdir" :/"$target"
31+
$mpremote mkdir"/apps"
32+
$mpremote mkdir"/builtin"
33+
$mpremote mkdir"/builtin/apps"
34+
$mpremote fs cp -r"$appdir" :/"$target"
3335
echo"start_app(\"/$appdir\")"
34-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py
36+
$mpremote
3537
popd
3638
exit
3739
fi
3840

3941

40-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp boot.py :/boot.py
41-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp main.py :/main.py
42+
$mpremote fs cp boot.py :/boot.py
43+
$mpremote fs cp main.py :/main.py
4244

43-
#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp main.py :/system/button.py
44-
#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp autorun.py :/autorun.py
45-
#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r system :/
45+
#$mpremote fs cp main.py :/system/button.py
46+
#$mpremote fs cp autorun.py :/autorun.py
47+
#$mpremote fs cp -r system :/
4648

47-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r apps :/
48-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -rbuiltin :/
49-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r lib :/
50-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r resources :/
49+
$mpremote fs cp -r apps :/
50+
$mpremote fs cp -rbuiltin :/
51+
$mpremote fs cp -r lib :/
52+
$mpremote fs cp -r resources :/
5153

52-
#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r data :/
53-
#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r data/images :/data/
54+
#$mpremote fs cp -r data :/
55+
#$mpremote fs cp -r data/images :/data/
5456

5557
popd
5658

57-
~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py reset
59+
$mpremote reset

0 commit comments

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