Move from ~/sources to ~/projects

.gitignore

@@ -1,19 +1,5 @@
-output/
-
-notes.txt
-
 trash/
 
-appstore_backend/bundled_apps/
-
-icons/
-
-meeting_minutes/
-
-notes/
-
-apps_disabled/
-
 *.sh
 conf.json*
 
@@ -23,5 +9,3 @@ internal_filesystem/SDLPointer_2
 # config files etc:
 internal_filesystem/data
 
-# private info
-draft_code/nostr_publish.py

README.md

@@ -68,10 +68,9 @@ cd ~/MicroPythonOS
 git clone https://github.com/MicroPythonOS/MicroPythonOS.git
 
 git clone https://github.com/MicroPythonOS/freezeFS
-~/sources/MicroPythonOS/scripts/freezefs_mount_builtin.sh
 
 git clone https://github.com/cnadler86/micropython-camera-API
-echo 'include("~/sources/lvgl_micropython/build/manifest.py")' >> micropython-camera-API/src/manifest.py
+echo 'include("~/MicroPythonOS/lvgl_micropython/build/manifest.py")' >> micropython-camera-API/src/manifest.py
 
 git clone https://github.com/MicroPythonOS/lvgl_micropython
 

c_mpos/micropython.cmake

@@ -1,5 +1,5 @@
 # This must be passed as:
-# USER_C_MODULE=/home/user/sources/MicroPythonOS/c_mpos/micropython.cmake
+# USER_C_MODULE=/path/to/c_mpos/micropython.cmake
 # ...to make.py when building for esp32 to ensure it gets compiled.
 
 add_library(usermod_c_mpos INTERFACE)

manifest.py

@@ -1,4 +1,4 @@
 freeze('internal_filesystem/', 'boot.py') # Hardware initialization
 freeze('internal_filesystem/', 'main.py') # User Interface initialization
 freeze('internal_filesystem/lib', '') # Additional libraries
-freeze('/home/user/sources/freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps
+freeze('/home/user/projects/MicroPythonOS/freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps

manifest_unix.py

@@ -1,4 +1,4 @@
 freeze('internal_filesystem/', 'boot_unix.py') # Hardware initialization
 freeze('internal_filesystem/', 'main.py') # User Interface initialization
 freeze('internal_filesystem/lib', '') # Additional libraries
-freeze('/home/user/sources/freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps
+freeze('/home/user/projects/MicroPythonOS/freezeFS/', 'freezefs_mount_builtin.py') # Built-in apps

scripts/build_lvgl_micropython.sh

@@ -17,13 +17,13 @@ if [ "$buildtype" == "prod" ]; then
 	./scripts/freezefs_mount_builtin.sh
 fi
 
-pushd ~/sources/lvgl_micropython
+pushd ~/projects/MicroPythonOS/lvgl_micropython
 
 manifest=""
 
 if [ "$target" == "esp32" ]; then
 	if [ "$buildtype" == "prod" ]; then
-		manifest="FROZEN_MANIFEST=/home/user/sources/MicroPythonOS/manifest.py"
+		manifest="FROZEN_MANIFEST=/home/user/projects/MicroPythonOS/MicroPythonOS/manifest.py"
 	fi
 	# Build for https://www.waveshare.com/wiki/ESP32-S3-Touch-LCD-2.
 	# See https://github.com/lvgl-micropython/lvgl_micropython
@@ -38,13 +38,10 @@ if [ "$target" == "esp32" ]; then
 	# CONFIG_FREERTOS_USE_TRACE_FACILITY=y
 	# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
 	# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
-	#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"
-	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"
-	# ffmpeg failed because time_t conflict time.h /home/user/sources/lvgl_micropython/lib/esp-idf/components/mbedtls/mbedtls/include/mbedtls/platform_time.h
-	#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"
+	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"
 elif [ "$target" == "unix" -o "$target" == "macos" ]; then
 	if [ "$buildtype" == "prod" ]; then
-		manifest="FROZEN_MANIFEST=/home/user/sources/MicroPythonOS/manifest_unix.py"
+		manifest="FROZEN_MANIFEST=/home/user/projects/MicroPythonOS/manifest_unix.py"
 	fi
 	# build for desktop
 	#python3 make.py "$target"  DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"

scripts/flash_over_usb.sh

@@ -1,4 +1,4 @@
-fwfile="/home/user/sources/lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin"
+fwfile="/home/user/projects/MicroPythonOS/lvgl_micropython/build/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin"
 ls -al $fwfile
 echo "Add --erase-all if needed"
 sleep 5

scripts/freezefs_mount_builtin.sh

@@ -1,3 +1,3 @@
 pushd ~/projects/MicroPythonOS/freezeFS
-python3 -m freezefs --target /builtin --on-import mount ~/sources/MicroPythonOS/internal_filesystem/builtin freezefs_mount_builtin.py
+python3 -m freezefs --target /builtin --on-import mount ~/projects/MicroPythonOS/MicroPythonOS/internal_filesystem/builtin freezefs_mount_builtin.py
 popd

scripts/install.sh

@@ -11,6 +11,8 @@ if [ -z "$appname" ]; then
 	sleep 2
 fi
 
+mpremote=~/MicroPythonOS/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py
+
 pushd internal_filesystem/
 
 if [ ! -z "$appname" ]; then
@@ -26,32 +28,32 @@ if [ ! -z "$appname" ]; then
 			exit 1
 		fi
 	fi
-        ~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py mkdir "/apps"
-        ~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py mkdir "/builtin"
-        ~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py mkdir "/builtin/apps"
-	~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r "$appdir" :/"$target"
+        $mpremote mkdir "/apps"
+        $mpremote mkdir "/builtin"
+        $mpremote mkdir "/builtin/apps"
+	$mpremote fs cp -r "$appdir" :/"$target"
 	echo "start_app(\"/$appdir\")"
-	~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py
+	$mpremote
 	popd
 	exit
 fi
 
 
-~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp boot.py :/boot.py
-~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp main.py :/main.py
+$mpremote fs cp boot.py :/boot.py
+$mpremote fs cp main.py :/main.py
 
-#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp main.py :/system/button.py
-#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp autorun.py :/autorun.py
-#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r system :/
+#$mpremote fs cp main.py :/system/button.py
+#$mpremote fs cp autorun.py :/autorun.py
+#$mpremote fs cp -r system :/
 
-~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r apps :/
-~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r builtin :/
-~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r lib :/
-~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r resources :/
+$mpremote fs cp -r apps :/
+$mpremote fs cp -r builtin :/
+$mpremote fs cp -r lib :/
+$mpremote fs cp -r resources :/
 
-#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r data :/
-#~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py fs cp -r data/images :/data/
+#$mpremote fs cp -r data :/
+#$mpremote fs cp -r data/images :/data/
 
 popd
 
-~/sources/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py reset
+$mpremote reset