pxt-common-packages 10.1.5 → 10.1.8

package/libs/core/hf2.cpp

@@ -101,21 +101,54 @@ int HF2::stdRequest(UsbEndpointIn &ctrl, USBSetup &setup) {
     return DEVICE_NOT_SUPPORTED;
 }
 
-// same as in microbit
-#define CTRL_GET_REPORT 0x01
-#define CTRL_SET_REPORT 0x09
-#define CTRL_OUT_REPORT_H 0x2
-#define CTRL_IN_REPORT_H 0x1
+#define HF2_FLAG_EVENT 0x01
 
+REAL_TIME_FUNC
 void HF2::sendBuffer(uint8_t flag, const void *data, unsigned size, uint32_t prepend) {
     if (!CodalUSB::usbInstance->isInitialised())
         return;
 
-    uint32_t buf[64 / 4]; // aligned
+#ifdef USB_EP_FLAG_ASYNC
+    // drop non-responses if too much stuff queued up
+    if (flag != HF2_FLAG_CMDPKT_LAST && pendingWriteSize > 1000)
+        return;
+#endif
+
+    if (flag == HF2_FLAG_EVENT)
+        flag = HF2_FLAG_CMDPKT_LAST;
 
     if (prepend + 1)
         size += 4;
 
+#ifdef USB_EP_FLAG_ASYNC
+    HF2_PendingWrite *e = (HF2_PendingWrite *)malloc(sizeof(HF2_PendingWrite) + size);
+    e->size = size;
+    e->flag = flag;
+    e->next = NULL;
+    uint8_t *dst = e->data;
+    if (prepend + 1) {
+        memcpy(dst, &prepend, 4);
+        dst += 4;
+        size -= 4;
+    }
+    memcpy(dst, data, size);
+
+    target_disable_irq();
+    auto p = this->pendingWrite;
+    if (!p)
+        this->pendingWrite = e;
+    else {
+        while (p->next)
+            p = p->next;
+        p->next = e;
+    }
+    this->pendingWriteSize += 16 + e->size;
+    target_enable_irq();
+
+    pokeSend();
+#else
+    uint32_t buf[64 / 4]; // aligned
+
     target_disable_irq();
     while (size > 0) {
         memset(buf + 1, 0, 60);
@@ -143,6 +176,7 @@ void HF2::sendBuffer(uint8_t flag, const void *data, unsigned size, uint32_t pre
         in->write(buf, sizeof(buf));
     }
     target_enable_irq();
+#endif
 }
 
 const InterfaceInfo *HF2::getInterfaceInfo() {
@@ -154,7 +188,7 @@ const InterfaceInfo *HF2::getInterfaceInfo() {
 }
 
 int HF2::sendEvent(uint32_t evId, const void *data, int size) {
-    sendBuffer(HF2_FLAG_CMDPKT_LAST, data, size, evId);
+    sendBuffer(HF2_FLAG_EVENT, data, size, evId);
     return 0;
 }
 
@@ -231,18 +265,64 @@ static void copy_words(void *dst0, const void *src0, uint32_t n_words) {
 #define DBL_TAP_PTR ((volatile uint32_t *)(HSRAM_ADDR + HSRAM_SIZE - 4))
 #endif
 #if defined(NRF52840) || defined(NRF52833)
-#define DBL_TAP_PTR ((volatile uint32_t*)0x20007F7C)
+#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) {
     jdLogger->sendEvent(HF2_EV_JDS_PACKET, frame, frame[2] + 12);
 }
 
+void HF2::pokeSend() {
+#ifdef USB_EP_FLAG_ASYNC
+    target_disable_irq();
+    while (pendingWrite && in->canWrite()) {
+        in->flags |= USB_EP_FLAG_ASYNC;
+
+        int size = pendingWrite->size - pendingWritePtr;
+        usb_assert(size > 0);
+        uint32_t buf[64 / 4] = {0};
+
+        int s = 63;
+        if (size <= 63) {
+            s = size;
+            buf[0] = pendingWrite->flag;
+        } else {
+            buf[0] = pendingWrite->flag == HF2_FLAG_CMDPKT_LAST ? HF2_FLAG_CMDPKT_BODY
+                                                                : pendingWrite->flag;
+        }
+        buf[0] |= s;
+        uint8_t *dst = (uint8_t *)buf;
+        dst++;
+        memcpy(dst, pendingWrite->data + pendingWritePtr, s);
+
+        int r = in->write(buf, sizeof(buf));
+        if (r == 0) {
+            if (s == size) {
+                pendingWritePtr = 0;
+                pendingWriteSize -= 16 + pendingWrite->size;
+                HF2_PendingWrite *n = pendingWrite->next;
+                free(pendingWrite);
+                pendingWrite = n;
+            } else {
+                pendingWritePtr += s;
+            }
+        }
+    }
+    target_enable_irq();
+#endif
+}
+
 int HF2::endpointRequest() {
+#ifdef USB_EP_FLAG_ASYNC
+    pokeSend();
+#endif
+
     int sz = recv();
 
     if (!sz)
@@ -287,6 +367,7 @@ int HF2::endpointRequest() {
         target_reset();
         break;
 
+#ifdef QUICK_BOOT
     case HF2_CMD_RESET_INTO_APP:
         QUICK_BOOT(1);
         NVIC_SystemReset();
@@ -295,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:
@@ -369,6 +456,11 @@ int HF2::endpointRequest() {
 
 HF2::HF2(HF2_Buffer &p) : gotSomePacket(false), ctrlWaiting(false), pkt(p), useHID(false) {
     lastExchange = 0;
+#ifdef USB_EP_FLAG_ASYNC
+    pendingWrite = NULL;
+    pendingWriteSize = 0;
+    pendingWritePtr = 0;
+#endif
 }
 
 static const InterfaceInfo dummyIfaceInfo = {

package/libs/core/hf2.h

@@ -21,11 +21,25 @@ typedef struct {
     };
 } HF2_Buffer;
 
+struct HF2_PendingWrite {
+    HF2_PendingWrite *next;
+    uint16_t size;
+    uint8_t flag;
+    uint8_t _reserved;
+    uint8_t data[0];
+};
+
 class HF2 : public CodalUSBInterface {
     bool gotSomePacket;
     bool ctrlWaiting;
     uint32_t lastExchange;
 
+#ifdef USB_EP_FLAG_ASYNC
+    HF2_PendingWrite *pendingWrite;
+    int pendingWriteSize;
+    int pendingWritePtr;
+#endif
+
   public:
     HF2_Buffer &pkt;
 
@@ -36,6 +50,7 @@ class HF2 : public CodalUSBInterface {
     int sendResponseWithData(const void *data, int size);
     int sendEvent(uint32_t evId, const void *data, int size);
     void sendBuffer(uint8_t flag, const void *data, unsigned size, uint32_t prepend = -1);
+    void pokeSend();
 
     HF2(HF2_Buffer &pkt);
     virtual int endpointRequest();

package/libs/core/pxt.h

@@ -44,6 +44,11 @@ using namespace codal;
 
 #define PXT_COMM_BASE 0x20002000 // 8k in
 
+// old codal compat
+#ifndef REAL_TIME_FUNC
+#define REAL_TIME_FUNC /* */
+#endif
+
 namespace pxt {
 
 #if CONFIG_ENABLED(DEVICE_USB)

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

@@ -4,26 +4,54 @@
 
 #include "hardware/pll.h"
 #include "hardware/clocks.h"
+#include "hardware/structs/rosc.h"
 
 namespace pxt {
 
 LowLevelTimer *allocateTimer() {
-  // TODO: add config to low level timer
-  return new RP2040LowLevelTimer();
+    // TODO: add config to low level timer
+    return new RP2040LowLevelTimer();
 }
 
-static void initRandomSeed() {
-  uint32_t f_rosc = frequency_count_khz(CLOCKS_FC0_SRC_VALUE_ROSC_CLKSRC);
-  seedRandom(f_rosc);
+static uint32_t hw_random(void) {
+    uint8_t buf[16];
+    for (unsigned i = 0; i < sizeof(buf); ++i) {
+        buf[i] = 0;
+        for (int j = 0; j < 8; ++j) {
+            buf[i] <<= 1;
+            if (rosc_hw->randombit)
+                buf[i] |= 1;
+        }
+    }
+    return hash_fnv1(buf, sizeof(buf));
 }
 
-void deepSleep() {
-
+static void initRandomSeed() {
+    seedRandom(hw_random());
 }
 
+void deepSleep() {}
+
 void platform_init() {
-  initRandomSeed();
+    initRandomSeed();
+}
 
+int *getBootloaderConfigData() {
+    static bool inited;
+    static int *cached;
+
+    if (!inited) {
+        inited = 1;
+        for (int i = 1; i <= 64; i *= 2) {
+            uint32_t *p = (uint32_t *)(XIP_BASE + i * 1024 * 1024 - 4096);
+            if (p[0] == CFG_MAGIC0 && p[1] == CFG_MAGIC1) {
+                cached = (int *)p;
+                break;
+            }
+        }
+    }
+
+    return cached;
 }
 
 } // namespace pxt

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/libs/datalogger/built/debug/binary.js

@@ -58,7 +58,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P57685(s) {
+function _main___P57725(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68,20 +68,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___57928 = (undefined);
-    globals._pollEventQueue___57941 = (undefined);
+    globals._intervals___57968 = (undefined);
+    globals._pollEventQueue___57981 = (undefined);
     r0 = pxsim.storage.init();
-    globals._headers___58146 = (undefined);
-    globals._row___58150 = (undefined);
-    r0 = pxsim_pxtcore_mkClassInstance(datalogger_FileStorage__C58177_VT);
+    globals._headers___58186 = (undefined);
+    globals._row___58190 = (undefined);
+    r0 = pxsim_pxtcore_mkClassInstance(datalogger_FileStorage__C58217_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = datalogger_FileStorage_constructor__P58183_mk(s);
+    s.tmp_1 = datalogger_FileStorage_constructor__P58223_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = "log.csv";
     s.callLocIdx = 3; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.tmp_2 = datalogger_setStorage__P58170_mk(s);
+    s.tmp_2 = datalogger_setStorage__P58210_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.callLocIdx = 4; s.pc = 2; return s.tmp_2;
   case 2:
@@ -90,13 +90,13 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-_main___P57685.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
-_main___P57685.continuations = [  ]
+_main___P57725.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"targetoverrides.ts","functionName":"<main>","argumentNames":[]}
+_main___P57725.continuations = [  ]
 
-function _main___P57685_mk(s) {
+function _main___P57725_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P57685, depth: s.depth + 1,
+        parent: s, fn: _main___P57725, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -107,7 +107,7 @@ function _main___P57685_mk(s) {
 
 
 
-function datalogger_FileStorage_constructor__P58183(s) {
+function datalogger_FileStorage_constructor__P58223(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -123,19 +123,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, datalogger_FileStorage__C58177_VT)) failedCast(r0);
+    if (!checkSubtype(r0, datalogger_FileStorage__C58217_VT)) failedCast(r0);
     r0 = undefined;
     r0 = (s.arg0).fields["filename"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-datalogger_FileStorage_constructor__P58183.info = {"start":192,"length":99,"line":7,"column":8,"endLine":10,"endColumn":9,"fileName":"storagedatalogger.ts","functionName":"inline","argumentNames":["this","filename"]}
+datalogger_FileStorage_constructor__P58223.info = {"start":192,"length":99,"line":7,"column":8,"endLine":10,"endColumn":9,"fileName":"storagedatalogger.ts","functionName":"inline","argumentNames":["this","filename"]}
 
-function datalogger_FileStorage_constructor__P58183_mk(s) {
+function datalogger_FileStorage_constructor__P58223_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: datalogger_FileStorage_constructor__P58183, depth: s.depth + 1,
+        parent: s, fn: datalogger_FileStorage_constructor__P58223, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -145,7 +145,7 @@ function datalogger_FileStorage_constructor__P58183_mk(s) {
 
 
 
-function datalogger_Storage_constructor__P58144(s) {
+function datalogger_Storage_constructor__P58184(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -160,17 +160,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, datalogger_Storage__C58139_VT)) failedCast(r0);
+    if (!checkSubtype(r0, datalogger_Storage__C58179_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-datalogger_Storage_constructor__P58144.info = {"start":412,"length":25,"line":20,"column":8,"endLine":21,"endColumn":9,"fileName":"datalogger.ts","functionName":"inline","argumentNames":["this"]}
+datalogger_Storage_constructor__P58184.info = {"start":412,"length":25,"line":20,"column":8,"endLine":21,"endColumn":9,"fileName":"datalogger.ts","functionName":"inline","argumentNames":["this"]}
 
-function datalogger_Storage_constructor__P58144_mk(s) {
+function datalogger_Storage_constructor__P58184_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: datalogger_Storage_constructor__P58144, depth: s.depth + 1,
+        parent: s, fn: datalogger_Storage_constructor__P58184, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -179,7 +179,7 @@ function datalogger_Storage_constructor__P58144_mk(s) {
 
 
 
-function datalogger_setStorage__P58170(s) {
+function datalogger_setStorage__P58210(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -193,12 +193,12 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = datalogger_flush__P58171_mk(s);
+    s.tmp_0 = datalogger_flush__P58211_mk(s);
     s.callLocIdx = 0; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    globals._storage___58152 = (s.arg0);
-    s.tmp_0 = datalogger_clear__P58165_mk(s);
+    globals._storage___58192 = (s.arg0);
+    s.tmp_0 = datalogger_clear__P58205_mk(s);
     s.callLocIdx = 1; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
@@ -206,12 +206,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-datalogger_setStorage__P58170.info = {"start":4000,"length":114,"line":151,"column":4,"endLine":155,"endColumn":5,"fileName":"datalogger.ts","functionName":"setStorage","argumentNames":["storage"]}
+datalogger_setStorage__P58210.info = {"start":4000,"length":114,"line":151,"column":4,"endLine":155,"endColumn":5,"fileName":"datalogger.ts","functionName":"setStorage","argumentNames":["storage"]}
 
-function datalogger_setStorage__P58170_mk(s) {
+function datalogger_setStorage__P58210_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: datalogger_setStorage__P58170, depth: s.depth + 1,
+        parent: s, fn: datalogger_setStorage__P58210, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -221,7 +221,7 @@ function datalogger_setStorage__P58170_mk(s) {
 
 
 
-function datalogger_clear__P58165(s) {
+function datalogger_clear__P58205(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -231,18 +231,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._headers___58146 = (undefined);
-    globals._row___58150 = (undefined);
+    globals._headers___58186 = (undefined);
+    globals._row___58190 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-datalogger_clear__P58165.info = {"start":1145,"length":80,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"datalogger.ts","functionName":"clear","argumentNames":[]}
+datalogger_clear__P58205.info = {"start":1145,"length":80,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"datalogger.ts","functionName":"clear","argumentNames":[]}
 
-function datalogger_clear__P58165_mk(s) {
+function datalogger_clear__P58205_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: datalogger_clear__P58165, depth: s.depth + 1,
+        parent: s, fn: datalogger_clear__P58205, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -250,7 +250,7 @@ function datalogger_clear__P58165_mk(s) {
 
 
 
-function datalogger_flush__P58171(s) {
+function datalogger_flush__P58211(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -260,21 +260,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = r0 = globals._headers___58146;
+    s.tmp_0 = r0 = globals._headers___58186;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals._storage___58152;
+    r0 = globals._storage___58192;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = datalogger_Storage__C58139_v0_1_mk(s);
-    s.tmp_2.arg0 = globals._storage___58152;
-    if (!checkSubtype(s.tmp_2.arg0, datalogger_Storage__C58139_VT)) failedCast(s.tmp_2.arg0);
+    s.tmp_2 = datalogger_Storage__C58179_v0_1_mk(s);
+    s.tmp_2.arg0 = globals._storage___58192;
+    if (!checkSubtype(s.tmp_2.arg0, datalogger_Storage__C58179_VT)) failedCast(s.tmp_2.arg0);
     s.tmp_2.fn = s.tmp_2.arg0.vtable.methods.flush;
     s.pc = 5; return s.tmp_2;
   case 5:
@@ -285,12 +285,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-datalogger_flush__P58171.info = {"start":4184,"length":95,"line":161,"column":4,"endLine":164,"endColumn":5,"fileName":"datalogger.ts","functionName":"flush","argumentNames":[]}
+datalogger_flush__P58211.info = {"start":4184,"length":95,"line":161,"column":4,"endLine":164,"endColumn":5,"fileName":"datalogger.ts","functionName":"flush","argumentNames":[]}
 
-function datalogger_flush__P58171_mk(s) {
+function datalogger_flush__P58211_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: datalogger_flush__P58171, depth: s.depth + 1,
+        parent: s, fn: datalogger_flush__P58211, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -301,7 +301,7 @@ function datalogger_flush__P58171_mk(s) {
 
 
 
-function datalogger_Storage_flush__P58143(s) {
+function datalogger_Storage_flush__P58183(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -316,17 +316,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, datalogger_Storage__C58139_VT)) failedCast(r0);
+    if (!checkSubtype(r0, datalogger_Storage__C58179_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-datalogger_Storage_flush__P58143.info = {"start":807,"length":17,"line":37,"column":8,"endLine":37,"endColumn":25,"fileName":"datalogger.ts","functionName":"flush","argumentNames":["this"]}
+datalogger_Storage_flush__P58183.info = {"start":807,"length":17,"line":37,"column":8,"endLine":37,"endColumn":25,"fileName":"datalogger.ts","functionName":"flush","argumentNames":["this"]}
 
-function datalogger_Storage_flush__P58143_mk(s) {
+function datalogger_Storage_flush__P58183_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: datalogger_Storage_flush__P58143, depth: s.depth + 1,
+        parent: s, fn: datalogger_Storage_flush__P58183, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -335,7 +335,7 @@ function datalogger_Storage_flush__P58143_mk(s) {
 
 
 
-function datalogger_FileStorage_flush__P58182(s) {
+function datalogger_FileStorage_flush__P58222(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -350,17 +350,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, datalogger_FileStorage__C58177_VT)) failedCast(r0);
+    if (!checkSubtype(r0, datalogger_FileStorage__C58217_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-datalogger_FileStorage_flush__P58182.info = {"start":1121,"length":27,"line":38,"column":8,"endLine":40,"endColumn":9,"fileName":"storagedatalogger.ts","functionName":"flush","argumentNames":["this"]}
+datalogger_FileStorage_flush__P58222.info = {"start":1121,"length":27,"line":38,"column":8,"endLine":40,"endColumn":9,"fileName":"storagedatalogger.ts","functionName":"flush","argumentNames":["this"]}
 
-function datalogger_FileStorage_flush__P58182_mk(s) {
+function datalogger_FileStorage_flush__P58222_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: datalogger_FileStorage_flush__P58182, depth: s.depth + 1,
+        parent: s, fn: datalogger_FileStorage_flush__P58222, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -368,7 +368,7 @@ function datalogger_FileStorage_flush__P58182_mk(s) {
 
 
 
-function datalogger_Storage__C58139_v0_1_mk(s) {
+function datalogger_Storage__C58179_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -381,36 +381,36 @@ function datalogger_Storage__C58139_v0_1_mk(s) {
   arg0: undefined,
 } }
 
-const datalogger_Storage__C58139_VT = mkVTable({
+const datalogger_Storage__C58179_VT = mkVTable({
   name: "Storage",
   numFields: 0,
   classNo: 16,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "flush": datalogger_Storage_flush__P58143,
+    "flush": datalogger_Storage_flush__P58183,
   },
   iface: {
-    "flush": datalogger_Storage_flush__P58143,
+    "flush": datalogger_Storage_flush__P58183,
   },
 });
-const datalogger_FileStorage__C58177_VT = mkVTable({
+const datalogger_FileStorage__C58217_VT = mkVTable({
   name: "FileStorage",
   numFields: 1,
   classNo: 17,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "flush": datalogger_FileStorage_flush__P58182,
+    "flush": datalogger_FileStorage_flush__P58222,
   },
   iface: {
     "filename": null,
     "set/filename": null,
-    "flush": datalogger_FileStorage_flush__P58182,
+    "flush": datalogger_FileStorage_flush__P58222,
   },
 });
 
-const breakpoints = setupDebugger(1, ["_headers___58146","_row___58150","_storage___58152"])
+const breakpoints = setupDebugger(1, ["_headers___58186","_row___58190","_storage___58192"])
 
-return _main___P57685
+return _main___P57725
 })