Merge branch 'master' into kiki-lee-very-eom

microsoft · Jun 3, 2024 · dd9e238 · dd9e238
2 parents af8acee + dc5d7c3
commit dd9e238
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 3 deletions.
diff --git a/docs/beginner-maps.md b/docs/beginner-maps.md
@@ -14,7 +14,7 @@
   "imageUrl":  "/static/skillmap/backgrounds/story-map.png",
   "url": "https://arcade.makecode.com/--skillmap#story",
   "label": "New? Try This!",
-  "labelClass": "purple ribbon large",
+  "labelClass": "orange ribbon large",
   "directOpen": true
 },
 {

diff --git a/docs/skillmaps.md b/docs/skillmaps.md
@@ -12,7 +12,7 @@
   "imageUrl":  "/static/skillmap/backgrounds/beginner.png",
   "url": "https://arcade.makecode.com/--skillmap#beginner",
   "label": "New? Try This!",
-  "labelClass": "purple ribbon large",
+  "labelClass": "orange ribbon large",
   "directOpen": true
 },
 {

diff --git a/docs/tutorials.md b/docs/tutorials.md
@@ -14,7 +14,7 @@
   "imageUrl": "/static/tutorials/interface/info.png",
   "largeImageUrl": "/static/tutorials/interface/info.png",
   "label": "New? Try This!",
-  "labelClass": "purple ribbon large"
+  "labelClass": "orange ribbon large"
 },{
   "name": "Chase the Pizza",
   "description": "Get started creating a simple game to chase a pizza around the screen and collect as many points as possible before time runs out!",

diff --git a/libs/core---nrf52/dal.d.ts b/libs/core---nrf52/dal.d.ts
@@ -680,6 +680,7 @@ declare const enum DAL {
     CFG_PIN_WIFI_AT_TX = 91,
     CFG_PIN_WIFI_AT_RX = 92,
     CFG_PIN_USB_POWER = 93,
+    CFG_DISPLAY_DELAY = 94,
     ACCELEROMETER_TYPE_LIS3DH = 50,
     ACCELEROMETER_TYPE_LIS3DH_ALT = 48,
     ACCELEROMETER_TYPE_MMA8453 = 56,

diff --git a/libs/core---rp2040/dal.d.ts b/libs/core---rp2040/dal.d.ts
@@ -762,6 +762,7 @@ declare const enum DAL {
     CFG_PIN_WIFI_AT_TX = 91,
     CFG_PIN_WIFI_AT_RX = 92,
     CFG_PIN_USB_POWER = 93,
+    CFG_DISPLAY_DELAY = 94,
     ACCELEROMETER_TYPE_LIS3DH = 50,
     ACCELEROMETER_TYPE_LIS3DH_ALT = 48,
     ACCELEROMETER_TYPE_MMA8453 = 56,

diff --git a/libs/core---samd/dal.d.ts b/libs/core---samd/dal.d.ts
@@ -678,6 +678,7 @@ declare const enum DAL {
     CFG_PIN_WIFI_AT_TX = 91,
     CFG_PIN_WIFI_AT_RX = 92,
     CFG_PIN_USB_POWER = 93,
+    CFG_DISPLAY_DELAY = 94,
     ACCELEROMETER_TYPE_LIS3DH = 50,
     ACCELEROMETER_TYPE_LIS3DH_ALT = 48,
     ACCELEROMETER_TYPE_MMA8453 = 56,

diff --git a/libs/core---stm32/dal.d.ts b/libs/core---stm32/dal.d.ts
@@ -680,6 +680,7 @@ declare const enum DAL {
     CFG_PIN_WIFI_AT_TX = 91,
     CFG_PIN_WIFI_AT_RX = 92,
     CFG_PIN_USB_POWER = 93,
+    CFG_DISPLAY_DELAY = 94,
     ACCELEROMETER_TYPE_LIS3DH = 50,
     ACCELEROMETER_TYPE_LIS3DH_ALT = 48,
     ACCELEROMETER_TYPE_MMA8453 = 56,

diff --git a/libs/core/dal.d.ts b/libs/core/dal.d.ts
@@ -678,6 +678,7 @@ declare const enum DAL {
     CFG_PIN_WIFI_AT_TX = 91,
     CFG_PIN_WIFI_AT_RX = 92,
     CFG_PIN_USB_POWER = 93,
+    CFG_DISPLAY_DELAY = 94,
     ACCELEROMETER_TYPE_LIS3DH = 50,
     ACCELEROMETER_TYPE_LIS3DH_ALT = 48,
     ACCELEROMETER_TYPE_MMA8453 = 56,

diff --git a/libs/hw---n3/config.ts b/libs/hw---n3/config.ts
@@ -27,6 +27,7 @@ namespace config {
 
     export const DISPLAY_WIDTH = 160
     export const DISPLAY_HEIGHT = 128
+    export const DISPLAY_DELAY = 300
 
     export const DISPLAY_TYPE = 4242 // smart display
 

diff --git a/libs/screen---st7735/targetoverrides.ts b/libs/screen---st7735/targetoverrides.ts
@@ -5,6 +5,11 @@
 //% groups=["0.","1#","2T","3t","4N","5n","6G","7g","8","9","aAR","bBP","cCp","dDO","eEY","fFW"]
 function img(lits: any, ...args: any[]): Image { return null }
 
+// this wait needed in case of an ESD event for arcade shield
+const delay = control.getConfigValue(DAL.CFG_DISPLAY_DELAY, 0)
+if (delay > 0)
+    control.waitMicros(delay * 1000)
+
 // set palette before creating screen, so the JS version has the right BPP
 image.setPalette(hex`__palette`)
 //% whenUsed