diff --git a/EspruinoTools b/EspruinoTools index 9a0b84bb..54a11ce1 160000 --- a/EspruinoTools +++ b/EspruinoTools @@ -1 +1 @@ -Subproject commit 9a0b84bbe92f44168ffa51a66e97ec48952c622b +Subproject commit 54a11ce1ed3326d9b07d2f9ee22b78e049d50c75 diff --git a/extras/create_espruinotools_js.sh b/extras/create_espruinotools_js.sh index e975562d..f9d330a5 100755 --- a/extras/create_espruinotools_js.sh +++ b/extras/create_espruinotools_js.sh @@ -47,7 +47,7 @@ cat EspruinoTools/core/serial.js >> espruinotools.js cat EspruinoTools/core/codeWriter.js >> espruinotools.js cat EspruinoTools/core/modules.js >> espruinotools.js cat EspruinoTools/core/env.js >> espruinotools.js -#cat EspruinoTools/plugins/compiler.js >> espruinotools.js +cat EspruinoTools/plugins/compiler.js >> espruinotools.js cat EspruinoTools/plugins/assembler.js >> espruinotools.js cat EspruinoTools/plugins/getGitHub.js >> espruinotools.js #cat EspruinoTools/libs/utf8.js >> espruinotools.js @@ -71,6 +71,8 @@ Espruino.transform = function(code, options) { var d = Espruino.Core.Env.getData(); d.MODULES = options.builtinModules; } + if (options.boardData) + Object.assign(Espruino.Core.Env.getBoardData(), options.boardData); Espruino.callProcessor("transformForEspruino", code, resolve); });