Merge remote-tracking branch 'origin/master'

Author: sebimoe

Makefile.toml

@@ -40,9 +40,8 @@ args = ["test", "--workspace", "--exclude", "iepass", "--exclude", "iepass-calib
 # Running
 [tasks.run]
 dependencies = ["build-assets"]
-cwd = "./iepass-emu"
 command = "cargo"
-args = ["run", "${@}"]
+args = ["run", "--package", "iepass-emu", "${@}"]
 
 [tasks.flash]
 dependencies = ["build-assets"]

README.md

@@ -24,12 +24,17 @@ IE Pass - The Console The Pass
 $ cargo make build
 ```
 
-### Run Tests:
+### Run Emulator:
 ```bash
-$ cargo make test
+$ cargo make run -- path/to/cart.p8
 ```
 
-### Build and flash:
+### Build and flash for ESP32-S3:
 ```bash
 $ cargo make flash
 ```
+
+### Run Tests:
+```bash
+$ cargo make test
+```

iepass/src/main.rs

@@ -165,9 +165,9 @@ async fn try_main(spawner: Spawner) -> Result<!> {
 
     let mut pico8 = P8rs::new_in(&PSRAM_ALLOCATOR)?;
 
-    info!("Loading hello.lua");
+    info!("Loading hello.p8");
 
-    pico8.load(include_bytes!("../../lua/hello.lua"))?;
+    pico8.load(include_bytes!("../../lua/hello.p8"))?;
 
     info!("Entering main loop.");