Merge branch 'tballmsft:main' into no-jacdac-version

KierPalin · Oct 9, 2024 · 2fffd7a · 2fffd7a
2 parents 20b328f + 01b0a47
commit 2fffd7a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/app/mkc.json b/app/mkc.json
@@ -1,5 +1,5 @@
 {
-    "targetWebsite": "https://makecode.microbit.org/alpha",
+    "targetWebsite": "https://makecode.microbit.org/beta",
     "links": {
         "microdata": "../"
     }

diff --git a/app/package.json b/app/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "pxt-microbit": "^7.1.2"
+    "pxt-microbit": "^7.1.9"
   }
 }
diff --git a/assets.ts b/assets.ts
@@ -123,7 +123,7 @@ namespace icondb {
 
     // - upscale 5x5 image to 16 x 16, add halo
     export function renderMicrobitLEDs(led55: Bitmap) {
-        const ret = bitmap.create(16, 16)
+        const ret = bitmaps.create(16, 16)
         ret.fill(15)
         for (let row = 0; row < 5; row++) {
             for (let col = 0; col < 5; col++) {

diff --git a/home.ts b/home.ts
@@ -69,7 +69,7 @@ namespace microcode {
         }
 
         private drawVersion() {
-            const font = bitmap.font5
+            const font = bitmaps.font5
             Screen.print(
                 "v1.5",
                 Screen.RIGHT_EDGE - font.charWidth * "v1.5".length,

diff --git a/liveDataViewer.ts b/liveDataViewer.ts
@@ -353,7 +353,7 @@ namespace microcode {
                                     Screen.WIDTH - this.windowRightBuffer - (4 * font.charWidth),
                                     y,
                                     color,
-                                    bitmap.font5,
+                                    bitmaps.font5,
                                 )
                             }
                         }
@@ -383,15 +383,15 @@ namespace microcode {
                     this.windowWidth - (1 + xText.length * font.charWidth),
                     this.windowTopBuffer + (Screen.HEIGHT * 0.0390), // 5
                     1,
-                    bitmap.font5,
+                    bitmaps.font5,
                 );
 
                 screen().print(
                     yText,
                     this.windowWidth - (1 + yText.length * font.charWidth),
                     this.windowTopBuffer + (Screen.HEIGHT * 0.1172), // 15
                     1,
-                    bitmap.font5,
+                    bitmaps.font5,
                 );
             }
 

diff --git a/mkc.json b/mkc.json
@@ -1,3 +1,3 @@
 {
-    "targetWebsite": "https://makecode.microbit.org/alpha"
+    "targetWebsite": "https://makecode.microbit.org/beta"
 }
diff --git a/pxt.json b/pxt.json
@@ -7,7 +7,7 @@
         "radio": "*",
         "microphone": "*",
         "datalogger": "*",
-        "pxt-arcadeshield": "github:microsoft/pxt-arcadeshield#v0.1.2",
+        "pxt-arcadeshield": "github:microsoft/pxt-arcadeshield#v0.1.4",
         "jacdac": "github:microsoft/pxt-jacdac#v1.9.28",
         "jacdac-light-level": "github:microsoft/pxt-jacdac/light-level#v1.9.28",
         "jacdac-soil-moisture": "github:microsoft/pxt-jacdac/soil-moisture#v1.9.28",

diff --git a/screen.ts b/screen.ts
@@ -56,7 +56,7 @@
         }
 
         public static setImageSize(width: number, height: number) {
-            Screen.image_ = bitmap.create(width, height)
+            Screen.image_ = bitmaps.create(width, height)
             Screen.updateBounds()
         }
 
@@ -341,7 +341,7 @@
             x: number,
             y: number,
             color?: number,
-            font?: bitmap.Font,
+            font?: bitmaps.Font,
             offsets?: texteffects.TextEffectState[]
         ) {
             Screen.image.print(

diff --git a/tabularDataViewer.ts b/tabularDataViewer.ts
@@ -424,7 +424,7 @@ namespace microcode {
                         Screen.LEFT_EDGE + cumulativeColOffset + (this.headerStringLengths[colID] / 2) - ((font.charWidth * value.length) / 2),
                         Screen.TOP_EDGE + (row * tabularRowBufferSize) + (tabularRowBufferSize / 2) - 4,
                         0xb,
-                        bitmap.font8
+                        bitmaps.font8
                     )
 
                     cumulativeColOffset += this.headerStringLengths[colID]

diff --git a/tooltips.ts b/tooltips.ts
@@ -1,7 +1,7 @@
 // auto-generated, run 'node scripts/lochex.mjs' to refresh
 namespace microcode {
     export const lang = "en"
-    export const font = bitmap.font8
+    export const font = bitmaps.font8
 
 
     /**