Updated crates

.github/workflows/clippy.yaml

@@ -29,4 +29,4 @@ jobs:
 
       - name: Check clippy
         run: |
-          cargo clippy
+          cargo clippy --workspace

.github/workflows/test.yaml

@@ -31,14 +31,14 @@ jobs:
 
       - name: Run tests with default features
         run: |
-          cargo test
+          cargo test --workspace
 
       - name: Run tests with all features
         run: |
-          cargo test #--features=std,fugit,femtos
+          cargo test --workspace #--features=std,fugit,femtos
 
       - name: Run test with no_std
         run: |
-          cargo test --no-default-features
+          cargo test --workspace --no-default-features
 
 

emulator/frontends/common/Cargo.toml

@@ -12,10 +12,10 @@ log = "0.4"
 femtos = "0.1"
 moa-core = { path = "../../core" }
 moa-host = { path = "../../libraries/host" }
-nix = { version = "0.25", optional = true }
+nix = { version = "0.28", optional = true, features = ["term", "fs"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-cpal = { version = "0.14", optional = true }
+cpal = { version = "0.15", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-cpal = { version = "0.14", optional = true, features = ["wasm-bindgen"] }
+cpal = { version = "0.15", optional = true, features = ["wasm-bindgen"] }

emulator/frontends/common/src/cpal.rs

@@ -50,9 +50,14 @@ impl CpalAudioOutput {
         };
 
         let stream = device
-            .build_output_stream(&config, data_callback, move |err| {
+            .build_output_stream(
-                log::error!("ERROR: {:?}", err);
+                &config,
-            })
+                data_callback,
+                move |err| {
+                    log::error!("ERROR: {:?}", err);
+                },
+                None,
+            )
             .unwrap();
 
         stream.play().unwrap();

emulator/frontends/console/Cargo.toml

@@ -7,7 +7,7 @@ default-run = "moa-computie"
 [dependencies]
 log = "0.4"
 clap = "^4"
-simple_logger = "^2"
+simple_logger = "^4"
 femtos = "0.1"
 
 moa-core = { path = "../../core" }

emulator/frontends/minifb/Cargo.toml

@@ -6,9 +6,9 @@ default-run = "moa-genesis"
 
 [dependencies]
 log = "0.4"
-minifb = "^0.19"
+minifb = "^0.25"
 clap = "^4"
-simple_logger = "^2"
+simple_logger = "^4"
 femtos = "0.1"
 
 moa-core = { path = "../../core" }

emulator/frontends/minifb/src/bin/moa-macintosh.rs

@@ -3,5 +3,5 @@ use moa_systems_macintosh::build_macintosh_512k;
 fn main() {
     let matches = moa_minifb::new("Macintosh 512k Emulator").get_matches();
 
-    moa_minifb::run(matches, |frontend| build_macintosh_512k(frontend));
+    moa_minifb::run(matches, build_macintosh_512k);
 }

emulator/frontends/minifb/src/lib.rs

@@ -320,20 +320,16 @@ impl MiniFrontend {
                 //println!("ran simulation for {:?}us in {:?}us (avg: {:?}us)", frame_time.as_micros(), sim_time, frame_time.as_micros() as f64 / sim_time as f64);
             }
 
-            if let Some(keys) = window.get_keys_pressed(minifb::KeyRepeat::No) {
+            for key in window.get_keys_pressed(minifb::KeyRepeat::No) {
-                for key in keys {
+                self.check_key(key, true);
-                    self.check_key(key, true);
 
-                    // Process special keys
+                // Process special keys
-                    if let Key::D = key {
+                if let Key::D = key {
-                        run_debugger = true;
+                    run_debugger = true;
-                    }
                 }
             }
-            if let Some(keys) = window.get_keys_released() {
+            for key in window.get_keys_released() {
-                for key in keys {
+                self.check_key(key, false);
-                    self.check_key(key, false);
-                }
             }
 
             if let Some(sender) = self.mouse.as_mut() {