Merge pull request #104 from bang-olufsen/development

June 2020 Update
bang-olufsen · Jul 7, 2020 · 9cbc466 · 9cbc466
2 parents e89cf36 + b8232ab
commit 9cbc466
Show file tree

Hide file tree

Showing 48 changed files with 4,028 additions and 2,508 deletions.
diff --git a/Beocreate2/beo-extensions/channels/menu.html b/Beocreate2/beo-extensions/channels/menu.html
@@ -85,7 +85,7 @@ <h2 class="show-when-daisy-chained">Master speaker</h2>
 					</div>
 				</div>
 
-				<div class="show-when-daisy-chained" id="channels-daisy-chained-container">
+				<div class="show-when-daisy-chained hidden" id="channels-daisy-chained-container">
 					<h2>Slave speaker</h2>
 					<p>Only speaker role can be updated to the slave speaker.</p>
 					<div class="channels-slave-channel-item">

diff --git a/Beocreate2/beo-extensions/daisy-chain/menu.html b/Beocreate2/beo-extensions/daisy-chain/menu.html
@@ -1,4 +1,4 @@
-<div class="menu-screen" id="daisy-chain" data-icon="speaker-pair.svg" data-context="sound/advanced" data-menu-class="advanced-adjustment" data-menu-value-class="daisy-chain-status-text" data-stylesheet="daisy-chain.css" data-menu-title="Chaining" data-built-in="1" data-enable-with="Beocreate 4-Channel Amplifier">
+<div class="menu-screen" id="daisy-chain" data-icon="speaker-pair.svg" data-context="sound/advanced" data-menu-class="advanced-adjustment" data-menu-value-class="daisy-chain-status-text" data-stylesheet="daisy-chain.css" data-menu-title="Chaining" data-built-in="1">
 
 	<header>
 		<div class="back-button master"></div>

diff --git a/Beocreate2/beo-extensions/daisy-chain/package.json b/Beocreate2/beo-extensions/daisy-chain/package.json
@@ -22,5 +22,8 @@
     "url": "https://github.com/bang-olufsen/create/issues"
   },
   "homepage": "https://github.com/bang-olufsen/create#readme",
+  "beocreate": {
+  	"enableWith": ["Beocreate 4-Channel Amplifier"]
+  },
   "dependencies": {}
 }
diff --git a/Beocreate2/beo-extensions/dsp-programs/index.js b/Beocreate2/beo-extensions/dsp-programs/index.js
@@ -705,20 +705,38 @@ var _ = require('underscore');
 	}
 
 	function amplifierMute(mute) {
-
-		if (mute) {
-			if (!settings.noGPIOMute) {
-				execSync("gpio mode 2 out");
-				execSync("gpio write 2 1");
-				if (debug) console.log("Muted amplifier through GPIO.");
-				beo.bus.emit("dsp", {header: "amplifierMuted"});
+		if (!settings.noGPIOMute) {
+			try {
+				pigpioRunning = !isNaN(execSync("pigs t", {encoding: "utf8"}).trim());
+			} catch (error) {
+				console.error("PiGPIO is not running.");
+				pigpioRunning = false;
 			}
-		} else {
-			if (!settings.noGPIOMute) {
-				execSync("gpio write 2 0");
-				execSync("gpio mode 2 in");
-				if (debug) console.log("Unmuted amplifier through GPIO.");
+			if (pigpioRunning) {
+				if (mute) {
+
+					try {
+						//execSync("gpio mode 2 out");
+						//execSync("gpio write 2 1");
+						execSync("pigs m 27 w w 27 1");
+						if (debug) console.log("Muted amplifier through GPIO.");
+						beo.bus.emit("dsp", {header: "amplifierMuted"});
+					} catch (error) {
+						console.error("Could not mute amplifier:", error);
+					}
+				} else {
+					try {
+						//execSync("gpio write 2 0");
+						//execSync("gpio mode 2 in");
+						execSync("pigs w 27 0 m 27 r");
+						if (debug) console.log("Unmuted amplifier through GPIO.");
+					} catch (error) {
+						console.error("Could not unmute amplifier:", error);
+					}
+					beo.bus.emit("dsp", {header: "amplifierUnmuted"});
+				}
 			}
+		} else if (!mute) {
 			beo.bus.emit("dsp", {header: "amplifierUnmuted"});
 		}
 	}

diff --git a/Beocreate2/beo-extensions/dsp-programs/package.json b/Beocreate2/beo-extensions/dsp-programs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beocreate/dsp-programs",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "DSP program manager for Beocreate sound systems",
   "main": "index.js",
   "scripts": {

diff --git a/Beocreate2/beo-extensions/equaliser/equaliser-client.js b/Beocreate2/beo-extensions/equaliser/equaliser-client.js
@@ -75,6 +75,12 @@ const mathPI = Math.PI;
 $(document).on("equaliser", function(event, data) {
 
 	if (data.header == "previews" && data.content.filterResponses) {
+		if (data.content.Fs) {
+			Fs = data.content.Fs;
+			eqPreviewGraphSpeaker.setOptions({Fs: Fs});
+			eqPreviewGraphSoundDesign.setOptions({Fs: Fs});
+			eqGraph.setOptions({Fs: Fs});
+		}
 		eqPreviewGraphSpeaker.store([0], {data: data.content.filterResponses.a.master, colour: 0});
 		eqPreviewGraphSpeaker.store([1], {data: data.content.filterResponses.b.master, colour: 1});
 		eqPreviewGraphSpeaker.store([2], {data: data.content.filterResponses.c.master, colour: 2});
@@ -86,7 +92,11 @@ $(document).on("equaliser", function(event, data) {
 
 	if (data.header == "settings") {
 
-		if (data.content.Fs) Fs = data.content.Fs;
+		if (data.content.Fs) {
+			Fs = data.content.Fs;
+			eqGraph.setOptions({Fs: Fs});
+		}
+
 
 		if (data.content.canControl) canControlEqualiser = data.content.canControl;
 

diff --git a/Beocreate2/beo-extensions/equaliser/index.js b/Beocreate2/beo-extensions/equaliser/index.js
@@ -118,7 +118,7 @@ var _ = beo.underscore;
 		}
 
 		if (event.header == "getPreviews") {
-			beo.sendToUI("equaliser", {header: "previews", content: {filterResponses: filterResponses}});
+			beo.sendToUI("equaliser", {header: "previews", content: {filterResponses: filterResponses, Fs: Fs}});
 		}
 
 		if (event.header == "getSettings") {
@@ -354,6 +354,7 @@ var _ = beo.underscore;
 				metadata = event.content.metadata;
 				if (metadata.sampleRate) {
 					Fs = parseInt(metadata.sampleRate.value[0]);
+					console.log("Sampling rate of "+Fs+" Hz specified in the DSP program.");
 					for (var c = 0; c < 4; c++) {
 						channel = "abcd".charAt(c);
 						applyAllFiltersFromSettings(channel, true);