rp2040js 0.19.2 → 0.19.4

package/dist/cjs/index.d.ts

@@ -1,11 +1,11 @@
 export { GDBConnection } from './gdb/gdb-connection.js';
 export { GDBServer } from './gdb/gdb-server.js';
 export { GPIOPin, GPIOPinState } from './gpio-pin.js';
-export { BasePeripheral, Peripheral } from './peripherals/peripheral.js';
+export { BasePeripheral, type Peripheral } from './peripherals/peripheral.js';
 export { RPI2C, I2CSpeed, I2CMode } from './peripherals/i2c.js';
 export { RPUSBController } from './peripherals/usb.js';
 export { RP2040 } from './rp2040.js';
 export { USBCDC } from './usb/cdc.js';
-export { DataDirection, DescriptorType, ISetupPacketParams, SetupRecipient, SetupRequest, SetupType, } from './usb/interfaces.js';
+export { DataDirection, DescriptorType, type ISetupPacketParams, SetupRecipient, SetupRequest, SetupType, } from './usb/interfaces.js';
 export { createSetupPacket, getDescriptorPacket, setDeviceAddressPacket, setDeviceConfigurationPacket, } from './usb/setup.js';
-export { ConsoleLogger, Logger, LogLevel } from './utils/logging.js';
+export { ConsoleLogger, type Logger, LogLevel } from './utils/logging.js';

package/dist/cjs/peripherals/i2c.d.ts

