almost there???

microsoft · Jan 23, 2024 · 86d9436 · 86d9436
1 parent 4f4125e
commit 86d9436
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 38 deletions.
diff --git a/libs/core/codal.cpp b/libs/core/codal.cpp
@@ -56,7 +56,7 @@ void platform_init() {
     seedRandom(seed);
 }
 
-void initMicrobitGC() {
+void initfbitGC() {
     uBit.init();
     if (device_heap_size(1) > NON_GC_HEAP_RESERVATION + 4)
         gcPreAllocateBlock(device_heap_size(1) - NON_GC_HEAP_RESERVATION);

diff --git a/libs/st7735/_locales/st7735-jsdoc-strings.json b/libs/st7735/_locales/st7735-jsdoc-strings.json
@@ -43,10 +43,5 @@
   "images._image": "An image",
   "images._image|param|image": "the image",
   "img": "Tagged image literal converter",
-  "pins": "Control currents in Pins for analog/digital signals, servos, i2c, ...",
-  "pins.createBuffer": "Create a new zero-initialized buffer.",
-  "pins.createBuffer|param|size": "number of bytes in the buffer",
-  "pins.pinByCfg": "Get a pin by configuration id (DAL.CFG_PIN...)",
-  "pins.pulseDuration": "Get the duration of the last pulse in microseconds. This function should be called from a ``onPulsed`` handler.\n\nGet the duration of the last pulse in microseconds. This function should be called from a\n``onPulsed`` handler.",
   "simage.screenImage": "Get the screen image"
 }
diff --git a/libs/st7735/_locales/st7735-strings.json b/libs/st7735/_locales/st7735-strings.json
@@ -20,16 +20,13 @@
   "images._tile|block": "%tile",
   "images|block": "images",
   "image|block": "image",
-  "pins.pulseDuration|block": "pulse duration (µs)",
-  "pins|block": "pins",
   "simage.create|block": "create image width %width height %height",
   "simage.screenImage|block": "screen",
   "simage|block": "simage",
   "{id:category}Control": "Control",
   "{id:category}Helpers": "Helpers",
   "{id:category}Image": "Image",
   "{id:category}Images": "Images",
-  "{id:category}Pins": "Pins",
   "{id:category}SImage": "SImage",
   "{id:category}Scene": "Scene",
   "{id:category}ScreenImage": "ScreenImage",
@@ -40,7 +37,6 @@
   "{id:group}Compare": "Compare",
   "{id:group}Create": "Create",
   "{id:group}Drawing": "Drawing",
-  "{id:group}Pulse": "Pulse",
   "{id:group}Tiles": "Tiles",
   "{id:group}Transformations": "Transformations"
 }
diff --git a/libs/st7735/config_nrf.h b/libs/st7735/config_nrf.h
@@ -44,6 +44,10 @@
 //#define CODAL_TIMER Timer
 //#define CODAL_SERIAL NRF52Serial
 
+#define PXT_INTERNAL_KEY_UP 2050
+#define PXT_INTERNAL_KEY_DOWN 2051
+#define DEVICE_ID_FIRST_BUTTON 4000
+
 typedef CODAL_PIN DevicePin;
 
 typedef DevicePin *DigitalInOutPin;

diff --git a/libs/st7735/jddisplay.cpp b/libs/st7735/jddisplay.cpp
@@ -2,8 +2,7 @@
 
 #include "jddisplay.h"
 
-#define PXT_INTERNAL_KEY_UP 2050
-#define PXT_INTERNAL_KEY_DOWN 2051
+#include "config_nrf.h"
 
 #define VLOG NOLOG
 //#define VLOG DMESG
@@ -239,7 +238,7 @@ void JDDisplay::step() {
 
     memset(&sendFrame, 0, JD_SERIAL_FULL_HEADER_SIZE);
     sendFrame.crc = JDSPI_MAGIC;
-    sendFrame.device_identifier = device.getLongSerialNumber();
+    sendFrame.device_identifier = device.getSerialNumber();
 
     if (recvFrame.crc == JDSPI_MAGIC_NOOP) {
         // empty frame, skip
@@ -284,7 +283,7 @@ void JDDisplay::step() {
 
         if (soundServiceNum) {
             // we only need this for sending sound
-            uint32_t now = (uint32_t)(pxt::micros());
+            uint32_t now = (uint32_t)(pxt::current_time_ms());
             if (lastFrameTimestamp) {
                 uint32_t thisFrame = now - lastFrameTimestamp;
                 avgFrameTime = (avgFrameTime * 15 + thisFrame) >> 4;

diff --git a/libs/st7735/shims.d.ts b/libs/st7735/shims.d.ts
@@ -149,29 +149,5 @@ declare namespace image {
     //% shim=image::doubledIcon
     function doubledIcon(icon: Buffer): Buffer;
 }
-declare namespace pins {
-
-    /**
-     * Get a pin by configuration id (DAL.CFG_PIN...)
-     */
-    //% shim=pins::pinByCfg
-    function pinByCfg(key: int32): DigitalInOutPin;
-
-    /**
-     * Create a new zero-initialized buffer.
-     * @param size number of bytes in the buffer
-     */
-    //% shim=pins::createBuffer
-    function createBuffer(size: int32): Buffer;
-
-    /**
-     * Get the duration of the last pulse in microseconds. This function should be called from a
-     * ``onPulsed`` handler.
-     */
-    //% help=pins/pulse-duration blockGap=8
-    //% blockId=pins_pulse_duration block="pulse duration (µs)"
-    //% weight=19 shim=pins::pulseDuration
-    function pulseDuration(): int32;
-}
 
 // Auto-generated. Do not edit. Really.