diff --git a/docs/static/download/pair.png b/docs/static/download/pair.png
index 1dcf5851..82d05d72 100644
Binary files a/docs/static/download/pair.png and b/docs/static/download/pair.png differ
diff --git a/docs/static/download/unpair.gif b/docs/static/download/unpair.gif
new file mode 100644
index 00000000..c77ba76d
Binary files /dev/null and b/docs/static/download/unpair.gif differ
diff --git a/docs/static/packages/bluetooth/icon.png b/docs/static/packages/bluetooth/icon.png
index cb967d40..8c8d1563 100644
Binary files a/docs/static/packages/bluetooth/icon.png and b/docs/static/packages/bluetooth/icon.png differ
diff --git a/docs/static/packages/bluetooth/icon.svg b/docs/static/packages/bluetooth/icon.svg
deleted file mode 100644
index 9363f9d4..00000000
--- a/docs/static/packages/bluetooth/icon.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
diff --git a/docs/static/packages/devices/icon.png b/docs/static/packages/devices/icon.png
index d900a7d6..aca2f2d1 100644
Binary files a/docs/static/packages/devices/icon.png and b/docs/static/packages/devices/icon.png differ
diff --git a/docs/static/packages/devices/icon.svg b/docs/static/packages/devices/icon.svg
deleted file mode 100644
index 5ddc36e4..00000000
--- a/docs/static/packages/devices/icon.svg
+++ /dev/null
@@ -1,1948 +0,0 @@
-
-
-
-
diff --git a/docs/static/packages/radio-broadcast/icon.png b/docs/static/packages/radio-broadcast/icon.png
index e211d6eb..34894c8e 100644
Binary files a/docs/static/packages/radio-broadcast/icon.png and b/docs/static/packages/radio-broadcast/icon.png differ
diff --git a/docs/static/packages/radio-broadcast/icon.svg b/docs/static/packages/radio-broadcast/icon.svg
deleted file mode 100644
index 7ff5d6a4..00000000
--- a/docs/static/packages/radio-broadcast/icon.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
diff --git a/docs/static/packages/radio/icon.png b/docs/static/packages/radio/icon.png
index e211d6eb..34121c53 100644
Binary files a/docs/static/packages/radio/icon.png and b/docs/static/packages/radio/icon.png differ
diff --git a/docs/static/packages/radio/icon.svg b/docs/static/packages/radio/icon.svg
deleted file mode 100644
index 7ff5d6a4..00000000
--- a/docs/static/packages/radio/icon.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
diff --git a/docs/static/packages/servo/icon.png b/docs/static/packages/servo/icon.png
new file mode 100644
index 00000000..ed1fdb17
Binary files /dev/null and b/docs/static/packages/servo/icon.png differ
diff --git a/libs/core/_locales/core-jsdoc-strings.json b/libs/core/_locales/core-jsdoc-strings.json
index 2ef44769..8d01f01c 100644
--- a/libs/core/_locales/core-jsdoc-strings.json
+++ b/libs/core/_locales/core-jsdoc-strings.json
@@ -538,8 +538,6 @@
"pins.C12": "Pin C12",
"pins.C16": "Pin C16",
"pins.C17": "Pin C17",
- "pins.C18": "Pin C18",
- "pins.C19": "Pin C19",
"pins.C4": "Pin C4",
"pins.C5": "Pin C5",
"pins.C6": "Pin C6",
diff --git a/libs/core/enums.d.ts b/libs/core/enums.d.ts
index 5cdd9788..92887109 100644
--- a/libs/core/enums.d.ts
+++ b/libs/core/enums.d.ts
@@ -464,8 +464,6 @@ declare namespace motors {
C12 = 106, // MICROBIT_ID_IO_P6
C16 = 102, // MICROBIT_ID_IO_P2
C17 = 108, // MICROBIT_ID_IO_P8
- C18 = 120, // MICROBIT_ID_IO_P20
- C19 = 119, // MICROBIT_ID_IO_P19
}
diff --git a/libs/core/icons.ts b/libs/core/icons.ts
index 686b900e..a381a921 100644
--- a/libs/core/icons.ts
+++ b/libs/core/icons.ts
@@ -236,6 +236,7 @@ namespace images {
//% weight=50 blockGap=8
//% help=images/arrow-image
//% blockId=builtin_arrow_image block="arrow image %i"
+ //% deprecated=true
export function arrowImage(i: ArrowNames): Image {
switch (i) {
// compass directions
@@ -616,6 +617,7 @@ namespace images {
//% help=images/arrow-number
//% blockId=device_arrow block="%arrow"
//% shim=TD_ID
+ //% deprecated=true
export function arrowNumber(arrow: ArrowNames): number {
return arrow;
}
diff --git a/libs/core/pins.cpp b/libs/core/pins.cpp
index 5b4021da..07784bab 100644
--- a/libs/core/pins.cpp
+++ b/libs/core/pins.cpp
@@ -15,9 +15,7 @@ enum class DigitalPin {
C11 = MICROBIT_ID_IO_P7, // LED matrix C8
C12 = MICROBIT_ID_IO_P6, // LED matrix C9
C16 = MICROBIT_ID_IO_P2, // RX
- C17 = MICROBIT_ID_IO_P8, // TX
- C18 = MICROBIT_ID_IO_P20, // SDA
- C19 = MICROBIT_ID_IO_P19 // SCL
+ C17 = MICROBIT_ID_IO_P8 // TX
};
enum class AnalogPin {
diff --git a/libs/core/pinscompat.ts b/libs/core/pinscompat.ts
index 22ad2e7e..5e79a0a2 100644
--- a/libs/core/pinscompat.ts
+++ b/libs/core/pinscompat.ts
@@ -212,16 +212,5 @@ namespace pins {
*/
//% fixedInstance whenUsed
export const C17: AnalogInPin = new MicrobitPin(DigitalPin.C17);
-
- /**
- * Pin C18
- */
- //% fixedInstance whenUsed
- export const C18: DigitalInOutPin = new MicrobitPin(DigitalPin.C18);
-
- /**
- * Pin C19
- */
- //% fixedInstance whenUsed
- export const C19: DigitalInOutPin = new MicrobitPin(DigitalPin.C19);
+
}
\ No newline at end of file
diff --git a/libs/radio-broadcast/pxt.json b/libs/radio-broadcast/pxt.json
index 82f9ad60..b1851bb9 100644
--- a/libs/radio-broadcast/pxt.json
+++ b/libs/radio-broadcast/pxt.json
@@ -1,3 +1,4 @@
{
- "additionalFilePath": "../../node_modules/pxt-common-packages/libs/radio-broadcast"
+ "additionalFilePath": "../../node_modules/pxt-common-packages/libs/radio-broadcast",
+ "icon": "./static/packages/radio-broadcast/icon.png"
}
diff --git a/libs/radio/pxt.json b/libs/radio/pxt.json
index 3eb5331a..4b5652ad 100644
--- a/libs/radio/pxt.json
+++ b/libs/radio/pxt.json
@@ -1,5 +1,6 @@
{
"additionalFilePath": "../../node_modules/pxt-common-packages/libs/radio",
+ "icon": "./static/packages/radio/icon.png",
"yotta": {
"config": {
"microbit-dal": {
diff --git a/libs/servo/pxt.json b/libs/servo/pxt.json
index fc5e2f87..c4632acd 100644
--- a/libs/servo/pxt.json
+++ b/libs/servo/pxt.json
@@ -6,6 +6,7 @@
"ns.ts",
"targetoverrides.ts"
],
+ "icon": "./static/packages/servo/icon.png",
"public": true,
"dependencies": {
"core": "file:../core"
diff --git a/pxtarget.json b/pxtarget.json
index e9f5c693..f422961a 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -116,8 +116,8 @@
"compileService": {
"yottaTarget": "calliope-mini-classic-gcc",
"yottaCorePackage": "microbit",
- "githubCorePackage": "Amerlander/microbit",
- "gittag": "v2.2.0-rc6.03",
+ "githubCorePackage": "calliope-mini/microbit",
+ "gittag": "v2.2.0-rc6-calliope.rc3",
"serviceId": "calliope",
"dockerImage": "pext/yotta:latest"
},
diff --git a/targetconfig.json b/targetconfig.json
index b1e00213..c47a1e0c 100644
--- a/targetconfig.json
+++ b/targetconfig.json
@@ -201,11 +201,12 @@
"tinysuperlab/motionkit",
"tinysuperlab/touchkit",
"MKleinSB/pxt-seeed-temperature",
- "MKleinSB/pxt-iot-lora-node-calliope",
"MKleinSB/pxt-dht11",
"MKleinSB/pxt-esp-thingspeak",
- "MKleinSB/pxt-neopixel-calliope",
- "MKleinSB/pxt-OLED-SSD1306"
+ "MKleinSB/pxt-OLED-SSD1306",
+ "https://github.com/MKleinSB/pxt-pca9685",
+ "https://github.com/MKleinSB/pxt-mpr121",
+ "https://github.com/MKleinSB/pxt-gatorlog-calliope"
],
"preferredRepos": [
"tinysuperlab/motionkit",
@@ -213,14 +214,14 @@
"calliope-edu/pxt-grove",
"Microsoft/pxt-microturtle",
"MKleinSB/pxt-OLED-SSD1306",
- "MKleinSB/pxt-iot-lora-node",
"MKleinSB/pxt-foldio",
"MKleinSB/pxt-seeed-temperature",
- "MKleinSB/pxt-iot-lora-node-calliope",
"MKleinSB/pxt-dht11",
"MKleinSB/pxt-esp-thingspeak",
- "MKleinSB/pxt-neopixel-calliope",
- "Microsoft/pxt-neopixel"
+ "Microsoft/pxt-neopixel",
+ "https://github.com/MKleinSB/pxt-pca9685",
+ "https://github.com/MKleinSB/pxt-mpr121",
+ "https://github.com/MKleinSB/pxt-gatorlog-calliope"
]
},
"galleries": {
diff --git a/theme/style.less b/theme/style.less
index 572782ad..b0c82208 100644
--- a/theme/style.less
+++ b/theme/style.less
@@ -69,6 +69,11 @@
}
}
+.ui.searchdialog .ui.card .ui.cardimage.upload {
+ margin: auto;
+ padding: 25% 0;
+}
+
/* Mobile */
@media only screen and (max-width: @largestMobileScreen) {
#filelist {