pxt-common-packages 12.2.8 → 12.3.1

package/libs/game/numberprompt.ts

@@ -4,21 +4,21 @@ namespace game {
      * Ask the player for a number value.
      * @param message The message to display on the text-entry screen
      * @param answerLength The maximum number of digits the user can enter (1 - 10)
-     * @param useSystemKeyboard Use the computer keyboard for typing if the game is being played in the simulator
+     * @param useOnScreenKeyboard Force the simulator to use the on-screen keyboard for text entry
      */
     //% weight=10 help=game/ask-for-number
     //% blockId=gameaskfornumber
-    //% block="ask for number $message || and max length $answerLength use system keyboard $useSystemKeyboard"
+    //% block="ask for number $message || and max length $answerLength use on-screen keyboard $useOnScreenKeyboard"
     //% message.shadow=text
     //% message.defl=""
     //% answerLength.defl="6"
     //% answerLength.min=1
     //% answerLength.max=10
     //% group="Prompt"
-    export function askForNumber(message: any, answerLength = 6, useSystemKeyboard = false) {
+    export function askForNumber(message: any, answerLength = 6, useOnScreenKeyboard = false) {
         answerLength = Math.max(0, Math.min(10, answerLength));
         let p = new game.NumberPrompt();
-        const result = p.show(console.inspect(message), answerLength, useSystemKeyboard);
+        const result = p.show(console.inspect(message), answerLength, useOnScreenKeyboard);
         return parseFloat(result);
     }
 

package/libs/game/prompt.ts

@@ -19,20 +19,20 @@ namespace game {
      * Ask the player for a string value.
      * @param message The message to display on the text-entry screen
      * @param answerLength The maximum number of characters the user can enter (1 - 24)
-     * @param useSystemKeyboard Use the computer keyboard for typing if the game is being played in the simulator
+     * @param useOnScreenKeyboard Force the simulator to use the on-screen keyboard for text entry
      */
     //% weight=10 help=game/ask-for-string
     //% blockId=gameaskforstring
-    //% block="ask for string $message || and max length $answerLength use system keyboard $useSystemKeyboard"
+    //% block="ask for string $message || and max length $answerLength use on-screen keyboard $useOnScreenKeyboard"
     //% message.shadow=text
     //% message.defl=""
     //% answerLength.defl="12"
     //% answerLength.min=1
     //% answerLength.max=24
     //% group="Prompt"
-    export function askForString(message: any, answerLength = 12, useSystemKeyboard = false) {
+    export function askForString(message: any, answerLength = 12, useOnScreenKeyboard = false) {
         let p = new game.Prompt();
-        const result = p.show(console.inspect(message), answerLength, useSystemKeyboard);
+        const result = p.show(console.inspect(message), answerLength, useOnScreenKeyboard);
         return result;
     }
 
@@ -161,7 +161,7 @@ namespace game {
             this.selectionEnd = 0;
         }
 
-        show(message: string, answerLength: number, useSystemKeyboard = false) {
+        show(message: string, answerLength: number, useOnScreenKeyboard = false) {
             this.message = message;
             this.answerLength = answerLength;
 
@@ -171,7 +171,7 @@ namespace game {
             this.createRenderable();
             this.confirmPressed = false;
 
-            if (useSystemKeyboard && control.deviceDalVersion() === "sim" && helpers._isSystemKeyboardSupported()) {
+            if (!useOnScreenKeyboard && control.deviceDalVersion() === "sim" && helpers._isSystemKeyboardSupported()) {
                 this.useSystemKeyboard = true;
                 helpers._promptForText(this.answerLength, this.numbersOnly());
                 this.selectionEnd = 0;
@@ -228,7 +228,7 @@ namespace game {
             }
 
             const promptText = new sprites.RenderText(this.message, CONTENT_WIDTH);
-            const systemKeyboardText = new sprites.RenderText("Type your response using your keyboard and hit ENTER", CONTENT_WIDTH);
+            let systemKeyboardText: sprites.RenderText;
 
             this.renderable = scene.createRenderable(-1, () => {
                 promptText.draw(screen, (screen.width >> 1) - (promptText.width >> 1), CONTENT_TOP, this.theme.colorPrompt, 0, 2)
@@ -240,6 +240,10 @@ namespace game {
                     return;
                 }
 
+                if (!systemKeyboardText) {
+                    systemKeyboardText = new sprites.RenderText(helpers._getLocalizedInstructions(), CONTENT_WIDTH);
+                }
+
                 screen.fillRect(0, screen.height - (PADDING << 1) - systemKeyboardText.height, screen.width, screen.height, this.theme.colorBottomBackground);
                 systemKeyboardText.draw(screen, PADDING, screen.height - PADDING - systemKeyboardText.height, this.theme.colorBottomText);
             });

package/libs/game/systemKeyboard.cpp

@@ -15,6 +15,11 @@ char* getTextPromptString() {
     return NULL;
 }
 
+//%
+char* getLocalizedInstructions() {
+    return NULL;
+}
+
 //%
 int getTextPromptSelectionStart() {
     return 0;

package/libs/game/systemKeyboard.d.ts

@@ -12,6 +12,9 @@ declare namespace helpers {
     //% shim=Keyboard::getTextPromptString
     function _getTextPromptString(): string;
 
+    //% shim=Keyboard::getLocalizedInstructions
+    function _getLocalizedInstructions(): string;
+
     //% shim=Keyboard::getTextPromptSelectionStart
     function _getTextPromptSelectionStart(): number;
 

package/libs/lcd/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48753(s) {
+function _main___P48754(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___48996 = (undefined);
-    globals._pollEventQueue___49009 = (undefined);
+    globals._intervals___48997 = (undefined);
+    globals._pollEventQueue___49010 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48753.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48753.continuations = [  ]
+_main___P48754.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48754.continuations = [  ]
 
-function _main___P48753_mk(s) {
+function _main___P48754_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48753, depth: s.depth + 1,
+        parent: s, fn: _main___P48754, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48753_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48753
+return _main___P48754
 })

package/libs/light-spectrum-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P98602(s) {
+function _main___P98605(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___98845 = (undefined);
-    globals._pollEventQueue___98858 = (undefined);
+    globals._intervals___98848 = (undefined);
+    globals._pollEventQueue___98861 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98602.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98602.continuations = [  ]
+_main___P98605.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98605.continuations = [  ]
 
-function _main___P98602_mk(s) {
+function _main___P98605_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98602, depth: s.depth + 1,
+        parent: s, fn: _main___P98605, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98602_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98602
+return _main___P98605
 })

package/libs/lora/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P60066(s) {
+function _main___P60067(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___60309 = (undefined);
-    globals._pollEventQueue___60322 = (undefined);
+    globals._intervals___60310 = (undefined);
+    globals._pollEventQueue___60323 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P60066.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P60066.continuations = [  ]
+_main___P60067.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P60067.continuations = [  ]
 
-function _main___P60066_mk(s) {
+function _main___P60067_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P60066, depth: s.depth + 1,
+        parent: s, fn: _main___P60067, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P60066_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P60066
+return _main___P60067
 })

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P192086(s) {
+function _main___P192099(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___192329 = (undefined);
-    globals._pollEventQueue___192342 = (undefined);
+    globals._intervals___192342 = (undefined);
+    globals._pollEventQueue___192355 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P192086.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P192086.continuations = [  ]
+_main___P192099.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P192099.continuations = [  ]
 
-function _main___P192086_mk(s) {
+function _main___P192099_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P192086, depth: s.depth + 1,
+        parent: s, fn: _main___P192099, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P192086_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P192086
+return _main___P192099
 })