@@ -28,6 +28,10 @@ export declare class RPI2C extends BasePeripheral implements Peripheral {
     rxThreshold: number;
     txThreshold: number;
     control: number;
+    ssClockHighPeriod: number;
+    ssClockLowPeriod: number;
+    fsClockHighPeriod: number;
+    fsClockLowPeriod: number;
     targetAddress: number;
     slaveAddress: number;
     abortSource: number;
@@ -35,6 +39,8 @@ export declare class RPI2C extends BasePeripheral implements Peripheral {
     intEnable: number;
     get intStatus(): number;
     get speed(): I2CSpeed;
+    get sclLowPeriod(): number;
+    get sclHighPeriod(): number;
     get masterBits(): 7 | 10;
     constructor(rp2040: RP2040, name: string, irq: number);
     checkInterrupts(): void;

package/dist/cjs/peripherals/i2c.js

@@ -142,6 +142,12 @@ class RPI2C extends peripheral_js_1.BasePeripheral {
     get speed() {
         return ((this.control >> SPEED_SHIFT) & SPEED_MASK);
     }
+    get sclLowPeriod() {
+        return this.speed === I2CSpeed.Standard ? this.ssClockLowPeriod : this.fsClockLowPeriod;
+    }
+    get sclHighPeriod() {
+        return this.speed === I2CSpeed.Standard ? this.ssClockHighPeriod : this.fsClockHighPeriod;
+    }
     get masterBits() {
         return this.control & IC_10BITADDR_MASTER ? 10 : 7;
     }
@@ -165,6 +171,10 @@ class RPI2C extends peripheral_js_1.BasePeripheral {
         this.rxThreshold = 0;
         this.txThreshold = 0;
         this.control = IC_SLAVE_DISABLE | IC_RESTART_EN | (I2CSpeed.FastMode << SPEED_SHIFT) | MASTER_MODE;
+        this.ssClockHighPeriod = 0x0028;
+        this.ssClockLowPeriod = 0x002f;
+        this.fsClockHighPeriod = 0x0006;
+        this.fsClockLowPeriod = 0x000d;
         this.targetAddress = 0x55;
         this.slaveAddress = 0x55;
         this.abortSource = 0;
@@ -323,6 +333,14 @@ class RPI2C extends peripheral_js_1.BasePeripheral {
                 }
                 this.clearInterrupts(R_RX_FULL);
                 return this.rxFIFO.pull();
+            case IC_SS_SCL_HCNT:
+                return this.ssClockHighPeriod;
+            case IC_SS_SCL_LCNT:
+                return this.ssClockLowPeriod;
+            case IC_FS_SCL_HCNT:
+                return this.fsClockHighPeriod;
+            case IC_FS_SCL_LCNT:
+                return this.fsClockLowPeriod;
             case IC_INTR_STAT:
                 return this.intStatus;
             case IC_INTR_MASK:
@@ -419,6 +437,18 @@ class RPI2C extends peripheral_js_1.BasePeripheral {
                     this.nextCommand();
                 }
                 return;
+            case IC_SS_SCL_HCNT:
+                this.ssClockHighPeriod = value & 0xffff;
+                return;
+            case IC_SS_SCL_LCNT:
+                this.ssClockLowPeriod = value & 0xffff;
+                return;
+            case IC_FS_SCL_HCNT:
+                this.fsClockHighPeriod = value & 0xffff;
+                return;
+            case IC_FS_SCL_LCNT:
+                this.fsClockLowPeriod = value & 0xffff;
+                return;
             case IC_RX_TL:
                 this.rxThreshold = value & 0xff;
                 if (this.rxThreshold > this.rxFIFO.size) {

package/dist/cjs/peripherals/rtc.d.ts

@@ -2,8 +2,6 @@ import { BasePeripheral, Peripheral } from './peripheral.js';
 export declare class RP2040RTC extends BasePeripheral implements Peripheral {
     setup0: number;
     setup1: number;
-    rtc1: number;
-    rtc0: number;
     ctrl: number;
     baseline: Date;
     baselineMicros: number;

package/dist/cjs/peripherals/rtc.js

@@ -44,8 +44,6 @@ class RP2040RTC extends peripheral_js_1.BasePeripheral {
         super(...arguments);
         this.setup0 = 0;
         this.setup1 = 0;
-        this.rtc1 = 0;
-        this.rtc0 = 0;
         this.ctrl = 0;
         this.baseline = new Date(2021, 0, 1);
         this.baselineMicros = 0;

package/dist/cjs/rp2040.d.ts

@@ -14,6 +14,7 @@ import { RPUSBController } from './peripherals/usb.js';
 import { RPSIO } from './sio.js';
 import { Logger } from './utils/logging.js';
 export declare const FLASH_START_ADDRESS = 268435456;
+export declare const FLASH_END_ADDRESS = 335544320;
 export declare const RAM_START_ADDRESS = 536870912;
 export declare const APB_START_ADDRESS = 1073741824;
 export declare const DPRAM_START_ADDRESS = 1343225856;

package/dist/cjs/rp2040.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RP2040 = exports.SIO_START_ADDRESS = exports.DPRAM_START_ADDRESS = exports.APB_START_ADDRESS = exports.RAM_START_ADDRESS = exports.FLASH_START_ADDRESS = void 0;
+exports.RP2040 = exports.SIO_START_ADDRESS = exports.DPRAM_START_ADDRESS = exports.APB_START_ADDRESS = exports.RAM_START_ADDRESS = exports.FLASH_END_ADDRESS = exports.FLASH_START_ADDRESS = void 0;
 const realtime_clock_js_1 = require("./clock/realtime-clock.js");
 const cortex_m0_core_js_1 = require("./cortex-m0-core.js");
 const gpio_pin_js_1 = require("./gpio-pin.js");
@@ -30,6 +30,7 @@ const watchdog_js_1 = require("./peripherals/watchdog.js");
 const sio_js_1 = require("./sio.js");
 const logging_js_1 = require("./utils/logging.js");
 exports.FLASH_START_ADDRESS = 0x10000000;
+exports.FLASH_END_ADDRESS = 0x14000000;
 exports.RAM_START_ADDRESS = 0x20000000;
 exports.APB_START_ADDRESS = 0x40000000;
 exports.DPRAM_START_ADDRESS = 0x50100000;
@@ -188,9 +189,14 @@ class RP2040 {
         if (address < bootrom.length * 4) {
             return bootrom[address / 4];
         }
-        else if (address >= exports.FLASH_START_ADDRESS &&
-            address < exports.FLASH_START_ADDRESS + this.flash.length) {
-            return this.flashView.getUint32(address - exports.FLASH_START_ADDRESS, true);
+        else if (address >= exports.FLASH_START_ADDRESS && address < exports.FLASH_END_ADDRESS) {
+            // Flash is mirrored four times:
+            // - 0x10000000 XIP
+            // - 0x11000000 XIP_NOALLOC
+            // - 0x12000000 XIP_NOCACHE
+            // - 0x13000000 XIP_NOCACHE_NOALLOC
+            const offset = address & 16777215;
+            return this.flashView.getUint32(offset, true);
         }
         else if (address >= exports.RAM_START_ADDRESS && address < exports.RAM_START_ADDRESS + this.sram.length) {
             return this.sramView.getUint32(address - exports.RAM_START_ADDRESS, true);

package/dist/esm/index.d.ts

@@ -1,11 +1,11 @@
 export { GDBConnection } from './gdb/gdb-connection.js';
 export { GDBServer } from './gdb/gdb-server.js';
 export { GPIOPin, GPIOPinState } from './gpio-pin.js';
-export { BasePeripheral, Peripheral } from './peripherals/peripheral.js';
+export { BasePeripheral, type Peripheral } from './peripherals/peripheral.js';
 export { RPI2C, I2CSpeed, I2CMode } from './peripherals/i2c.js';
 export { RPUSBController } from './peripherals/usb.js';
 export { RP2040 } from './rp2040.js';
 export { USBCDC } from './usb/cdc.js';
-export { DataDirection, DescriptorType, ISetupPacketParams, SetupRecipient, SetupRequest, SetupType, } from './usb/interfaces.js';
+export { DataDirection, DescriptorType, type ISetupPacketParams, SetupRecipient, SetupRequest, SetupType, } from './usb/interfaces.js';
 export { createSetupPacket, getDescriptorPacket, setDeviceAddressPacket, setDeviceConfigurationPacket, } from './usb/setup.js';
-export { ConsoleLogger, Logger, LogLevel } from './utils/logging.js';
+export { ConsoleLogger, type Logger, LogLevel } from './utils/logging.js';

package/dist/esm/peripherals/i2c.d.ts

@@ -28,6 +28,10 @@ export declare class RPI2C extends BasePeripheral implements Peripheral {
     rxThreshold: number;
     txThreshold: number;
     control: number;
+    ssClockHighPeriod: number;
+    ssClockLowPeriod: number;
+    fsClockHighPeriod: number;
+    fsClockLowPeriod: number;
     targetAddress: number;
     slaveAddress: number;
     abortSource: number;
@@ -35,6 +39,8 @@ export declare class RPI2C extends BasePeripheral implements Peripheral {
     intEnable: number;
     get intStatus(): number;
     get speed(): I2CSpeed;
+    get sclLowPeriod(): number;
+    get sclHighPeriod(): number;
     get masterBits(): 7 | 10;
     constructor(rp2040: RP2040, name: string, irq: number);
     checkInterrupts(): void;

package/dist/esm/peripherals/i2c.js

@@ -139,6 +139,12 @@ export class RPI2C extends BasePeripheral {
     get speed() {
         return ((this.control >> SPEED_SHIFT) & SPEED_MASK);
     }
+    get sclLowPeriod() {
+        return this.speed === I2CSpeed.Standard ? this.ssClockLowPeriod : this.fsClockLowPeriod;
+    }
+    get sclHighPeriod() {
+        return this.speed === I2CSpeed.Standard ? this.ssClockHighPeriod : this.fsClockHighPeriod;
+    }
     get masterBits() {
         return this.control & IC_10BITADDR_MASTER ? 10 : 7;
     }
@@ -162,6 +168,10 @@ export class RPI2C extends BasePeripheral {
         this.rxThreshold = 0;
         this.txThreshold = 0;
         this.control = IC_SLAVE_DISABLE | IC_RESTART_EN | (I2CSpeed.FastMode << SPEED_SHIFT) | MASTER_MODE;
+        this.ssClockHighPeriod = 0x0028;
+        this.ssClockLowPeriod = 0x002f;
+        this.fsClockHighPeriod = 0x0006;
+        this.fsClockLowPeriod = 0x000d;
         this.targetAddress = 0x55;
         this.slaveAddress = 0x55;
         this.abortSource = 0;
@@ -320,6 +330,14 @@ export class RPI2C extends BasePeripheral {
                 }
                 this.clearInterrupts(R_RX_FULL);
                 return this.rxFIFO.pull();
+            case IC_SS_SCL_HCNT:
+                return this.ssClockHighPeriod;
+            case IC_SS_SCL_LCNT:
+                return this.ssClockLowPeriod;
+            case IC_FS_SCL_HCNT:
+                return this.fsClockHighPeriod;
+            case IC_FS_SCL_LCNT:
+                return this.fsClockLowPeriod;
             case IC_INTR_STAT:
                 return this.intStatus;
             case IC_INTR_MASK:
@@ -416,6 +434,18 @@ export class RPI2C extends BasePeripheral {
                     this.nextCommand();
                 }
                 return;
+            case IC_SS_SCL_HCNT:
+                this.ssClockHighPeriod = value & 0xffff;
+                return;
+            case IC_SS_SCL_LCNT:
+                this.ssClockLowPeriod = value & 0xffff;
+                return;
+            case IC_FS_SCL_HCNT:
+                this.fsClockHighPeriod = value & 0xffff;
+                return;
+            case IC_FS_SCL_LCNT:
+                this.fsClockLowPeriod = value & 0xffff;
+                return;
             case IC_RX_TL:
                 this.rxThreshold = value & 0xff;
                 if (this.rxThreshold > this.rxFIFO.size) {

package/dist/esm/peripherals/rtc.d.ts

@@ -2,8 +2,6 @@ import { BasePeripheral, Peripheral } from './peripheral.js';
 export declare class RP2040RTC extends BasePeripheral implements Peripheral {
     setup0: number;
     setup1: number;
-    rtc1: number;
-    rtc0: number;
     ctrl: number;
     baseline: Date;
     baselineMicros: number;

package/dist/esm/peripherals/rtc.js

@@ -41,8 +41,6 @@ export class RP2040RTC extends BasePeripheral {
         super(...arguments);
         this.setup0 = 0;
         this.setup1 = 0;
-        this.rtc1 = 0;
-        this.rtc0 = 0;
         this.ctrl = 0;
         this.baseline = new Date(2021, 0, 1);
         this.baselineMicros = 0;

package/dist/esm/rp2040.d.ts

@@ -14,6 +14,7 @@ import { RPUSBController } from './peripherals/usb.js';
 import { RPSIO } from './sio.js';
 import { Logger } from './utils/logging.js';
 export declare const FLASH_START_ADDRESS = 268435456;
+export declare const FLASH_END_ADDRESS = 335544320;
 export declare const RAM_START_ADDRESS = 536870912;
 export declare const APB_START_ADDRESS = 1073741824;
 export declare const DPRAM_START_ADDRESS = 1343225856;

package/dist/esm/rp2040.js

@@ -27,6 +27,7 @@ import { RPWatchdog } from './peripherals/watchdog.js';
 import { RPSIO } from './sio.js';
 import { ConsoleLogger, LogLevel } from './utils/logging.js';
 export const FLASH_START_ADDRESS = 0x10000000;
+export const FLASH_END_ADDRESS = 0x14000000;
 export const RAM_START_ADDRESS = 0x20000000;
 export const APB_START_ADDRESS = 0x40000000;
 export const DPRAM_START_ADDRESS = 0x50100000;
@@ -185,9 +186,14 @@ export class RP2040 {
         if (address < bootrom.length * 4) {
             return bootrom[address / 4];
         }
-        else if (address >= FLASH_START_ADDRESS &&
-            address < FLASH_START_ADDRESS + this.flash.length) {
-            return this.flashView.getUint32(address - FLASH_START_ADDRESS, true);
+        else if (address >= FLASH_START_ADDRESS && address < FLASH_END_ADDRESS) {
+            // Flash is mirrored four times:
+            // - 0x10000000 XIP
+            // - 0x11000000 XIP_NOALLOC
+            // - 0x12000000 XIP_NOCACHE
+            // - 0x13000000 XIP_NOCACHE_NOALLOC
+            const offset = address & 16777215;
+            return this.flashView.getUint32(offset, true);
         }
         else if (address >= RAM_START_ADDRESS && address < RAM_START_ADDRESS + this.sram.length) {
             return this.sramView.getUint32(address - RAM_START_ADDRESS, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rp2040js",
-  "version": "0.19.2",
+  "version": "0.19.4",
   "description": "Raspberry Pi Pico (RP2040) Emulator",
   "repository": "https://github.com/wokwi/rp2040js",
   "keywords": [
@@ -48,13 +48,13 @@
     "prepare": "husky install",
     "format:check": "prettier --check **/*.{ts,js} !**/dist/** !**/node_modules/**",
     "lint": "eslint . --ext .ts",
-    "start": "ts-node --esm demo/emulator-run.ts",
-    "start:micropython": "ts-node --esm demo/micropython-run.ts",
-    "start:circuitpython": "ts-node --esm demo/micropython-run.ts --circuitpython",
-    "start:gdbdiff": "ts-node --esm debug/gdbdiff.ts",
+    "start": "tsx demo/emulator-run.ts",
+    "start:micropython": "tsx demo/micropython-run.ts",
+    "start:circuitpython": "tsx demo/micropython-run.ts --circuitpython",
+    "start:gdbdiff": "tsx debug/gdbdiff.ts",
     "test": "vitest run",
     "test:watch": "vitest",
-    "test:micropython-spi": "ts-node --esm test/micropython-spi-test.ts"
+    "test:micropython-spi": "tsx test/micropython-spi-test.ts"
   },
   "devDependencies": {
     "@types/minimist": "^1.2.2",
@@ -67,7 +67,7 @@
     "minimist": "^1.2.7",
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
-    "ts-node": "^10.9.1",
+    "tsx": "^4.6.2",
     "typescript": "^5.2.2",
     "uf2": "^1.0.0",
     "vitest": "^0.34.5"