8000 Merge pull request #18 from TinyCircuits/main-and-launcher · TinyCircuits/micropython@f67ecb4 · GitHub
[go: up one dir, main page]
Skip to content

Commit f67ecb4

Browse files
TinyCircuitsTinyCircuits
authored
Merge pull request micropython#18 from TinyCircuits/main-and-launcher
Reorganisation and partial rewrite of the system python files.
2 parents 2fed4fb + bae855c commit f67ecb4

File tree

15 files changed

+449
-439
lines changed

15 files changed

+449
-439
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ These instructions assume that you are cloning MicroPython from the TinyCircuits
1515
8. `cd` to engine file system to build and run MicroPython and the engine
1616
1. `cd`: `cd ../../TinyCircuits-Tiny-Game-Engine/filesystem`
1717
2. build: `(cd ../../ports/unix && make -j8 USER_C_MODULES=../../TinyCircuits-Tiny-Game-Engine DEBUG=1)`
18-
3. run: `../../ports/unix/build-standard/micropython launcher.py`
18+
3. run: `../micropython_loop ../../ports/unix/build-standard/micropython main.py`
1919

2020
Use `(cd ../../ports/unix && make clean)` to make clean if needed
2121

@@ -39,9 +39,9 @@ These instructions assume that you are cloning MicroPython from the official Mic
3939
1. Change line 1784 to `default="longlong"` (don't know where this tool is used and how to pass it a different value, will just set it for now)
4040
10. `cd` to filesystem root: `cd micropython/TinyCircuits-Tiny-Game-Engine/filesystem`
4141
11. Build MicroPython UNIX port: `(cd ../../ports/unix && make -j8 USER_C_MODULES=../../TinyCircuits-Tiny-Game-Engine DEBUG=1)`
42-
12. Run MicroPython port: `../../ports/unix/build-standard/micropython launcher.py`
42+
12. Run MicroPython port: `../micropython_loop ../../ports/unix/build-standard/micropython main.py`
4343

4444
Use `(cd ../../ports/unix && make clean)` to make clean if needed
4545

4646
# Updating MicroPython version
47-
Make sure to check that the copied structures in src/utility/engine_mp.h are still the same in the version of MicroPython you're updating to. Some structures are not exposed so they had to be copied to where the engine can use them.
47+
Make sure to check that the copied structures in src/utility/engine_mp.h are still the same in the version of MicroPython you're updating to. Some structures are not exposed so they had to be copied to where the engine can use them.

‎filesystem/Games/Saving/settings.ini renamed to ‎filesystem/Games/Saving/manifest.ini

File renamed without changes.

‎filesystem/Games/VoxelSpaceExample/settings.ini renamed to ‎filesystem/Games/VoxelSpaceExample/manifest.ini

File renamed without changes.

‎filesystem/Games/pool/settings.ini renamed to ‎filesystem/Games/pool/manifest.ini

File renamed without changes.

‎filesystem/last_crash.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎filesystem/launcher.py

Lines changed: 0 additions & 320 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0