zephyr overlay

Author: mkellner

tools/mcconfig.js

@@ -1039,10 +1039,16 @@ export default class extends Tool {
 		this.config = config;
 	}
 	filterZephyrConfig(config) {
-		this.mergeProperties(config, this.zephyrConfig);
+		if (this.platform == "zephyr")
+			this.mergeProperties(config, this.zephyrConfig);
 	}
 	filterZephyrShields(config) {
-		this.mergeProperties(config, this.zephyrShields);
+		if (this.platform == "zephyr")
+			this.mergeProperties(config, this.zephyrShields);
+	}
+	filterZephyrOverlay(config) {
+		if (this.platform == "zephyr")
+			this.mergeProperties(config, this.zephyrOverlay);
 	}
 	filterCreation(creation) {
 		creation.chunk ??= {};
@@ -1273,6 +1279,7 @@ export default class extends Tool {
 		this.typescript = this.manifest.typescript;
 		this.filterZephyrConfig(this.manifest.zephyrConfig);
 		this.filterZephyrShields(this.manifest.zephyrShields);
+		this.filterZephyrOverlay(this.manifest.zephyrOverlay);
 
 		var name = this.environment.NAME
 		if (this.platform == "x-mac")
@@ -1423,8 +1430,14 @@ export default class extends Tool {
 		}
 
 		if (this.make) {
-			let cmd;
+			let cmd, overlay = "";
 			if (this.platform == "zephyr") {
+				if (this.zephyrOverlayFiles.length) {
+					overlay = "-DEXTRA_DTC_OVERLAY_FILE=\"";
+					for (var result of this.zephyrOverlayFiles)
+						overlay += result + " ";
+					overlay += "\"";
+				}
 				let command = `cd ${this.moddablePath} && `;
 				path = `${this.moddablePath}/build/devices/zephyr/app`;
 				if (this.buildTarget == "clean")
@@ -1440,9 +1453,9 @@ export default class extends Tool {
 
 					action = "build";
 					if (this.buildTarget == "build")
-						secondary = `${path} -d ${this.tmpPath}${this.slash}build -- -DEXTRA_CONF_FILE=${this.tmpPath}${this.slash}zephyr.conf -DMODDABLE_BUILD_DIR=${this.tmpPath}`
+						secondary = `${path} -d ${this.tmpPath}${this.slash}build -- -DEXTRA_CONF_FILE=${this.tmpPath}${this.slash}zephyr.conf -DMODDABLE_BUILD_DIR=${this.tmpPath} ${overlay}`
 					else if (this.buildTarget == "all" || undefined === this.buildTarget)  					/* all */
-						secondary = `${path} -d ${this.tmpPath}${this.slash}build -- -DEXTRA_CONF_FILE=${this.tmpPath}${this.slash}zephyr.conf -DMODDABLE_BUILD_DIR=${this.tmpPath} && west -z ${this.environment.ZEPHYR_BASE} flash -d ${this.tmpPath}${this.slash}build && serial2xsbug ${this.environment.UPLOAD_PORT} ${this.environment.DEBUGGER_SPEED} 8N1`;
+						secondary = `${path} -d ${this.tmpPath}${this.slash}build -- -DEXTRA_CONF_FILE=${this.tmpPath}${this.slash}zephyr.conf -DMODDABLE_BUILD_DIR=${this.tmpPath} ${overlay} && west -z ${this.environment.ZEPHYR_BASE} flash -d ${this.tmpPath}${this.slash}build && serial2xsbug ${this.environment.UPLOAD_PORT} ${this.environment.DEBUGGER_SPEED} 8N1`;
 					else
 						this.error("unknown target");
 

tools/mcmanifest.js

@@ -2512,6 +2512,18 @@ export class Tool extends TOOL {
 	mergeManifest(all, manifest) {
 		var currentDirectory = this.currentDirectory;
 		this.currentDirectory = manifest.directory;
+
+		if (this.platform == "zephyr") {
+			var len = manifest.zephyrOverlay?.length;
+			for (var i = 0; i < len; i++) {
+				var path = manifest.zephyrOverlay[i];
+				if (path[0] == ".") {
+					path = this.resolvePath(manifest.directory + this.slash + path);
+					manifest.zephyrOverlay[i] = path;
+				}
+			}
+		}
+
 		this.mergePlatform(all, manifest);
 
 		if ("platforms" in manifest) {
@@ -2626,6 +2638,7 @@ export class Tool extends TOOL {
 		this.mergeProperties(all.run, platform.run);
 		this.mergeProperties(all.zephyrConfig, platform.zephyrConfig);
 		this.mergeProperties(all.zephyrShields, platform.zephyrShields);
+		this.mergeProperties(all.zephyrOverlay, platform.zephyrOverlay);
 		if (platform.typescript) {
 			let tsconfig = platform.typescript.tsconfig;
 			if (tsconfig) {
@@ -2815,6 +2828,7 @@ export class Tool extends TOOL {
 			typescript: {compiler: "tsc", tsconfig: {compilerOptions: {}}},
 			zephyrConfig:{},
 			zephyrShields:{},
+			zephyrOverlay:{},
 		};
 		this.manifests.forEach(manifest => this.mergeManifest(this.manifest, manifest));
 
@@ -2885,6 +2899,7 @@ export class Tool extends TOOL {
 		this.stringFiles.already = {};
 		this.bleServicesFiles = [];
 		this.bleServicesFiles.already = {};
+		this.zephyrOverlayFiles = [];
 		this.pioFiles = [];
 		this.pioFiles.already = {};
 
@@ -2898,7 +2913,13 @@ export class Tool extends TOOL {
 		rule.process(this.manifest.resources);
 		var rule = new BLERule(this);
 		rule.process(this.manifest.ble);
-		
+
+		if (this.platform == "zephyr") {
+			for (var result in this.manifest.zephyrOverlay) {
+				this.zephyrOverlayFiles.push(this.manifest.zephyrOverlay[result]);
+			}
+		}
+
 		if (this.signature == null) {
 			if (!this.environment.NAMESPACE)
 				this.environment.NAMESPACE = "moddable.tech"