Skip to content

Commit 498eb5b

Browse files
ThomasFarstrikeThomasFarstrike
committed
Add missing files due to exclude
1 parent 90c0325 commit 498eb5b

File tree

9 files changed

+126
-1
lines changed

9 files changed

+126
-1
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
trash/
22

3-
*.sh
43
conf.json*
54

65
# auto created when running on desktop:

‎scripts/build_all.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
builddir=../lvgl_micropython/build
2+
outdir=../build_outputs
3+
4+
buildfile="$builddir"/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
5+
6+
#./scripts/build_lvgl_micropython.sh esp32 dev fri3d-2024
7+
#cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_dev
8+
9+
./scripts/build_lvgl_micropython.sh esp32 prod fri3d-2024
10+
cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_prod
11+
12+
./scripts/build_lvgl_micropython.sh unix dev
13+
cp "$builddir"/lvgl_micropy_unix "$outdir"/MicroPythonOS_amd64_Linux
14+
15+
./scripts/build_lvgl_micropython.sh esp32 prod waveshare-esp32-s3-touch-lcd-2
16+
cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod
17+
18+
./scripts/build_lvgl_micropython.sh esp32 dev waveshare-esp32-s3-touch-lcd-2
19+
cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev
20+

‎scripts/capture_webcam.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mplayer tv:// -tv driver=v4l2:device=/dev/video0

‎scripts/core_dump_activate.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# you want this not stripped:
2+
# file ~/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_unix
3+
# ~/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_unix: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=f5c2fd31fd06ac76f9ba4eb031b383dfbc3a1b3c, for GNU/Linux 3.2.0, with debug_info, not stripped
4+
#
5+
# To get that, run it with STRIP= and maybe also that LV_CFLAGS:
6+
# python3 make.py "$target" LV_CFLAGS="-g -O0 -ggdb" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
7+
8+
ulimit -c unlimited
9+
sudo sysctl -w kernel.core_pattern=/tmp/core.%p

‎scripts/grayscale.raw_to_png.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
convert -size 240x240 -depth 8 gray:grayscale.raw grayscale.png

‎scripts/release_to_install.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
newversion="$1"
2+
3+
if [ -z "$newversion" ]; then
4+
echo "$0 newversion"
5+
exit 1
6+
fi
7+
8+
cd ~/projects/MicroPythonOS/install
9+
cp ~/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin firmware_images/Waveshare/ESP32-S3-Touch-LCD-2/Waveshare_ESP32-S3-Touch-LCD-2_$newversion.bin
10+
echo "Now update manifests/Waveshare/ESP32-S3-Touch-LCD-2/Waveshare_ESP32-S3-Touch-LCD-2.json and push it."
11+
12+
13+
14+

‎scripts/release_to_updates.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
newversion="$1"
2+
3+
if [ -z "$newversion" ]; then
4+
echo "$0 newversion"
5+
exit 1
6+
fi
7+
8+
pushd ~/projects/MicroPythonOS/updates/
9+
cp ~/projects/MicroPythonOS/lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin releases/Waveshare/ESP32-S3-Touch-LCD-2/Waveshare_ESP32-S3-Touch-LCD-2_$newversion.bin
10+
echo "Now update osupdate.json and push it."
11+
popd
12+
13+
14+
15+

‎scripts/run_desktop.sh‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
script="$1"
2+
if [ -f "$script" ]; then
3+
script=$(readlink -f "$script")
4+
fi
5+
6+
echo "Usage:"
7+
echo "$0 # with no arguments just starts it up normally"
8+
echo "$0 scriptfile.py # doesn't initialize anything, just runs scriptfile.py directly"
9+
echo "$0 appname # starts the app by appname, for example: com.example.helloworld"
10+
11+
#export SDL_WINDOW_FULLSCREEN=true
12+
13+
#export HEAPSIZE=8M # 9MB is not enough for slides, 10MB is okay for 5, 16 for 10, 64 for 100s
14+
#export HEAPSIZE=9M # 9MB is not enough for slides, 10MB is okay for 5, 16 for 10, 64 for 100s
15+
#export HEAPSIZE=10M # 9MB is not enough for slides, 10MB is okay for 5, 16 for 10, 64 for 100s
16+
#export HEAPSIZE=11M # 9MB is not enough for slides, 10MB is okay for 5, 16 for 10, 64 for 100s
17+
#export HEAPSIZE=12M # 9MB is not enough for slides, 10MB is okay for 5, 16 for 10, 64 for 100s
18+
#export HEAPSIZE=13M # 9MB is not enough for slides, 10MB is okay for 5, 16 for 10, 64 for 100s
19+
#export HEAPSIZE=14M # 9MB is not enough for slides, 10MB is okay for 5, 16 for 10, 64 for 100s
20+
#export HEAPSIZE=15M # 9MB is not enough for slides, 10MB is okay for 5, 15 ok for all
21+
22+
# 15 works infinite with 8 images
23+
# 12 seems to work fine with all images now, doing only gc.collect()
24+
# 10-11 works infinite with 7 images but as soon as I add the next one (big PNG slide 2) it hangs memory alloc
25+
26+
# Makes semse because the error is:
27+
# MemoryError: memory allocation failed, allocating 2518043 bytes
28+
# So every new slide needs 2.5MB extra RAM!
29+
30+
# Fixed by adding lv.image.cache_drop(None) # This helps a lot!
31+
32+
# Now it works with 10M with infinite slides!
33+
34+
# Now not anymore... let's try increasing it.
35+
#export HEAPSIZE=20M # this is fine for 1024x576
36+
#export HEAPSIZE=15M # fine too
37+
38+
export HEAPSIZE=32M # for 1280x720 images in the image viewer
39+
export HEAPSIZE=128M # for 1280x720 images in the image viewer
40+
41+
pushd internal_filesystem/
42+
if [ -f "$script" ]; then
43+
/home/user/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_unix -v -i "$script"
44+
elif [ ! -z "$script" ]; then # it's an app name
45+
scriptdir="apps/$script"
46+
if [ ! -d "$scriptdir" ]; then
47+
scriptdir="builtin/apps/$script"
48+
fi
49+
if [ ! -d "$scriptdir" ]; then
50+
echo "ERROR: no app found by the name '$script'"
51+
exit 1
52+
fi
53+
echo "Running app from $scriptdir"
54+
/home/user/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_unix -X heapsize=$HEAPSIZE -v -i -c "$(cat boot_unix.py main.py) ; import mpos.apps; mpos.apps.start_app('$scriptdir')"
55+
else
56+
/home/user/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_unix -X heapsize=$HEAPSIZE -v -i -c "$(cat boot_unix.py main.py)"
57+
fi
58+
59+
60+
popd

‎scripts/start_presentation.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
~/bin/set_1280x720.sh
2+
export SDL_WINDOW_FULLSCREEN=true
3+
4+
./scripts/run_desktop.sh
5+
6+

0 commit comments

Comments
 (0)