revert to match pxt-arcade

libs/arcadeshield/_locales/arcadeshield-strings.json

@@ -55,7 +55,6 @@
   "{id:category}Math": "Math",
   "{id:category}Power": "Power",
   "{id:category}Scene": "Scene",
-  "{id:category}Screen": "Screen",
   "{id:category}ScreenBitmap": "ScreenBitmap",
   "{id:category}Texteffects": "Texteffects",
   "{id:category}_helpers_workaround": "_helpers_workaround",

libs/arcadeshield/context/console.ts

@@ -5,8 +5,8 @@ namespace scene.consoleOverlay {
     const marginx = 4;
     const marginy = 2;
     const consoleFont = bitmap.font5;
-    const consoleLines = Math.floor(screen.height / (consoleFont.charHeight + marginy)) - 1;
-    const consoleColumns = Math.floor((screen.width - 2 * marginx) / consoleFont.charWidth);
+    const consoleLines = Math.floor(theScreen.height / (consoleFont.charHeight + marginy)) - 1;
+    const consoleColumns = Math.floor((theScreen.width - 2 * marginx) / consoleFont.charWidth);
     console.addListener(listener);
 
     export function isVisible() {

libs/arcadeshield/init.ts

@@ -35,6 +35,6 @@ namespace bitmap {
     //% blockId=imagescreen block="screen"
     //% help=images/screen-image
     export function screenImage(): Bitmap {
-        return screen;
+        return theScreen;
     }
 }

libs/arcadeshield/pxt.json

@@ -23,7 +23,6 @@
         "bitmap.ts",
         "bitmap.d.ts",
         "init.ts",
-        "screen.ts",
         "fieldeditors.ts",
         "text.ts",
         "frame.ts",

libs/arcadeshield/sim/bitmap.ts

@@ -1105,3 +1105,44 @@ namespace pxsim.bitmap {
         return toBuffer(img)
     }
 }
+
+namespace pxsim.pxtcore {
+    export function updateScreen(img: RefImage) {
+        const state = pxsim.getScreenState();
+        if (state)
+            state.showImage(img);
+    }
+    export function updateStats(s: string) {
+        const state = pxsim.getScreenState();
+        if (state)
+            state.updateStats(s);
+    }
+    export function setPalette(b: RefBuffer) {
+        const state = pxsim.getScreenState();
+        if (state)
+            state.setPalette(b);
+    }
+    export function setScreenBrightness(b: number) {
+        const state = pxsim.getScreenState();
+        if (state)
+            state.setScreenBrightness(b);
+    }
+    export function displayHeight(): number {
+        const state = pxsim.getScreenState();
+        if (state)
+            return state.displayHeight();
+        return -1;
+    }
+    export function displayWidth(): number {
+        const state = pxsim.getScreenState();
+        if (state)
+            return state.displayWidth();
+        return -1;
+    }
+    export function displayPresent(): boolean {
+        const state = pxsim.getScreenState();
+        if (state)
+            return state.displayPresent();
+        return false;
+    }
+}