From 3510151b03a48e42cbc4d7360ad52fa346ee38a0 Mon Sep 17 00:00:00 2001 From: pelikhan Date: Thu, 7 Apr 2022 14:52:08 -0700 Subject: [PATCH 01/24] added jacdac module --- .prettierrc | 1 + .vscode/launch.json | 30 ++++++++++++++++ .vscode/tasks.json | 87 ++++++++++++++++++++++++++++++--------------- jacdac/README.md | 0 jacdac/jacdac.ts | 52 +++++++++++++++++++++++++++ jacdac/pxt.json | 19 ++++++++++ jacdac/tests.ts | 0 mkc.json | 9 +++++ pxt.json | 6 ++-- 9 files changed, 174 insertions(+), 30 deletions(-) create mode 100644 .prettierrc create mode 100644 .vscode/launch.json create mode 100644 jacdac/README.md create mode 100644 jacdac/jacdac.ts create mode 100644 jacdac/pxt.json create mode 100644 jacdac/tests.ts create mode 100644 mkc.json diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..292912b --- /dev/null +++ b/.prettierrc @@ -0,0 +1 @@ +{"arrowParens":"avoid","semi":false,"tabWidth":4} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..5074657 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,30 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch MakeCode", + "program": "mkc", + "request": "launch", + "skipFiles": [ + "/**" + ], + "type": "node" + }, + { + "type": "pwa-node", + "request": "launch", + "name": "Launch Program", + "skipFiles": [ + "/**" + ], + "program": "${file}", + "preLaunchTask": "tsc: build - tsconfig.json", + "outFiles": [ + "${workspaceFolder}/built/**/*.js" + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 441d7d1..c87d281 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,36 +1,67 @@ // A task runner that calls the PXT compiler and { - "version": "0.1.0", + "version": "2.0.0", // The command is pxt. Assumes that PXT has been installed using npm install -g pxt "command": "pxt", - // The command is a shell script - "isShellCommand": true, - - // Show the output window always. - "showOutput": "always", - - "tasks": [{ - "taskName": "deploy", - "isBuildCommand": true, - "problemMatcher": "$tsc", - "args": [""] - }, { - "taskName": "build", - "isTestCommand": true, - "problemMatcher": "$tsc", - "args": [""] - }, { - "taskName": "clean", - "isTestCommand": true, - "problemMatcher": "$tsc", - "args": [""] - }, { - "taskName": "serial", - "isTestCommand": true, - "problemMatcher": "$tsc", - "args": [""] - }] + "tasks": [ + { + "label": "deploy", + "type": "shell", + "command": "pxt", + "args": [ + "deploy", + "" + ], + "problemMatcher": "$tsc", + "group": { + "_id": "build", + "isDefault": false + } + }, + { + "label": "build", + "type": "shell", + "command": "pxt", + "args": [ + "build", + "" + ], + "problemMatcher": "$tsc", + "group": { + "_id": "test", + "isDefault": false + } + }, + { + "label": "clean", + "type": "shell", + "command": "pxt", + "args": [ + "clean", + "" + ], + "problemMatcher": "$tsc", + "group": { + "_id": "test", + "isDefault": false + } + }, + { + "label": "serial", + "type": "shell", + "command": "pxt", + "args": [ + "serial", + "" + ], + "problemMatcher": "$tsc", + "group": { + "_id": "test", + "isDefault": false + } + } + ] } diff --git a/jacdac/README.md b/jacdac/README.md new file mode 100644 index 0000000..e69de29 diff --git a/jacdac/jacdac.ts b/jacdac/jacdac.ts new file mode 100644 index 0000000..535df36 --- /dev/null +++ b/jacdac/jacdac.ts @@ -0,0 +1,52 @@ +//% deprecated +namespace weatherbit {} + +namespace servers { + function startServers() { + if (!jacdac.isSimulator()) { + weatherbit.startRainMonitoring() + weatherbit.startWindMonitoring() + const servers: jacdac.Server[] = [ + jacdac.createSimpleSensorServer( + "rain gauge", + jacdac.SRV_RAIN_GAUGE, + "u16.16", + () => weatherbit.rain() / 25.4, // inches -> mm + { + streamingInterval: 30000, + readingError: () => 25.4, + } + ), + jacdac.createSimpleSensorServer( + "wind speed", + jacdac.SRV_WIND_SPEED, + "u16.16", + () => weatherbit.windSpeed() * 1.60934, + { + streamingInterval: 2000, + readingError: () => 3, + } + ), + ] + for (const server of servers) server.start() + } + if (jacdac.checkProxy()) jacdac.proxyFinalize() + } + startServers() +} + +namespace modules { + /** + * Rain gauge from the weather:bit + */ + //% fixedInstance whenUsed block="weatherbit rain" + export const weatherbitRain = new modules.RainGaugeClient( + "weatherbit rain?device=self" + ) + + /** + * Wind speed from weather:bit + */ + //% fixedInstance whenUsed block="weatherbit wind speed" + export const weatherbitWindSpeed = new modules.WindSpeedClient("weatherbit wind speed?device=self") +} diff --git a/jacdac/pxt.json b/jacdac/pxt.json new file mode 100644 index 0000000..9753db1 --- /dev/null +++ b/jacdac/pxt.json @@ -0,0 +1,19 @@ +{ + "name": "jacdac-weather-bit", + "version": "0.0.19", + "description": "SparkFun weatherbit Jacdac", + "license": "MIT", + "dependencies": { + "core": "*", + "weatherbit": "github:sparkfun/pxt-weather-bit", + "jacdac": "github:microsoft/pxt-jacdac" + }, + "files": [ + "README.md", + "jacdac.ts" + ], + "testFiles": [ + "tests.ts" + ], + "public": true +} \ No newline at end of file diff --git a/jacdac/tests.ts b/jacdac/tests.ts new file mode 100644 index 0000000..e69de29 diff --git a/mkc.json b/mkc.json new file mode 100644 index 0000000..424e502 --- /dev/null +++ b/mkc.json @@ -0,0 +1,9 @@ +{ + "links": { + "weatherbit": "." + }, + "targetWebsite": "https://makecode.microbit.org/beta", + "overrides": { + "testDependencies": {} + } +} diff --git a/pxt.json b/pxt.json index 66079bc..9e1c146 100644 --- a/pxt.json +++ b/pxt.json @@ -4,7 +4,9 @@ "description": "SparkFun weatherbit", "license": "MIT", "dependencies": { - "core": "*" + "core": "*", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed" }, "files": [ "README.md", @@ -18,4 +20,4 @@ "tests.ts" ], "public": true -} +} \ No newline at end of file From ea169465efeebb1712fe97f9e8351ed951fdae57 Mon Sep 17 00:00:00 2001 From: pelikhan Date: Thu, 7 Apr 2022 15:00:04 -0700 Subject: [PATCH 02/24] add test --- jacdac/tests.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jacdac/tests.ts b/jacdac/tests.ts index e69de29..037b207 100644 --- a/jacdac/tests.ts +++ b/jacdac/tests.ts @@ -0,0 +1,5 @@ +forever(() => { + console.logValue("rain", modules.weatherbitRain.precipitation()) + console.logValue("wind speed", modules.weatherbitWindSpeed.windSpeed()) + pause(5000) +}) \ No newline at end of file From a7aecdcdcdf2b8ddb4c4360a484218b4912f8882 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 11 Apr 2022 17:48:31 -0700 Subject: [PATCH 03/24] implement servers --- jacdac/jacdac.ts | 51 +++++++++++++++++++++++------------------------- jacdac/pxt.json | 16 ++++++++++++--- jacdac/tests.ts | 4 ++-- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/jacdac/jacdac.ts b/jacdac/jacdac.ts index 535df36..5352659 100644 --- a/jacdac/jacdac.ts +++ b/jacdac/jacdac.ts @@ -1,16 +1,31 @@ //% deprecated -namespace weatherbit {} +namespace weatherbit { } + +namespace modules { + /** + * Rain gauge from the weather:bit + */ + //% fixedInstance whenUsed block="weatherbit rain" + export const weatherbitRain = new modules.RainGaugeClient( + "weatherbit rain?device=self" + ) + + /** + * Wind speed from weather:bit + */ + //% fixedInstance whenUsed block="weatherbit wind speed" + export const weatherbitWindSpeed = new modules.WindSpeedClient("weatherbit wind speed?device=self") +} namespace servers { - function startServers() { - if (!jacdac.isSimulator()) { + function start() { + jacdac.startSelfServers(() => { weatherbit.startRainMonitoring() weatherbit.startWindMonitoring() const servers: jacdac.Server[] = [ jacdac.createSimpleSensorServer( - "rain gauge", jacdac.SRV_RAIN_GAUGE, - "u16.16", + jacdac.RainGaugeRegPack.Precipitation, () => weatherbit.rain() / 25.4, // inches -> mm { streamingInterval: 30000, @@ -18,9 +33,8 @@ namespace servers { } ), jacdac.createSimpleSensorServer( - "wind speed", jacdac.SRV_WIND_SPEED, - "u16.16", + jacdac.WindSpeedRegPack.WindSpeed, () => weatherbit.windSpeed() * 1.60934, { streamingInterval: 2000, @@ -28,25 +42,8 @@ namespace servers { } ), ] - for (const server of servers) server.start() - } - if (jacdac.checkProxy()) jacdac.proxyFinalize() + return servers + }) } - startServers() -} - -namespace modules { - /** - * Rain gauge from the weather:bit - */ - //% fixedInstance whenUsed block="weatherbit rain" - export const weatherbitRain = new modules.RainGaugeClient( - "weatherbit rain?device=self" - ) - - /** - * Wind speed from weather:bit - */ - //% fixedInstance whenUsed block="weatherbit wind speed" - export const weatherbitWindSpeed = new modules.WindSpeedClient("weatherbit wind speed?device=self") + start() } diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 9753db1..22ec0c7 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,7 +6,9 @@ "dependencies": { "core": "*", "weatherbit": "github:sparkfun/pxt-weather-bit", - "jacdac": "github:microsoft/pxt-jacdac" + "jacdac": "github:microsoft/pxt-jacdac#v0.9.3", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.9.3", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.9.3" }, "files": [ "README.md", @@ -15,5 +17,13 @@ "testFiles": [ "tests.ts" ], - "public": true -} \ No newline at end of file + "public": true, + "targetVersions": { + "target": "4.0.18", + "targetId": "microbit" + }, + "supportedTargets": [ + "microbit" + ], + "preferredEditor": "tsprj" +} diff --git a/jacdac/tests.ts b/jacdac/tests.ts index 037b207..66192af 100644 --- a/jacdac/tests.ts +++ b/jacdac/tests.ts @@ -1,5 +1,5 @@ forever(() => { console.logValue("rain", modules.weatherbitRain.precipitation()) - console.logValue("wind speed", modules.weatherbitWindSpeed.windSpeed()) - pause(5000) + console.logValue("wind", modules.weatherbitWindSpeed.windSpeed()) + pause(1000) }) \ No newline at end of file From b5bffd44495af9a4a151e1fa0d2e3f50dc5cf705 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 11 Apr 2022 17:48:38 -0700 Subject: [PATCH 04/24] 0.0.20 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 22ec0c7..4434258 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "jacdac-weather-bit", - "version": "0.0.19", + "version": "0.0.20", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From fa6d85c5ffbad1e32c34547d2f79c81f401d05c9 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:09:57 -0700 Subject: [PATCH 05/24] updated role queries --- jacdac/jacdac.ts | 4 ++-- jacdac/pxt.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jacdac/jacdac.ts b/jacdac/jacdac.ts index 5352659..7de53d8 100644 --- a/jacdac/jacdac.ts +++ b/jacdac/jacdac.ts @@ -7,14 +7,14 @@ namespace modules { */ //% fixedInstance whenUsed block="weatherbit rain" export const weatherbitRain = new modules.RainGaugeClient( - "weatherbit rain?device=self" + "weatherbit rain?dev=self" ) /** * Wind speed from weather:bit */ //% fixedInstance whenUsed block="weatherbit wind speed" - export const weatherbitWindSpeed = new modules.WindSpeedClient("weatherbit wind speed?device=self") + export const weatherbitWindSpeed = new modules.WindSpeedClient("weatherbit wind speed?dev=self") } namespace servers { diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 4434258..82e6be6 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,14 +1,14 @@ { - "name": "jacdac-weather-bit", + "name": "weather-bit-jacdac", "version": "0.0.20", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { "core": "*", "weatherbit": "github:sparkfun/pxt-weather-bit", - "jacdac": "github:microsoft/pxt-jacdac#v0.9.3", - "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.9.3", - "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.9.3" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.3", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.3", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.3" }, "files": [ "README.md", @@ -19,7 +19,7 @@ ], "public": true, "targetVersions": { - "target": "4.0.18", + "target": "4.1.24", "targetId": "microbit" }, "supportedTargets": [ From aa8019fcdb60f015f9d69674ff9a98c187bb5ff0 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:10:03 -0700 Subject: [PATCH 06/24] 0.0.21 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 82e6be6..68da5c0 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.20", + "version": "0.0.21", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From 0bc3c1a26387901f15e66a6191ab54d642448c51 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:28:08 -0700 Subject: [PATCH 07/24] support for init sequence --- jacdac/jacdac.ts | 14 ++++++++++++-- jacdac/pxt.json | 6 +++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jacdac/jacdac.ts b/jacdac/jacdac.ts index 7de53d8..ea3a7d4 100644 --- a/jacdac/jacdac.ts +++ b/jacdac/jacdac.ts @@ -20,8 +20,6 @@ namespace modules { namespace servers { function start() { jacdac.startSelfServers(() => { - weatherbit.startRainMonitoring() - weatherbit.startWindMonitoring() const servers: jacdac.Server[] = [ jacdac.createSimpleSensorServer( jacdac.SRV_RAIN_GAUGE, @@ -30,6 +28,7 @@ namespace servers { { streamingInterval: 30000, readingError: () => 25.4, + statusCode: jacdac.SystemStatusCodes.Initializing } ), jacdac.createSimpleSensorServer( @@ -39,9 +38,20 @@ namespace servers { { streamingInterval: 2000, readingError: () => 3, + statusCode: jacdac.SystemStatusCodes.Initializing } ), ] + + // booting + control.inBackground(() => { + weatherbit.startRainMonitoring() + weatherbit.startWindMonitoring() + for(const server of servers) + server.setStatusCode(jacdac.SystemStatusCodes.Ready) + }) + + // return servers return servers }) } diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 68da5c0..092fa47 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "dependencies": { "core": "*", "weatherbit": "github:sparkfun/pxt-weather-bit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.3", - "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.3", - "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.3" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.5", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.5", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.5" }, "files": [ "README.md", From 8a56e3a84d7606832262e5267ab28270aedd5d0c Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:28:13 -0700 Subject: [PATCH 08/24] 0.0.22 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 092fa47..4907d2e 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.21", + "version": "0.0.22", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From fb43bff484251992bae284f35ccb1416e591916a Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:31:39 -0700 Subject: [PATCH 09/24] add product id --- jacdac/jacdac.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/jacdac/jacdac.ts b/jacdac/jacdac.ts index ea3a7d4..408d437 100644 --- a/jacdac/jacdac.ts +++ b/jacdac/jacdac.ts @@ -18,6 +18,7 @@ namespace modules { } namespace servers { + jacdac.productIdentifier = 0x36dccd5c function start() { jacdac.startSelfServers(() => { const servers: jacdac.Server[] = [ From 9fc0f1fa524eb07d53bc054f7100a893f5a515e1 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:31:44 -0700 Subject: [PATCH 10/24] 0.0.23 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 4907d2e..fac8994 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.22", + "version": "0.0.23", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From f28df0c454eb13e5b1624b39f286eedaeba18de4 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:33:22 -0700 Subject: [PATCH 11/24] updated --- jacdac/jacdac.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/jacdac.ts b/jacdac/jacdac.ts index 408d437..0a7b44b 100644 --- a/jacdac/jacdac.ts +++ b/jacdac/jacdac.ts @@ -18,8 +18,8 @@ namespace modules { } namespace servers { - jacdac.productIdentifier = 0x36dccd5c function start() { + jacdac.productIdentifier = 0x36dccd5c jacdac.startSelfServers(() => { const servers: jacdac.Server[] = [ jacdac.createSimpleSensorServer( From 143b826ba2610afab8c3223716b8c214c6547f50 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Tue, 26 Apr 2022 07:33:27 -0700 Subject: [PATCH 12/24] 0.0.24 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index fac8994..914f370 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.23", + "version": "0.0.24", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From 7f49d6958d31f63558683634ec76ea305fc85f52 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 28 Apr 2022 08:51:46 -0700 Subject: [PATCH 13/24] Update jacdac/pxt.json, jacdac/jacdac.ts --- jacdac/jacdac.ts | 1 + jacdac/pxt.json | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jacdac/jacdac.ts b/jacdac/jacdac.ts index 0a7b44b..ce32128 100644 --- a/jacdac/jacdac.ts +++ b/jacdac/jacdac.ts @@ -20,6 +20,7 @@ namespace modules { namespace servers { function start() { jacdac.productIdentifier = 0x36dccd5c + jacdac.deviceDescription = "Sparkfun Weather:bit" jacdac.startSelfServers(() => { const servers: jacdac.Server[] = [ jacdac.createSimpleSensorServer( diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 914f370..b05ae3f 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "dependencies": { "core": "*", "weatherbit": "github:sparkfun/pxt-weather-bit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.5", - "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.5", - "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.5" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.14", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.14", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.14" }, "files": [ "README.md", @@ -19,7 +19,7 @@ ], "public": true, "targetVersions": { - "target": "4.1.24", + "target": "4.1.27", "targetId": "microbit" }, "supportedTargets": [ From 73f25365d144d4b13441001bdbc64e3f6c44722e Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 28 Apr 2022 08:51:51 -0700 Subject: [PATCH 14/24] 0.0.25 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index b05ae3f..73fd24c 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.24", + "version": "0.0.25", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From 5a66ec58a1dd89b424dc1f3b627611573bb80ca6 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 4 May 2022 17:08:53 -0700 Subject: [PATCH 15/24] Update jacdac/pxt.json --- jacdac/pxt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 73fd24c..00089f1 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "dependencies": { "core": "*", "weatherbit": "github:sparkfun/pxt-weather-bit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.14", - "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.14", - "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.14" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.23", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.23", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.23" }, "files": [ "README.md", @@ -19,7 +19,7 @@ ], "public": true, "targetVersions": { - "target": "4.1.27", + "target": "4.1.30", "targetId": "microbit" }, "supportedTargets": [ From b4ae03c0ee413a814faa9d05f528e472ae28305f Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Wed, 4 May 2022 17:08:58 -0700 Subject: [PATCH 16/24] 0.0.26 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 00089f1..b8fc3dc 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.25", + "version": "0.0.26", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From ba7c40ecc260d0062ca88311b40a64086e748e97 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 6 May 2022 11:49:08 -0700 Subject: [PATCH 17/24] 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 b8fc3dc..cda8b1e 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "dependencies": { "core": "*", "weatherbit": "github:sparkfun/pxt-weather-bit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.23", - "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.23", - "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.23" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.27", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.27", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.27" }, "files": [ "README.md", From 348e08e4c15d7dd2363fee5aad0d42b04cd463e0 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Fri, 6 May 2022 11:49:15 -0700 Subject: [PATCH 18/24] 0.0.27 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index cda8b1e..3eb7d34 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.26", + "version": "0.0.27", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From 38b48febf58a440703ac43ce8084da9f55b4db50 Mon Sep 17 00:00:00 2001 From: pelikhan Date: Thu, 19 May 2022 16:35:49 -0700 Subject: [PATCH 19/24] fix dep name --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 3eb7d34..16680e6 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -5,7 +5,7 @@ "license": "MIT", "dependencies": { "core": "*", - "weatherbit": "github:sparkfun/pxt-weather-bit", + "pxt-weather-bit": "github:sparkfun/pxt-weather-bit", "jacdac": "github:microsoft/pxt-jacdac#v0.10.27", "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.27", "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.27" From b457470375809231c7e544a258e37259cd24a66f Mon Sep 17 00:00:00 2001 From: pelikhan Date: Thu, 19 May 2022 16:56:13 -0700 Subject: [PATCH 20/24] fix links --- pxt.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pxt.json b/pxt.json index 9e1c146..bd36622 100644 --- a/pxt.json +++ b/pxt.json @@ -4,9 +4,7 @@ "description": "SparkFun weatherbit", "license": "MIT", "dependencies": { - "core": "*", - "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge", - "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed" + "core": "*" }, "files": [ "README.md", From 3fe4f5689003fa1338bf2481b3a0badf5cf7825b Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 10:08:30 -0700 Subject: [PATCH 21/24] Update jacdac/pxt.json --- jacdac/pxt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 16680e6..2b41b8b 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -6,9 +6,9 @@ "dependencies": { "core": "*", "pxt-weather-bit": "github:sparkfun/pxt-weather-bit", - "jacdac": "github:microsoft/pxt-jacdac#v0.10.27", - "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.27", - "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.27" + "jacdac": "github:microsoft/pxt-jacdac#v0.10.41", + "jacdac-wind-speed": "github:microsoft/pxt-jacdac/wind-speed#v0.10.41", + "jacdac-rain-gauge": "github:microsoft/pxt-jacdac/rain-gauge#v0.10.41" }, "files": [ "README.md", @@ -19,7 +19,7 @@ ], "public": true, "targetVersions": { - "target": "4.1.30", + "target": "4.1.44", "targetId": "microbit" }, "supportedTargets": [ From 5103a7e9ae213af5160bade9589e2325e3c6aefd Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 10:08:37 -0700 Subject: [PATCH 22/24] 0.0.28 --- jacdac/pxt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jacdac/pxt.json b/jacdac/pxt.json index 2b41b8b..1086494 100644 --- a/jacdac/pxt.json +++ b/jacdac/pxt.json @@ -1,6 +1,6 @@ { "name": "weather-bit-jacdac", - "version": "0.0.27", + "version": "0.0.28", "description": "SparkFun weatherbit Jacdac", "license": "MIT", "dependencies": { From 1eab7608657f96c66da5fc1c4ae03cb9bd983135 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 10:09:21 -0700 Subject: [PATCH 23/24] readme info --- jacdac/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/jacdac/README.md b/jacdac/README.md index e69de29..a132cf1 100644 --- a/jacdac/README.md +++ b/jacdac/README.md @@ -0,0 +1 @@ +# Weather:bit Jacdac Extension \ No newline at end of file From cabc438c452bba79094396c65345fb413fb87574 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 26 May 2022 10:11:30 -0700 Subject: [PATCH 24/24] removing mkc.json --- mkc.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 mkc.json diff --git a/mkc.json b/mkc.json deleted file mode 100644 index 424e502..0000000 --- a/mkc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "links": { - "weatherbit": "." - }, - "targetWebsite": "https://makecode.microbit.org/beta", - "overrides": { - "testDependencies": {} - } -}