diff --git a/cli/package.json b/cli/package.json index 876556becc..0d3385e796 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,37 +1,39 @@ { - "name": "devicescript-cli", - "version": "1.0.1", - "description": "DeviceScript command line tool", - "keywords": [ - "devicescript", - "jacdac", - "iot", - "embedded" - ], - "author": "Microsoft", - "bin": { - "devicescript": "./devicescript", - "devicescript-cli": "./devicescript", - "devsc": "./devicescript" - }, - "files": [ - "./devicescript", - "./built/devicescript-cli.cjs", - "buffer", - "README.md" - ], - "license": "MIT", - "devDependencies": { - "@types/commander": "^2.12.2", - "@types/debounce-promise": "^3.1.5", - "@types/fs-extra": "^9.0.13", - "@types/node": "^18.11.9" - }, - "dependencies": { - "commander": "^9.4.1", - "debounce-promise": "^3.1.2", - "devicescript-compiler": "*", - "faye-websocket": "^0.11.4", - "fs-extra": "^10.1.0" - } + "name": "devicescript-cli", + "version": "1.0.1", + "description": "DeviceScript command line tool", + "keywords": [ + "devicescript", + "jacdac", + "iot", + "embedded" + ], + "author": "Microsoft", + "bin": { + "devicescript": "./devicescript", + "devicescript-cli": "./devicescript", + "devsc": "./devicescript" + }, + "files": [ + "./devicescript", + "./built/devicescript-cli.cjs", + "buffer", + "README.md" + ], + "license": "MIT", + "devDependencies": { + "@types/commander": "^2.12.2", + "@types/debounce-promise": "^3.1.5", + "@types/fs-extra": "^9.0.13", + "@types/node": "^18.11.9" + }, + "dependencies": { + "devicescript-compiler": "*", + "devicescript-vm": "*", + "commander": "^9.4.1", + "debounce-promise": "^3.1.2", + "faye-websocket": "^0.11.4", + "fs-extra": "^10.1.0", + "websocket-polyfill": "^0.0.3" + } } diff --git a/compiler/src/compiler.ts b/compiler/src/compiler.ts index aa7f456fc4..e6940e30fb 100644 --- a/compiler/src/compiler.ts +++ b/compiler/src/compiler.ts @@ -73,8 +73,8 @@ export const JD_SERIAL_MAX_PAYLOAD_SIZE = 236 export const CMD_GET_REG = 0x1000 export const CMD_SET_REG = 0x2000 -export const DEVS_ASSEMBLY_FILE = "prog.jasm" -export const DEVS_BYTECODE_FILE = "prog.jacs" +export const DEVS_ASSEMBLY_FILE = "bytecode.dasm" +export const DEVS_BYTECODE_FILE = "bytecode.devs" class Cell { _index: number diff --git a/runtime/devicescript-vm/runner.js b/runtime/devicescript-vm/runner.js index b4cc8f926d..ca9238ee64 100644 --- a/runtime/devicescript-vm/runner.js +++ b/runtime/devicescript-vm/runner.js @@ -3,13 +3,13 @@ function mymain(m) { .then(() => { m.jacsSetDeviceId("1989f4eee0ebe206") m.jacsStart() - fetch("built/prog.jacs") + fetch("built/bytecode.dacs") .then(r => { if (r.status == 200) r.arrayBuffer() .then(v => m.jacsDeploy(new Uint8Array(v))) else - console.log("you can copy or symlink built/prog.jacs to devicescript-vm/built/prog.jacs to pre-load it here") + console.log("you can copy or symlink built/bytecode.dacs to devicescript-vm/built/bytecode.dacs to pre-load it here") }) }, err => { console.log("failed to connect to devtools; please run 'jacdac devtools' in console")