@springfield/ham-radio-api 17.3.0 → 17.5.0

package/dist/radio/memory-map.d.ts

@@ -38,6 +38,8 @@ export type RadioMemoryMapValueKind = {
 } | {
     kind: "ascii";
     length: number;
+    /** Fill byte for unused character slots (default 0xFF). Kenwood names use 0. */
+    pad?: number;
 } | {
     kind: "digits";
     /** Number of decimal digit bytes. */
@@ -80,6 +82,20 @@ export type RadioMemoryMapValueKind = {
     ctcssMin?: number;
     /** Added to DCS index for reverse polarity (Chirp uses 0x69). */
     reverseOffset?: number;
+} | {
+    /**
+     * CTCSS tone stored as an index into `values` (Hz * 10, Springfield tenths).
+     * Kenwood TH-D74 `rtone` / `ctone` use Chirp TONES order.
+     */
+    kind: "ctcss-index";
+    values: number[];
+} | {
+    /**
+     * DCS code stored as an index into `values`.
+     * Kenwood TH-D74 `dtcs_code` uses Chirp DTCS_CODES order.
+     */
+    kind: "dcs-index";
+    values: number[];
 };
 /** UI metadata for a non-reserved field. */
 export interface RadioMemoryMapFieldUi {
@@ -98,11 +114,11 @@ export interface RadioMemoryMapField {
     id: string;
     /**
      * Storage type:
-     * - u8 / u16: whole bytes (u16 is little-endian, Chirp ul16)
+     * - u8 / u16 / u32: whole bytes (u16/u32 are little-endian, Chirp ul16/ul32)
      * - bits: bitfield of `width` bits within the current byte (MSB-first)
      * - char: ASCII byte (length via value.kind ascii or count)
      */
-    type: "u8" | "u16" | "bits" | "char";
+    type: "u8" | "u16" | "u32" | "bits" | "char";
     /** Bit width when type is bits. */
     width?: number;
     /** When true, skip decode/encode for this padding field. */
@@ -132,6 +148,13 @@ export interface RadioMemoryMapStruct {
      */
     count?: number;
     stride?: number;
+    /**
+     * When set with `groupPad`, instances are packed into groups of `groupSize`
+     * records followed by `groupPad` padding bytes (Kenwood TH-D74: 6 × 40 + 16).
+     */
+    groupSize?: number;
+    /** Padding bytes after each group of `groupSize` records. */
+    groupPad?: number;
     /** Occupancy rule for repeated structs (e.g. empty channel slots). */
     emptyWhen?: RadioMemoryMapEmptyWhen;
     /**
@@ -155,6 +178,12 @@ export interface RadioMemoryMapChannelBindings {
     transmitFrequency: string;
     receiveTone: string;
     transmitTone: string;
+    /**
+     * Optional parallel struct whose fields merge into each channel's settings
+     * (Kenwood TH-D74 flags: used, lockout, group). Occupancy `emptyWhen` on
+     * this struct, when present, also skips the channel.
+     */
+    extras?: string;
 }
 /**
  * Complete memory-map definition for a radio model's settings and channels.

package/dist/radio/memory-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory-map.d.ts","sourceRoot":"","sources":["../../src/radio/memory-map.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memory-map.d.ts","sourceRoot":"","sources":["../../src/radio/memory-map.ts"],"names":[],"mappings":"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"}

package/dist/radio/protocol.d.ts

@@ -5,7 +5,7 @@ import type { RadioMemorySegment } from "./memory-segment.js";
  * - number 0–255: literal byte
  * - hex string such as `"0x50"`: literal byte
  * - single-character string such as `"S"`: ASCII opcode
- * - placeholder: `"$address"`, `"$chunkSize"`, `"$length"`, `"$data"`
+ * - placeholder: `"$address"`, `"$block"`, `"$chunkSize"`, `"$length"`, `"$data"`
  */
 export type RadioByteToken = number | string;
 /**
@@ -14,29 +14,58 @@ export type RadioByteToken = number | string;
 export interface RadioExpectBytes {
     bytes: number;
 }
+/**
+ * Read until a delimiter byte. Used for Kenwood live CAT lines ending in CR.
+ */
+export interface RadioExpectUntil {
+    until: RadioByteToken;
+}
 /**
  * Expected serial reply for an exchange.
  *
  * - token: exact 1-byte match (ACK)
  * - token array: exact multi-byte match, or a framed reply with `$` placeholders
  * - `{ bytes: N }`: any N bytes
+ * - `{ until: token }`: variable-length reply ending at the delimiter (the delimiter is not included)
  */
-export type RadioExpect = RadioByteToken | RadioByteToken[] | RadioExpectBytes;
+export type RadioExpect = RadioByteToken | RadioByteToken[] | RadioExpectBytes | RadioExpectUntil;
 /**
- * One serial exchange: send bytes and/or wait for a reply.
- * At least one of `send` or `expect` must be present.
+ * Packer that converts live CAT replies into a logical memory-map record.
+ * `kenwood-th-f6` parses `MR`/`MNA` CSV into the 32-byte TH-F6 channel image.
  */
-export type RadioExchange = {
-    description?: string;
-    send: RadioByteToken[];
-    expect?: RadioExpect;
+export type RadioCatPack = "kenwood-th-f6";
+/**
+ * Live CAT memory loop: one logical record per channel index, not clone blocks.
+ */
+export interface RadioCatMemoryConfig {
+    segment: string;
+    count: number;
+    recordSize: number;
+    pack: RadioCatPack;
+    indexWidth?: number;
+    emptyByte?: number;
     timeout?: number;
-} | {
+    interCommandDelayMs?: number;
+}
+/**
+ * One serial exchange: send bytes and/or wait for a reply, and/or change baud.
+ * At least one of `send`, `expect`, or `setBaudRate` must be present.
+ */
+export interface RadioExchange {
     description?: string;
     send?: RadioByteToken[];
-    expect: RadioExpect;
+    expect?: RadioExpect;
     timeout?: number;
-};
+    /**
+     * Milliseconds to wait after send (Kenwood CAT wake CR before ID).
+     */
+    delay?: number;
+    /**
+     * Switch the serial baud rate before send/expect. TH-D74 clone mode
+     * enters programming at 9600 then transfers at 57600.
+     */
+    setBaudRate?: number;
+}
 /**
  * Chunked memory read: repeat an exchange across named segments.
  * `$data` in `expect` is captured into the memory buffer.
@@ -72,5 +101,19 @@ export interface RadioWriteStep {
         skip?: RadioMemorySegment[];
     };
 }
-export type RadioProtocolStep = RadioExchange | RadioReadStep | RadioWriteStep;
+/**
+ * Read memories with live CAT commands (Kenwood TH-F6 `MR`/`MNA`).
+ */
+export interface RadioCatReadStep {
+    description?: string;
+    catRead: RadioCatMemoryConfig;
+}
+/**
+ * Write memories with live CAT commands (Kenwood TH-F6 `MW`/`MNA`).
+ */
+export interface RadioCatWriteStep {
+    description?: string;
+    catWrite: RadioCatMemoryConfig;
+}
+export type RadioProtocolStep = RadioExchange | RadioReadStep | RadioWriteStep | RadioCatReadStep | RadioCatWriteStep;
 //# sourceMappingURL=protocol.d.ts.map

package/dist/radio/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/radio/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,gBAAgB,CAAC;AAE/E;;;GAGG;AACH,MAAM,MAAM,aAAa,GACrB;IACE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACD;IACE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,cAAc,EAAE,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,IAAI,EAAE,cAAc,EAAE,CAAC;QACvB,MAAM,EAAE,WAAW,CAAC;QACpB,GAAG,CAAC,EAAE,aAAa,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,IAAI,EAAE,cAAc,EAAE,CAAC;QACvB,MAAM,EAAE,WAAW,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC7B,CAAC;CACH;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,aAAa,GAAG,cAAc,CAAC"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/radio/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,cAAc,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAElG;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,cAAc,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,IAAI,EAAE,cAAc,EAAE,CAAC;QACvB,MAAM,EAAE,WAAW,CAAC;QACpB,GAAG,CAAC,EAAE,aAAa,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,IAAI,EAAE,cAAc,EAAE,CAAC;QACvB,MAAM,EAAE,WAAW,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC7B,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,oBAAoB,CAAC;CAChC;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,gBAAgB,GAAG,iBAAiB,CAAC"}

package/dist/radio/serial-config.d.ts

@@ -3,5 +3,17 @@ export interface RadioSerialConfig {
     dataBits?: 8 | 5 | 6 | 7;
     stopBits?: 1 | 1.5 | 2;
     parity?: "none" | "even" | "odd";
+    /**
+     * Hardware RTS/CTS flow control. Kenwood TH-D74 clone mode needs this on macOS.
+     */
+    rtscts?: boolean;
+    /**
+     * Explicit RTS line. TH-F6 live CAT needs this false; omit to keep RTS asserted.
+     */
+    rts?: boolean;
+    /**
+     * Explicit DTR line. Omit to keep DTR asserted after open.
+     */
+    dtr?: boolean;
 }
 //# sourceMappingURL=serial-config.d.ts.map

package/dist/radio/serial-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serial-config.d.ts","sourceRoot":"","sources":["../../src/radio/serial-config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;CAClC"}
+{"version":3,"file":"serial-config.d.ts","sourceRoot":"","sources":["../../src/radio/serial-config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IACjC;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springfield/ham-radio-api",
-  "version": "17.3.0",
+  "version": "17.5.0",
   "author": "Bryan Hunt",
   "files": [
     "dist/",

package/src/radio/memory-map.ts

@@ -27,7 +27,12 @@ export type RadioMemoryMapValueKind =
   | { kind: "integer"; min?: number; max?: number }
   | { kind: "boolean" }
   | { kind: "enum"; values: string[] }
-  | { kind: "ascii"; length: number }
+  | {
+      kind: "ascii";
+      length: number;
+      /** Fill byte for unused character slots (default 0xFF). Kenwood names use 0. */
+      pad?: number;
+    }
   | {
       kind: "digits";
       /** Number of decimal digit bytes. */
@@ -74,6 +79,22 @@ export type RadioMemoryMapValueKind =
       ctcssMin?: number;
       /** Added to DCS index for reverse polarity (Chirp uses 0x69). */
       reverseOffset?: number;
+    }
+  | {
+      /**
+       * CTCSS tone stored as an index into `values` (Hz * 10, Springfield tenths).
+       * Kenwood TH-D74 `rtone` / `ctone` use Chirp TONES order.
+       */
+      kind: "ctcss-index";
+      values: number[];
+    }
+  | {
+      /**
+       * DCS code stored as an index into `values`.
+       * Kenwood TH-D74 `dtcs_code` uses Chirp DTCS_CODES order.
+       */
+      kind: "dcs-index";
+      values: number[];
     };
 
 /** UI metadata for a non-reserved field. */
@@ -94,11 +115,11 @@ export interface RadioMemoryMapField {
   id: string;
   /**
    * Storage type:
-   * - u8 / u16: whole bytes (u16 is little-endian, Chirp ul16)
+   * - u8 / u16 / u32: whole bytes (u16/u32 are little-endian, Chirp ul16/ul32)
    * - bits: bitfield of `width` bits within the current byte (MSB-first)
    * - char: ASCII byte (length via value.kind ascii or count)
    */
-  type: "u8" | "u16" | "bits" | "char";
+  type: "u8" | "u16" | "u32" | "bits" | "char";
   /** Bit width when type is bits. */
   width?: number;
   /** When true, skip decode/encode for this padding field. */
@@ -130,6 +151,13 @@ export interface RadioMemoryMapStruct {
    */
   count?: number;
   stride?: number;
+  /**
+   * When set with `groupPad`, instances are packed into groups of `groupSize`
+   * records followed by `groupPad` padding bytes (Kenwood TH-D74: 6 × 40 + 16).
+   */
+  groupSize?: number;
+  /** Padding bytes after each group of `groupSize` records. */
+  groupPad?: number;
   /** Occupancy rule for repeated structs (e.g. empty channel slots). */
   emptyWhen?: RadioMemoryMapEmptyWhen;
   /**
@@ -154,6 +182,12 @@ export interface RadioMemoryMapChannelBindings {
   transmitFrequency: string;
   receiveTone: string;
   transmitTone: string;
+  /**
+   * Optional parallel struct whose fields merge into each channel's settings
+   * (Kenwood TH-D74 flags: used, lockout, group). Occupancy `emptyWhen` on
+   * this struct, when present, also skips the channel.
+   */
+  extras?: string;
 }
 
 /**

package/src/radio/protocol.ts

@@ -6,7 +6,7 @@ import type { RadioMemorySegment } from "./memory-segment.js";
  * - number 0–255: literal byte
  * - hex string such as `"0x50"`: literal byte
  * - single-character string such as `"S"`: ASCII opcode
- * - placeholder: `"$address"`, `"$chunkSize"`, `"$length"`, `"$data"`
+ * - placeholder: `"$address"`, `"$block"`, `"$chunkSize"`, `"$length"`, `"$data"`
  */
 export type RadioByteToken = number | string;
 
@@ -17,32 +17,62 @@ export interface RadioExpectBytes {
   bytes: number;
 }
 
+/**
+ * Read until a delimiter byte. Used for Kenwood live CAT lines ending in CR.
+ */
+export interface RadioExpectUntil {
+  until: RadioByteToken;
+}
+
 /**
  * Expected serial reply for an exchange.
  *
  * - token: exact 1-byte match (ACK)
  * - token array: exact multi-byte match, or a framed reply with `$` placeholders
  * - `{ bytes: N }`: any N bytes
+ * - `{ until: token }`: variable-length reply ending at the delimiter (the delimiter is not included)
+ */
+export type RadioExpect = RadioByteToken | RadioByteToken[] | RadioExpectBytes | RadioExpectUntil;
+
+/**
+ * Packer that converts live CAT replies into a logical memory-map record.
+ * `kenwood-th-f6` parses `MR`/`MNA` CSV into the 32-byte TH-F6 channel image.
  */
-export type RadioExpect = RadioByteToken | RadioByteToken[] | RadioExpectBytes;
+export type RadioCatPack = "kenwood-th-f6";
 
 /**
- * One serial exchange: send bytes and/or wait for a reply.
- * At least one of `send` or `expect` must be present.
+ * Live CAT memory loop: one logical record per channel index, not clone blocks.
  */
-export type RadioExchange =
-  | {
-      description?: string;
-      send: RadioByteToken[];
-      expect?: RadioExpect;
-      timeout?: number;
-    }
-  | {
-      description?: string;
-      send?: RadioByteToken[];
-      expect: RadioExpect;
-      timeout?: number;
-    };
+export interface RadioCatMemoryConfig {
+  segment: string;
+  count: number;
+  recordSize: number;
+  pack: RadioCatPack;
+  indexWidth?: number;
+  emptyByte?: number;
+  timeout?: number;
+  interCommandDelayMs?: number;
+}
+
+/**
+ * One serial exchange: send bytes and/or wait for a reply, and/or change baud.
+ * At least one of `send`, `expect`, or `setBaudRate` must be present.
+ */
+export interface RadioExchange {
+  description?: string;
+  send?: RadioByteToken[];
+  expect?: RadioExpect;
+  timeout?: number;
+  /**
+   * Milliseconds to wait after send (Kenwood CAT wake CR before ID).
+   */
+  delay?: number;
+  /**
+   * Switch the serial baud rate before send/expect. TH-D74 clone mode
+   * enters programming at 9600 then transfers at 57600.
+   */
+  setBaudRate?: number;
+}
 
 /**
  * Chunked memory read: repeat an exchange across named segments.
@@ -81,4 +111,20 @@ export interface RadioWriteStep {
   };
 }
 
-export type RadioProtocolStep = RadioExchange | RadioReadStep | RadioWriteStep;
+/**
+ * Read memories with live CAT commands (Kenwood TH-F6 `MR`/`MNA`).
+ */
+export interface RadioCatReadStep {
+  description?: string;
+  catRead: RadioCatMemoryConfig;
+}
+
+/**
+ * Write memories with live CAT commands (Kenwood TH-F6 `MW`/`MNA`).
+ */
+export interface RadioCatWriteStep {
+  description?: string;
+  catWrite: RadioCatMemoryConfig;
+}
+
+export type RadioProtocolStep = RadioExchange | RadioReadStep | RadioWriteStep | RadioCatReadStep | RadioCatWriteStep;

package/src/radio/serial-config.ts

@@ -3,4 +3,16 @@ export interface RadioSerialConfig {
   dataBits?: 8 | 5 | 6 | 7;
   stopBits?: 1 | 1.5 | 2;
   parity?: "none" | "even" | "odd";
+  /**
+   * Hardware RTS/CTS flow control. Kenwood TH-D74 clone mode needs this on macOS.
+   */
+  rtscts?: boolean;
+  /**
+   * Explicit RTS line. TH-F6 live CAT needs this false; omit to keep RTS asserted.
+   */
+  rts?: boolean;
+  /**
+   * Explicit DTR line. Omit to keep DTR asserted after open.
+   */
+  dtr?: boolean;
 }