From 63d814c2c5d6a38664a37a15ad94dcfff1db8721 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 17 Apr 2022 08:18:49 -0700 Subject: [PATCH 01/19] Initial files for MakeCode project --- jacdac/.github/workflows/cfg-check.yml | 37 ++++++++++++++++++++++++++ jacdac/.github/workflows/makecode.yml | 29 ++++++++++++++++++++ jacdac/.gitignore | 11 ++++++++ jacdac/.vscode/settings.json | 23 ++++++++++++++++ jacdac/.vscode/tasks.json | 30 +++++++++++++++++++++ jacdac/Gemfile | 2 ++ jacdac/Makefile | 10 +++++++ jacdac/README.md | 31 +++++++++++++++++++++ jacdac/_config.yml | 8 ++++++ jacdac/main.blocks | 0 jacdac/main.ts | 0 jacdac/pxt.json | 25 +++++++++++++++++ jacdac/test.ts | 1 + jacdac/tsconfig.json | 9 +++++++ 14 files changed, 216 insertions(+) create mode 100644 jacdac/.github/workflows/cfg-check.yml create mode 100644 jacdac/.github/workflows/makecode.yml create mode 100644 jacdac/.gitignore create mode 100644 jacdac/.vscode/settings.json create mode 100644 jacdac/.vscode/tasks.json create mode 100644 jacdac/Gemfile create mode 100644 jacdac/Makefile create mode 100644 jacdac/README.md create mode 100644 jacdac/_config.yml create mode 100644 jacdac/main.blocks create mode 100644 jacdac/main.ts create mode 100644 jacdac/pxt.json create mode 100644 jacdac/test.ts create mode 100644 jacdac/tsconfig.json diff --git a/jacdac/.github/workflows/cfg-check.yml b/jacdac/.github/workflows/cfg-check.yml new file mode 100644 index 0000000..a098f8b --- /dev/null +++ b/jacdac/.github/workflows/cfg-check.yml @@ -0,0 +1,37 @@ +name: Check pxt.json + +on: + push: + branches: + - 'master' + - 'main' + +jobs: + check-cfg: + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [14.x] + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: npm install + run: | + npm install -g pxt + pxt target microbit + - name: Checkout current state + run: | + git checkout -- . + git clean -fd + - name: Fix files listed in config if necessary + run: pxt checkpkgcfg + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3 + continue-on-error: true + with: + title: 'Removing missing files from pxt.json' + commit-message: 'Removing missing files from pxt.json' + delete-branch: true diff --git a/jacdac/.github/workflows/makecode.yml b/jacdac/.github/workflows/makecode.yml new file mode 100644 index 0000000..c046b20 --- /dev/null +++ b/jacdac/.github/workflows/makecode.yml @@ -0,0 +1,29 @@ +name: MakeCode + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.x] + + steps: + - uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: npm install + run: | + npm install -g pxt + pxt target microbit + - name: build + run: | + pxt install + pxt build --cloud + env: + CI: true diff --git a/jacdac/.gitignore b/jacdac/.gitignore new file mode 100644 index 0000000..d2196e7 --- /dev/null +++ b/jacdac/.gitignore @@ -0,0 +1,11 @@ +# MakeCode +built +node_modules +yotta_modules +yotta_targets +pxt_modules +_site +*.db +*.tgz +.header.json +.simstate.json diff --git a/jacdac/.vscode/settings.json b/jacdac/.vscode/settings.json new file mode 100644 index 0000000..f8106d4 --- /dev/null +++ b/jacdac/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "editor.formatOnType": true, + "files.autoSave": "afterDelay", + "files.watcherExclude": { + "**/.git/objects/**": true, + "**/built/**": true, + "**/node_modules/**": true, + "**/yotta_modules/**": true, + "**/yotta_targets": true, + "**/pxt_modules/**": true + }, + "files.associations": { + "*.blocks": "html", + "*.jres": "json" + }, + "search.exclude": { + "**/built": true, + "**/node_modules": true, + "**/yotta_modules": true, + "**/yotta_targets": true, + "**/pxt_modules": true + } +} \ No newline at end of file diff --git a/jacdac/.vscode/tasks.json b/jacdac/.vscode/tasks.json new file mode 100644 index 0000000..9ee2cf6 --- /dev/null +++ b/jacdac/.vscode/tasks.json @@ -0,0 +1,30 @@ + +// A task runner that calls the MakeCode (PXT) compiler +{ + "version": "2.0.0", + "tasks": [{ + "label": "pxt deploy", + "type": "shell", + "command": "pxt deploy --local", + "group": "build", + "problemMatcher": [ "$tsc" ] + }, { + "label": "pxt build", + "type": "shell", + "command": "pxt build --local", + "group": "build", + "problemMatcher": [ "$tsc" ] + }, { + "label": "pxt install", + "type": "shell", + "command": "pxt install", + "group": "build", + "problemMatcher": [ "$tsc" ] + }, { + "label": "pxt clean", + "type": "shell", + "command": "pxt clean", + "group": "test", + "problemMatcher": [ "$tsc" ] + }] +} diff --git a/jacdac/Gemfile b/jacdac/Gemfile new file mode 100644 index 0000000..91ceacd --- /dev/null +++ b/jacdac/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'github-pages', group: :jekyll_plugins \ No newline at end of file diff --git a/jacdac/Makefile b/jacdac/Makefile new file mode 100644 index 0000000..9068464 --- /dev/null +++ b/jacdac/Makefile @@ -0,0 +1,10 @@ +all: deploy + +build: + pxt build + +deploy: + pxt deploy + +test: + pxt test diff --git a/jacdac/README.md b/jacdac/README.md new file mode 100644 index 0000000..f4f44b3 --- /dev/null +++ b/jacdac/README.md @@ -0,0 +1,31 @@ + +> Open this page at [https://pelikhan.github.io/pxt-robotbit/](https://pelikhan.github.io/pxt-robotbit/) + +## Use as Extension + +This repository can be added as an **extension** in MakeCode. + +* open [https://makecode.microbit.org/](https://makecode.microbit.org/) +* click on **New Project** +* click on **Extensions** under the gearwheel menu +* search for **https://github.com/pelikhan/pxt-robotbit/jacdac** and import + +## Edit this project ![Build status badge](https://github.com/pelikhan/pxt-robotbit/jacdac/workflows/MakeCode/badge.svg) + +To edit this repository in MakeCode. + +* open [https://makecode.microbit.org/](https://makecode.microbit.org/) +* click on **Import** then click on **Import URL** +* paste **https://github.com/pelikhan/pxt-robotbit/jacdac** and click import + +## Blocks preview + +This image shows the blocks code from the last commit in master. +This image may take a few minutes to refresh. + +![A rendered view of the blocks](https://github.com/pelikhan/pxt-robotbit/jacdac/raw/master/.github/makecode/blocks.png) + +#### Metadata (used for search, rendering) + +* for PXT/microbit + diff --git a/jacdac/_config.yml b/jacdac/_config.yml new file mode 100644 index 0000000..f56a029 --- /dev/null +++ b/jacdac/_config.yml @@ -0,0 +1,8 @@ +makecode: + target: microbit + platform: microbit + home_url: https://makecode.microbit.org/ +theme: jekyll-theme-slate +include: + - assets + - README.md diff --git a/jacdac/main.blocks b/jacdac/main.blocks new file mode 100644 index 0000000..e69de29 diff --git a/jacdac/main.ts b/jacdac/main.ts new file mode 100644 index 0000000..e69de29 diff --git a/jacdac/pxt.json b/jacdac/pxt.json new file mode 100644 index 0000000..a54db4b --- /dev/null +++ b/jacdac/pxt.json @@ -0,0 +1,25 @@ +{ + "name": "robotbit-jacdac", + "dependencies": { + "core": "*", + "radio": "*", + "microphone": "*", + "pxt-robotbit": "github:pelikhan/pxt-robotbit" + }, + "files": [ + "main.blocks", + "main.ts", + "README.md" + ], + "testFiles": [ + "test.ts" + ], + "targetVersions": { + "target": "4.1.22", + "targetId": "microbit" + }, + "supportedTargets": [ + "microbit" + ], + "preferredEditor": "blocksprj" +} diff --git a/jacdac/test.ts b/jacdac/test.ts new file mode 100644 index 0000000..7bf240c --- /dev/null +++ b/jacdac/test.ts @@ -0,0 +1 @@ +// tests go here; this will not be compiled when this package is used as an extension. diff --git a/jacdac/tsconfig.json b/jacdac/tsconfig.json new file mode 100644 index 0000000..46f831b --- /dev/null +++ b/jacdac/tsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "target": "ES5", + "noImplicitAny": true, + "outDir": "built", + "rootDir": "." + }, + "exclude": ["pxt_modules/**/*test.ts"] +} From 189e786016d948cc260b0ceb4968a8b285e44b82 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 17 Apr 2022 08:30:00 -0700 Subject: [PATCH 02/19] added motor clients --- jacdac/main.ts | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ jacdac/pxt.json | 7 ++--- jacdac/test.ts | 22 +++++++++++++++- 3 files changed, 94 insertions(+), 4 deletions(-) diff --git a/jacdac/main.ts b/jacdac/main.ts index e69de29..790ad84 100644 --- a/jacdac/main.ts +++ b/jacdac/main.ts @@ -0,0 +1,69 @@ +//% deprecated +namespace robotbit { + +} + +namespace modules { + /** + * Motor 1A + */ + //% fixedInstance whenUsed block="robobit motor 1A" + export const robobitMotor1A = new MotorClient("robobit motor 1A?device=self") + /** + * Motor 1B + */ + //% fixedInstance whenUsed block="robobit motor 1B" + export const robobitMotor1B = new MotorClient("robobit motor 1B?device=self") + /** + * Motor 2A + */ + //% fixedInstance whenUsed block="robobit motor 2A" + export const robobitMotor2A = new MotorClient("robobit motor 2A?device=self") + /** + * Motor 2B + */ + //% fixedInstance whenUsed block="robobit motor 2B" + export const robobitMotor2B = new MotorClient("robobit motor 2B?device=self") +} + +namespace servers { + jacdac.productIdentifier = 0x3dffd752 + class MotorServer extends jacdac.Server { + motor: robotbit.Motors + speed: number + enabled: boolean + + constructor(motor: robotbit.Motors) { + super(jacdac.SRV_MOTOR) + this.motor = motor + this.enabled = false + + robotbit.MotorStop(this.motor) + } + + handlePacket(pkt: jacdac.JDPacket) { + this.handleRegValue(pkt, jacdac.MotorReg.Reversible, jacdac.MotorRegPack.Reversible, true) + this.speed = this.handleRegValue(pkt, jacdac.MotorReg.Duty, jacdac.MotorRegPack.Duty, this.speed) + this.enabled = this.handleRegBool(pkt, jacdac.MotorReg.Enabled, this.enabled) + + this.sync() + } + + sync() { + if (!this.enabled || this.speed == 0) + robotbit.MotorStop(this.motor) + else { + robotbit.MotorRun(this.motor, this.speed * 0xff) + } + } + } + function start() { + jacdac.startSelfServers(() => [ + new MotorServer(robotbit.Motors.M1A), + new MotorServer(robotbit.Motors.M1B), + new MotorServer(robotbit.Motors.M2A), + new MotorServer(robotbit.Motors.M2B), + ]) + } + start() +} \ No newline at end of file diff --git a/jacdac/pxt.json b/jacdac/pxt.json index a54db4b..49ffc4c 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -4,10 +4,11 @@ "core": "*", "radio": "*", "microphone": "*", - "pxt-robotbit": "github:pelikhan/pxt-robotbit" + "pxt-robotbit": "github:pelikhan/pxt-robotbit", + "jacdac": "github:microsoft/pxt-jacdac#v0.9.5", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.9.5" }, "files": [ - "main.blocks", "main.ts", "README.md" ], @@ -21,5 +22,5 @@ "supportedTargets": [ "microbit" ], - "preferredEditor": "blocksprj" + "preferredEditor": "tsprj" } diff --git a/jacdac/test.ts b/jacdac/test.ts index 7bf240c..699ffe4 100644 --- a/jacdac/test.ts +++ b/jacdac/test.ts @@ -1 +1,21 @@ -// tests go here; this will not be compiled when this package is used as an extension. +let speed = 0 +let dv = 5 +forever(() => { + modules.robobitMotor1A.setEnabled(true) + modules.robobitMotor1B.setEnabled(true) + modules.robobitMotor2A.setEnabled(true) + modules.robobitMotor2B.setEnabled(true) + + modules.robobitMotor1A.setDuty(speed) + modules.robobitMotor1B.setDuty(1 - speed) + modules.robobitMotor2A.setDuty(speed / 2) + modules.robobitMotor2B.setDuty((1 - speed) / 2) + + speed += dv + if (speed > 100) { + dv = -5 + } else if (speed < -100) { + dv = 5 + } + pause(250) +}) \ No newline at end of file From d9a353e78c43c6783930dfde88698c665e9641dc Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Sun, 17 Apr 2022 08:31:27 -0700 Subject: [PATCH 03/19] 0.3.9 --- jacdac/pxt.json | 1 + 1 file changed, 1 insertion(+) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 49ffc4c..f16fb82 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,5 +1,6 @@ { "name": "robotbit-jacdac", + "version": "0.3.9", "dependencies": { "core": "*", "radio": "*", From 2198e1e057d399e6b558597d40a73e02dbfdf077 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 18 Apr 2022 07:46:16 -0700 Subject: [PATCH 04/19] Update jacdac/pxt.json, jacdac/main.ts, jacdac/test.ts --- jacdac/main.ts | 86 +++++++++++++++++++++++++++++++++++++++++-------- jacdac/pxt.json | 4 ++- jacdac/test.ts | 22 ++++++++----- 3 files changed, 89 insertions(+), 23 deletions(-) diff --git a/jacdac/main.ts b/jacdac/main.ts index 790ad84..35b0041 100644 --- a/jacdac/main.ts +++ b/jacdac/main.ts @@ -7,23 +7,56 @@ namespace modules { /** * Motor 1A */ - //% fixedInstance whenUsed block="robobit motor 1A" - export const robobitMotor1A = new MotorClient("robobit motor 1A?device=self") + //% fixedInstance whenUsed block="robotbit motor 1A" + export const robotbitMotor1A = new MotorClient("robotbit motor 1A?device=self") /** * Motor 1B */ - //% fixedInstance whenUsed block="robobit motor 1B" - export const robobitMotor1B = new MotorClient("robobit motor 1B?device=self") + //% fixedInstance whenUsed block="robotbit motor 1B" + export const robotbitMotor1B = new MotorClient("robotbit motor 1B?device=self") /** * Motor 2A */ - //% fixedInstance whenUsed block="robobit motor 2A" - export const robobitMotor2A = new MotorClient("robobit motor 2A?device=self") + //% fixedInstance whenUsed block="robotbit motor 2A" + export const robotbitMotor2A = new MotorClient("robotbit motor 2A?device=self") /** * Motor 2B */ - //% fixedInstance whenUsed block="robobit motor 2B" - export const robobitMotor2B = new MotorClient("robobit motor 2B?device=self") + //% fixedInstance whenUsed block="robotbit motor 2B" + export const robotbitMotor2B = new MotorClient("robotbit motor 2B?device=self") + + /** + * Servo S1 + */ + export const robotbitServoS1 = new ServoClient("robotbit servo S1?device=self") + /** + * Servo S2 + */ + export const robotbitServoS2 = new ServoClient("robotbit servo S2?device=self") + /** + * Servo S3 + */ + export const robotbitServoS3 = new ServoClient("robotbit servo S3?device=self") + /** + * Servo S4 + */ + export const robotbitServoS4 = new ServoClient("robotbit servo S4?device=self") + /** + * Servo S5 + */ + export const robotbitServoS5 = new ServoClient("robotbit servo S5?device=self") + /** + * Servo S6 + */ + export const robotbitServoS6 = new ServoClient("robotbit servo S6?device=self") + /** + * Servo S7 + */ + export const robotbitServoS7 = new ServoClient("robotbit servo S7?device=self") + /** + * Servo S8 + */ + export const robotbitServoS8 = new ServoClient("robotbit servo S8?device=self") } namespace servers { @@ -33,8 +66,8 @@ namespace servers { speed: number enabled: boolean - constructor(motor: robotbit.Motors) { - super(jacdac.SRV_MOTOR) + constructor(motor: robotbit.Motors, instanceName: string) { + super(jacdac.SRV_MOTOR, { instanceName: instanceName }) this.motor = motor this.enabled = false @@ -57,12 +90,37 @@ namespace servers { } } } + class ServoServer extends jacdac.Server { + servo: robotbit.Servos + angle: number + constructor(servo: robotbit.Servos, instanceName: string) { + super(jacdac.SRV_SERVO, { instanceName: instanceName }) + this.servo = servo + this.angle = 0 + } + handlePacket(pkt: jacdac.JDPacket) { + this.angle = this.handleRegValue(pkt, jacdac.ServoReg.Angle, jacdac.ServoRegPack.Angle, this.angle) + this.handleRegValue(pkt, jacdac.ServoReg.CurrentAngle, jacdac.ServoRegPack.CurrentAngle, this.angle) + + robotbit.Servo(this.servo, this.angle) + } + } function start() { jacdac.startSelfServers(() => [ - new MotorServer(robotbit.Motors.M1A), - new MotorServer(robotbit.Motors.M1B), - new MotorServer(robotbit.Motors.M2A), - new MotorServer(robotbit.Motors.M2B), + // motors + new MotorServer(robotbit.Motors.M1A, "M1A"), + new MotorServer(robotbit.Motors.M1B, "M1B"), + new MotorServer(robotbit.Motors.M2A, "M2A"), + new MotorServer(robotbit.Motors.M2B, "M2B"), + // servos + new ServoServer(robotbit.Servos.S1, "S1"), + new ServoServer(robotbit.Servos.S2, "S2"), + new ServoServer(robotbit.Servos.S3, "S3"), + new ServoServer(robotbit.Servos.S4, "S4"), + new ServoServer(robotbit.Servos.S5, "S5"), + new ServoServer(robotbit.Servos.S6, "S6"), + new ServoServer(robotbit.Servos.S7, "S7"), + new ServoServer(robotbit.Servos.S8, "S8"), ]) } start() diff --git a/jacdac/pxt.json b/jacdac/pxt.json index f16fb82..9b08764 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -7,7 +7,9 @@ "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", "jacdac": "github:microsoft/pxt-jacdac#v0.9.5", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.9.5" + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.9.5", + "jacdac-led-display": "github:microsoft/pxt-jacdac/led-display#v0.9.5", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.9.5" }, "files": [ "main.ts", diff --git a/jacdac/test.ts b/jacdac/test.ts index 699ffe4..955da1a 100644 --- a/jacdac/test.ts +++ b/jacdac/test.ts @@ -1,15 +1,21 @@ let speed = 0 let dv = 5 forever(() => { - modules.robobitMotor1A.setEnabled(true) - modules.robobitMotor1B.setEnabled(true) - modules.robobitMotor2A.setEnabled(true) - modules.robobitMotor2B.setEnabled(true) + led.toggle(0, 0) + + modules.robotbitMotor1A.run(speed) + modules.robotbitMotor1B.run(100 - speed) + modules.robotbitMotor2A.run(speed / 2) + modules.robotbitMotor2B.run((100 - speed) / 2) - modules.robobitMotor1A.setDuty(speed) - modules.robobitMotor1B.setDuty(1 - speed) - modules.robobitMotor2A.setDuty(speed / 2) - modules.robobitMotor2B.setDuty((1 - speed) / 2) + modules.robotbitServoS1.setAngle(speed) + modules.robotbitServoS2.setAngle(speed) + modules.robotbitServoS3.setAngle(speed) + modules.robotbitServoS4.setAngle(speed) + modules.robotbitServoS5.setAngle(speed) + modules.robotbitServoS6.setAngle(speed) + modules.robotbitServoS7.setAngle(speed) + modules.robotbitServoS8.setAngle(speed) speed += dv if (speed > 100) { From 37e81011ce3153831949b4cfb75d12c95c5e7e11 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 25 Apr 2022 10:44:53 -0700 Subject: [PATCH 05/19] support for role queries --- jacdac/main.ts | 26 +++++++++++++------------- jacdac/pxt.json | 9 ++++----- jacdac/test.ts | 4 ++-- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/jacdac/main.ts b/jacdac/main.ts index 35b0041..3ef1022 100644 --- a/jacdac/main.ts +++ b/jacdac/main.ts @@ -8,55 +8,55 @@ namespace modules { * Motor 1A */ //% fixedInstance whenUsed block="robotbit motor 1A" - export const robotbitMotor1A = new MotorClient("robotbit motor 1A?device=self") + export const robotbitMotor1A = new MotorClient("robotbit motor 1A?dev=self&srvo=0") /** * Motor 1B */ //% fixedInstance whenUsed block="robotbit motor 1B" - export const robotbitMotor1B = new MotorClient("robotbit motor 1B?device=self") + export const robotbitMotor1B = new MotorClient("robotbit motor 1B?dev=self&srvo=1") /** * Motor 2A */ //% fixedInstance whenUsed block="robotbit motor 2A" - export const robotbitMotor2A = new MotorClient("robotbit motor 2A?device=self") + export const robotbitMotor2A = new MotorClient("robotbit motor 2A?dev=self&srvo=2") /** * Motor 2B */ //% fixedInstance whenUsed block="robotbit motor 2B" - export const robotbitMotor2B = new MotorClient("robotbit motor 2B?device=self") + export const robotbitMotor2B = new MotorClient("robotbit motor 2B?dev=self&srvo=3") /** * Servo S1 */ - export const robotbitServoS1 = new ServoClient("robotbit servo S1?device=self") + export const robotbitServoS1 = new ServoClient("robotbit servo S1?dev=self&srvo=0") /** * Servo S2 */ - export const robotbitServoS2 = new ServoClient("robotbit servo S2?device=self") + export const robotbitServoS2 = new ServoClient("robotbit servo S2?dev=self&srvo=1") /** * Servo S3 */ - export const robotbitServoS3 = new ServoClient("robotbit servo S3?device=self") + export const robotbitServoS3 = new ServoClient("robotbit servo S3?dev=self&srvo=2") /** * Servo S4 */ - export const robotbitServoS4 = new ServoClient("robotbit servo S4?device=self") + export const robotbitServoS4 = new ServoClient("robotbit servo S4?dev=self&srvo=3") /** * Servo S5 */ - export const robotbitServoS5 = new ServoClient("robotbit servo S5?device=self") + export const robotbitServoS5 = new ServoClient("robotbit servo S5?dev=self&srvo=4") /** * Servo S6 */ - export const robotbitServoS6 = new ServoClient("robotbit servo S6?device=self") + export const robotbitServoS6 = new ServoClient("robotbit servo S6?dev=self&srvo=5") /** * Servo S7 */ - export const robotbitServoS7 = new ServoClient("robotbit servo S7?device=self") + export const robotbitServoS7 = new ServoClient("robotbit servo S7?dev=self&srvo=6") /** * Servo S8 */ - export const robotbitServoS8 = new ServoClient("robotbit servo S8?device=self") + export const robotbitServoS8 = new ServoClient("robotbit servo S8?dev=self&srvo=7") } namespace servers { @@ -76,7 +76,7 @@ namespace servers { handlePacket(pkt: jacdac.JDPacket) { this.handleRegValue(pkt, jacdac.MotorReg.Reversible, jacdac.MotorRegPack.Reversible, true) - this.speed = this.handleRegValue(pkt, jacdac.MotorReg.Duty, jacdac.MotorRegPack.Duty, this.speed) + this.speed = this.handleRegValue(pkt, jacdac.MotorReg.Speed, jacdac.MotorRegPack.Speed, this.speed) this.enabled = this.handleRegBool(pkt, jacdac.MotorReg.Enabled, this.enabled) this.sync() diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 9b08764..edc3a44 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,10 +6,9 @@ "radio": "*", "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", - "jacdac": "github:microsoft/pxt-jacdac#v0.9.5", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.9.5", - "jacdac-led-display": "github:microsoft/pxt-jacdac/led-display#v0.9.5", - "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.9.5" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.2", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.2", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.2" }, "files": [ "main.ts", @@ -19,7 +18,7 @@ "test.ts" ], "targetVersions": { - "target": "4.1.22", + "target": "4.1.24", "targetId": "microbit" }, "supportedTargets": [ diff --git a/jacdac/test.ts b/jacdac/test.ts index 955da1a..fa7140a 100644 --- a/jacdac/test.ts +++ b/jacdac/test.ts @@ -4,9 +4,9 @@ forever(() => { led.toggle(0, 0) modules.robotbitMotor1A.run(speed) - modules.robotbitMotor1B.run(100 - speed) + modules.robotbitMotor1B.run(- speed) modules.robotbitMotor2A.run(speed / 2) - modules.robotbitMotor2B.run((100 - speed) / 2) + modules.robotbitMotor2B.run((- speed) / 2) modules.robotbitServoS1.setAngle(speed) modules.robotbitServoS2.setAngle(speed) From 610ed04ca2651e7e910ab09114b83e38d54322d5 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 25 Apr 2022 10:45:01 -0700 Subject: [PATCH 06/19] 0.3.10 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index edc3a44..f7b22af 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "robotbit-jacdac", - "version": "0.3.9", + "version": "0.3.10", "dependencies": { "core": "*", "radio": "*", From bcadca92ebc807dabff1ec07887684bf94283241 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 25 Apr 2022 11:50:51 -0700 Subject: [PATCH 07/19] update roles --- jacdac/pxt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index f7b22af..e3594ff 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "radio": "*", "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.2", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.2", - "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.2" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.3", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.3", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.3" }, "files": [ "main.ts", From 50c5d2a60a39cec59c8d69cfd8981efcb5e1fafd Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 25 Apr 2022 11:50:58 -0700 Subject: [PATCH 08/19] 0.3.11 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index e3594ff..d54f8e3 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "robotbit-jacdac", - "version": "0.3.10", + "version": "0.3.11", "dependencies": { "core": "*", "radio": "*", From a6bd7b90065ad05bbced05fccb0bac60fa6686a1 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:34:53 -0700 Subject: [PATCH 09/19] product id --- jacdac/main.ts | 1 + jacdac/pxt.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jacdac/main.ts b/jacdac/main.ts index 3ef1022..63ea01c 100644 --- a/jacdac/main.ts +++ b/jacdac/main.ts @@ -106,6 +106,7 @@ namespace servers { } } function start() { + jacdac.productIdentifier = 0x31ea8476 jacdac.startSelfServers(() => [ // motors new MotorServer(robotbit.Motors.M1A, "M1A"), diff --git a/jacdac/pxt.json b/jacdac/pxt.json index d54f8e3..f80b865 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "radio": "*", "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.3", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.3", - "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.3" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.5", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.5", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.5" }, "files": [ "main.ts", From faf3ed9614786b71f827d5690bb9df052f8372cd Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 28 Apr 2022 08:57:29 -0700 Subject: [PATCH 10/19] description --- jacdac/main.ts | 1 + jacdac/pxt.json | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jacdac/main.ts b/jacdac/main.ts index 63ea01c..9551727 100644 --- a/jacdac/main.ts +++ b/jacdac/main.ts @@ -107,6 +107,7 @@ namespace servers { } function start() { jacdac.productIdentifier = 0x31ea8476 + jacdac.deviceDescription = "Kittenbot Robo:bit" jacdac.startSelfServers(() => [ // motors new MotorServer(robotbit.Motors.M1A, "M1A"), diff --git a/jacdac/pxt.json b/jacdac/pxt.json index f80b865..e69d500 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "radio": "*", "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.5", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.5", - "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.5" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.14", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.14", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.14" }, "files": [ "main.ts", @@ -18,7 +18,7 @@ "test.ts" ], "targetVersions": { - "target": "4.1.24", + "target": "4.1.27", "targetId": "microbit" }, "supportedTargets": [ From 8be1c409f1df4e2feb1a88d27441fe9127f0f345 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 28 Apr 2022 08:57:34 -0700 Subject: [PATCH 11/19] 0.3.12 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index e69d500..59822b2 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "robotbit-jacdac", - "version": "0.3.11", + "version": "0.3.12", "dependencies": { "core": "*", "radio": "*", From ca7a9f35662d5a5cbbbfd3caf70920651283c1f7 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 4 May 2022 17:06:06 -0700 Subject: [PATCH 12/19] Update jacdac/pxt.json, jacdac/main.ts --- jacdac/main.ts | 4 ++-- jacdac/pxt.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jacdac/main.ts b/jacdac/main.ts index 9551727..2f1a891 100644 --- a/jacdac/main.ts +++ b/jacdac/main.ts @@ -28,7 +28,7 @@ namespace modules { /** * Servo S1 */ - export const robotbitServoS1 = new ServoClient("robotbit servo S1?dev=self&srvo=0") + export const robotbitServoS1 = new ServoClient("robotbit servo S1?dev=self&srvo=0&name=S1") /** * Servo S2 */ @@ -100,7 +100,7 @@ namespace servers { } handlePacket(pkt: jacdac.JDPacket) { this.angle = this.handleRegValue(pkt, jacdac.ServoReg.Angle, jacdac.ServoRegPack.Angle, this.angle) - this.handleRegValue(pkt, jacdac.ServoReg.CurrentAngle, jacdac.ServoRegPack.CurrentAngle, this.angle) + this.handleRegValue(pkt, jacdac.ServoReg.ActualAngle, jacdac.ServoRegPack.ActualAngle, this.angle) robotbit.Servo(this.servo, this.angle) } diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 59822b2..9a946d9 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "radio": "*", "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.14", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.14", - "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.14" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.23", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.23", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.23" }, "files": [ "main.ts", @@ -18,7 +18,7 @@ "test.ts" ], "targetVersions": { - "target": "4.1.27", + "target": "4.1.30", "targetId": "microbit" }, "supportedTargets": [ From 5bdbdc2e334ed86e21990af17e91bc3be4fd6eda Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 4 May 2022 17:07:27 -0700 Subject: [PATCH 13/19] 0.3.13 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 9a946d9..c98e1e2 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "robotbit-jacdac", - "version": "0.3.12", + "version": "0.3.13", "dependencies": { "core": "*", "radio": "*", From 28e77e97d1da1a1076c16af683c7d2286e875c0e Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 4 May 2022 21:24:57 -0700 Subject: [PATCH 14/19] Update jacdac/pxt.json --- jacdac/pxt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index c98e1e2..b4d6c7b 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "radio": "*", "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.23", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.23", - "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.23" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.24", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.24", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.24" }, "files": [ "main.ts", From 8243f2fc3e5c15e83166243e385e34c560b149e1 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 4 May 2022 21:25:03 -0700 Subject: [PATCH 15/19] 0.3.14 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index b4d6c7b..cd43ade 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "robotbit-jacdac", - "version": "0.3.13", + "version": "0.3.14", "dependencies": { "core": "*", "radio": "*", From 84ac561a0e4da34cc1b557184d0afb83f46149fd Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 09:59:44 -0700 Subject: [PATCH 16/19] updated sim --- jacdac/pxt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index cd43ade..3417598 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "radio": "*", "microphone": "*", "pxt-robotbit": "github:pelikhan/pxt-robotbit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.24", - "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.24", - "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.24" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.41", + "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.41", + "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.41" }, "files": [ "main.ts", @@ -18,7 +18,7 @@ "test.ts" ], "targetVersions": { - "target": "4.1.30", + "target": "4.1.44", "targetId": "microbit" }, "supportedTargets": [ From 5c3c18217c628e36f784e103607f47ac03e11c3b Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 09:59:51 -0700 Subject: [PATCH 17/19] 0.3.15 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 3417598..6878c22 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "robotbit-jacdac", - "version": "0.3.14", + "version": "0.3.15", "dependencies": { "core": "*", "radio": "*", From 322176bd1726d6188def1d1c43e4818bafc434ea Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 10:00:37 -0700 Subject: [PATCH 18/19] cleanup --- jacdac/.github/workflows/cfg-check.yml | 37 -------------------------- jacdac/.github/workflows/makecode.yml | 29 -------------------- jacdac/.vscode/settings.json | 23 ---------------- jacdac/.vscode/tasks.json | 30 --------------------- jacdac/Gemfile | 2 -- jacdac/Makefile | 10 ------- jacdac/README.md | 32 +--------------------- jacdac/_config.yml | 8 ------ jacdac/main.blocks | 0 9 files changed, 1 insertion(+), 170 deletions(-) delete mode 100644 jacdac/.github/workflows/cfg-check.yml delete mode 100644 jacdac/.github/workflows/makecode.yml delete mode 100644 jacdac/.vscode/settings.json delete mode 100644 jacdac/.vscode/tasks.json delete mode 100644 jacdac/Gemfile delete mode 100644 jacdac/Makefile delete mode 100644 jacdac/_config.yml delete mode 100644 jacdac/main.blocks diff --git a/jacdac/.github/workflows/cfg-check.yml b/jacdac/.github/workflows/cfg-check.yml deleted file mode 100644 index a098f8b..0000000 --- a/jacdac/.github/workflows/cfg-check.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Check pxt.json - -on: - push: - branches: - - 'master' - - 'main' - -jobs: - check-cfg: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [14.x] - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: npm install - run: | - npm install -g pxt - pxt target microbit - - name: Checkout current state - run: | - git checkout -- . - git clean -fd - - name: Fix files listed in config if necessary - run: pxt checkpkgcfg - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 - continue-on-error: true - with: - title: 'Removing missing files from pxt.json' - commit-message: 'Removing missing files from pxt.json' - delete-branch: true diff --git a/jacdac/.github/workflows/makecode.yml b/jacdac/.github/workflows/makecode.yml deleted file mode 100644 index c046b20..0000000 --- a/jacdac/.github/workflows/makecode.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: MakeCode - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x] - - steps: - - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: npm install - run: | - npm install -g pxt - pxt target microbit - - name: build - run: | - pxt install - pxt build --cloud - env: - CI: true diff --git a/jacdac/.vscode/settings.json b/jacdac/.vscode/settings.json deleted file mode 100644 index f8106d4..0000000 --- a/jacdac/.vscode/settings.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "editor.formatOnType": true, - "files.autoSave": "afterDelay", - "files.watcherExclude": { - "**/.git/objects/**": true, - "**/built/**": true, - "**/node_modules/**": true, - "**/yotta_modules/**": true, - "**/yotta_targets": true, - "**/pxt_modules/**": true - }, - "files.associations": { - "*.blocks": "html", - "*.jres": "json" - }, - "search.exclude": { - "**/built": true, - "**/node_modules": true, - "**/yotta_modules": true, - "**/yotta_targets": true, - "**/pxt_modules": true - } -} \ No newline at end of file diff --git a/jacdac/.vscode/tasks.json b/jacdac/.vscode/tasks.json deleted file mode 100644 index 9ee2cf6..0000000 --- a/jacdac/.vscode/tasks.json +++ /dev/null @@ -1,30 +0,0 @@ - -// A task runner that calls the MakeCode (PXT) compiler -{ - "version": "2.0.0", - "tasks": [{ - "label": "pxt deploy", - "type": "shell", - "command": "pxt deploy --local", - "group": "build", - "problemMatcher": [ "$tsc" ] - }, { - "label": "pxt build", - "type": "shell", - "command": "pxt build --local", - "group": "build", - "problemMatcher": [ "$tsc" ] - }, { - "label": "pxt install", - "type": "shell", - "command": "pxt install", - "group": "build", - "problemMatcher": [ "$tsc" ] - }, { - "label": "pxt clean", - "type": "shell", - "command": "pxt clean", - "group": "test", - "problemMatcher": [ "$tsc" ] - }] -} diff --git a/jacdac/Gemfile b/jacdac/Gemfile deleted file mode 100644 index 91ceacd..0000000 --- a/jacdac/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'github-pages', group: :jekyll_plugins \ No newline at end of file diff --git a/jacdac/Makefile b/jacdac/Makefile deleted file mode 100644 index 9068464..0000000 --- a/jacdac/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -all: deploy - -build: - pxt build - -deploy: - pxt deploy - -test: - pxt test diff --git a/jacdac/README.md b/jacdac/README.md index f4f44b3..03e7e68 100644 --- a/jacdac/README.md +++ b/jacdac/README.md @@ -1,31 +1 @@ - -> Open this page at [https://pelikhan.github.io/pxt-robotbit/](https://pelikhan.github.io/pxt-robotbit/) - -## Use as Extension - -This repository can be added as an **extension** in MakeCode. - -* open [https://makecode.microbit.org/](https://makecode.microbit.org/) -* click on **New Project** -* click on **Extensions** under the gearwheel menu -* search for **https://github.com/pelikhan/pxt-robotbit/jacdac** and import - -## Edit this project ![Build status badge](https://github.com/pelikhan/pxt-robotbit/jacdac/workflows/MakeCode/badge.svg) - -To edit this repository in MakeCode. - -* open [https://makecode.microbit.org/](https://makecode.microbit.org/) -* click on **Import** then click on **Import URL** -* paste **https://github.com/pelikhan/pxt-robotbit/jacdac** and click import - -## Blocks preview - -This image shows the blocks code from the last commit in master. -This image may take a few minutes to refresh. - -![A rendered view of the blocks](https://github.com/pelikhan/pxt-robotbit/jacdac/raw/master/.github/makecode/blocks.png) - -#### Metadata (used for search, rendering) - -* for PXT/microbit - +# Robobit Jacdac Extension diff --git a/jacdac/_config.yml b/jacdac/_config.yml deleted file mode 100644 index f56a029..0000000 --- a/jacdac/_config.yml +++ /dev/null @@ -1,8 +0,0 @@ -makecode: - target: microbit - platform: microbit - home_url: https://makecode.microbit.org/ -theme: jekyll-theme-slate -include: - - assets - - README.md diff --git a/jacdac/main.blocks b/jacdac/main.blocks deleted file mode 100644 index e69de29..0000000 From b4fb33aa1407e3003663ad1efa4887e975a43f5c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 21:43:09 -0700 Subject: [PATCH 19/19] Update jacdac/pxt.json --- jacdac/pxt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 6878c22..f15226f 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -5,7 +5,7 @@ "core": "*", "radio": "*", "microphone": "*", - "pxt-robotbit": "github:pelikhan/pxt-robotbit", + "pxt-robotbit": "github:KittenBot/pxt-robotbit", "jacdac": "github:microsoft/pxt-jacdac#v0.10.41", "jacdac-motor": "github:microsoft/pxt-jacdac/motor#v0.10.41", "jacdac-servo": "github:microsoft/pxt-jacdac/servo#v0.10.41" @@ -18,7 +18,7 @@ "test.ts" ], "targetVersions": { - "target": "4.1.44", + "target": "4.1.45", "targetId": "microbit" }, "supportedTargets": [