Merge branch 'master' into joamag/audio-ch4

.gitlab-ci.yml

@@ -117,6 +117,8 @@ deploy-cloudfare-prod:
     - cd frontends/web/dist
     - cp -rp ../static/* .
     - npm_config_yes=true npx wrangler pages publish . --project-name=boytacean --branch prod
+    - npm_config_yes=true npx wrangler pages publish . --project-name=boytacean --branch production
+    - npm_config_yes=true npx wrangler pages publish . --project-name=boytacean --branch main
   dependencies:
     - build-wasm
   only:

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-* Support for CGB flag parsing
+*
 
 ### Changed
 
@@ -17,7 +17,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+*
+
+## [0.7.3] - 2023-04-02
+
+### Added
+
+* Support for CGB flag parsing
+* Waveform plotting support
+
+### Fixed
+
 * Major JoyPad issue with Action/Select read in register
+* Small issue with channel 3 audio and DAC disable
 
 ## [0.7.2] - 2023-03-04
 

Cargo.toml

 [package]
 name = "boytacean"
 description = "A Game Boy emulator that is written in Rust."
-version = "0.7.2"
+version = "0.7.3"
 authors = ["João Magalhães <joamag@gmail.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/joamag/boytacean"

frontends/sdl/Cargo.toml

 [package]
 name = "boytacean-sdl"
-version = "0.7.2"
+version = "0.7.3"
 authors = ["João Magalhães <joamag@gmail.com>"]
 description = "An SDL frontend for Boytacen"
 license = "Apache-2.0"

frontends/sdl/src/main.rs

@@ -451,7 +451,7 @@ fn main() {
     // ROM file and starts running it
     let mut emulator = Emulator::new(game_boy);
     emulator.start(SCREEN_SCALE);
-    emulator.load_rom(Some("../../res/roms/pocket.gb"));
+    emulator.load_rom(Some("../../res/roms/demo/pocket.gb"));
     emulator.toggle_palette();
     emulator.run();
 }

frontends/web/package.json

 {
     "name": "boytacean-web",
-    "version": "0.7.2",
+    "version": "0.7.3",
     "description": "The web version of Boytacean",
     "repository": {
         "type": "git",
@@ -19,18 +19,18 @@
     "source": "index.ts",
     "devDependencies": {
         "@parcel/transformer-typescript-tsc": "^2.8.3",
-        "@types/react": "^18.0.28",
+        "@types/react": "^18.0.32",
         "@types/react-dom": "^18.0.11",
-        "@typescript-eslint/eslint-plugin": "^5.54.0",
-        "@typescript-eslint/parser": "^5.54.0",
-        "emukit": "^0.7.2",
-        "eslint": "^8.35.0",
-        "nodemon": "^2.0.21",
+        "@typescript-eslint/eslint-plugin": "^5.57.0",
+        "@typescript-eslint/parser": "^5.57.0",
+        "emukit": "^0.8.0",
+        "eslint": "^8.37.0",
+        "nodemon": "^2.0.22",
         "parcel": "^2.8.3",
-        "prettier": "^2.8.4",
+        "prettier": "^2.8.7",
         "process": "^0.11.10",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "typescript": "^4.9.5"
+        "typescript": "^5.0.3"
     }
 }

frontends/web/ts/gb.ts

@@ -79,7 +79,7 @@ const KEYS_NAME: Record<string, number> = {
     B: PadKey.B
 };
 
-const ROM_PATH = require("../../../res/roms/pocket.gb");
+const ROM_PATH = require("../../../res/roms/demo/pocket.gb");
 
 /**
  * Top level class that controls the emulator behaviour
@@ -606,6 +606,18 @@ export class GameboyEmulator extends EmulatorBase implements Emulator {
         };
     }
 
+    get audioOutput(): Record<string, number> {
+        const output = this.gameBoy?.audio_all_output();
+        if (!output) return {};
+        return {
+            master: output[0],
+            ch1: output[1],
+            ch2: output[2],
+            ch3: output[3],
+            ch4: 0
+        };
+    }
+
     get palette(): string | undefined {
         const paletteObj = PALETTES[this.paletteIndex];
         return paletteObj.name;

res/roms/_headers

-
-/*
-  X-Robots-Tag: all
-  Access-Control-Allow-Origin: *

res/roms/robots.txt

-User-agent: *
-Allow: /