pxt-common-packages 10.1.6 → 10.1.7

package/libs/core/hf2.cpp

@@ -267,9 +267,11 @@ static void copy_words(void *dst0, const void *src0, uint32_t n_words) {
 #if defined(NRF52840) || defined(NRF52833)
 #define DBL_TAP_PTR ((volatile uint32_t *)0x20007F7C)
 #endif
+#ifdef DBL_TAP_PTR
 #define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef
 #define QUICK_BOOT(v) *DBL_TAP_PTR = v ? DBL_TAP_MAGIC_QUICK_BOOT : 0
 #endif
+#endif
 
 static HF2 *jdLogger;
 static void jdLog(const uint8_t *frame) {
@@ -279,7 +281,7 @@ static void jdLog(const uint8_t *frame) {
 void HF2::pokeSend() {
 #ifdef USB_EP_FLAG_ASYNC
     target_disable_irq();
-    if (pendingWrite && in->canWrite()) {
+    while (pendingWrite && in->canWrite()) {
         in->flags |= USB_EP_FLAG_ASYNC;
 
         int size = pendingWrite->size - pendingWritePtr;
@@ -291,7 +293,8 @@ void HF2::pokeSend() {
             s = size;
             buf[0] = pendingWrite->flag;
         } else {
-            buf[0] = pendingWrite->flag == HF2_FLAG_CMDPKT_LAST ? HF2_FLAG_CMDPKT_BODY : pendingWrite->flag;
+            buf[0] = pendingWrite->flag == HF2_FLAG_CMDPKT_LAST ? HF2_FLAG_CMDPKT_BODY
+                                                                : pendingWrite->flag;
         }
         buf[0] |= s;
         uint8_t *dst = (uint8_t *)buf;
@@ -364,6 +367,7 @@ int HF2::endpointRequest() {
         target_reset();
         break;
 
+#ifdef QUICK_BOOT
     case HF2_CMD_RESET_INTO_APP:
         QUICK_BOOT(1);
         NVIC_SystemReset();
@@ -372,6 +376,12 @@ int HF2::endpointRequest() {
         QUICK_BOOT(0);
         NVIC_SystemReset();
         break;
+#else
+    case HF2_CMD_RESET_INTO_APP:
+        NVIC_SystemReset();
+        break;
+    // reset into bootloader not supported
+#endif
 
 #if USB_HANDOVER
     case HF2_CMD_START_FLASH:

package/libs/core---rp2040/platform.h

@@ -28,7 +28,6 @@
 #define CODAL_I2C RP2040I2C
 #define CODAL_TIMER Timer
 
-#define QUICK_BOOT(v) ((void)0) // not supported
 #define UF2_INFO_TXT "UF2 Bootloader v1.0\nModel: Raspberry Pi RP2\nBoard-ID: RPI-RP2"
 
 typedef uint8_t PinName;

package/libs/core---stm32/platform.h

@@ -40,8 +40,6 @@ struct F4_Settings {
     do {                                                                                           \
         RTC->BKP0R = v ? APP_RTC_SIGNATURE : HF2_RTC_SIGNATURE;                                    \
     } while (0)
-#else
-#define QUICK_BOOT(v) ((void)0)
 #endif
 
 #define PAGE_SIZE 1024 // not really

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-common-packages",
-  "version": "10.1.6",
+  "version": "10.1.7",
   "description": "Microsoft MakeCode (PXT) common packages",
   "keywords": [
     "MakeCode",