Skip to content

Commit f8414ee

Browse files
committed
fix lint issues add exported types
1 parent a3508c8 commit f8414ee

File tree

10 files changed

+49
-22
lines changed

10 files changed

+49
-22
lines changed

src/esploader.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ export interface LoaderOptions {
124124

125125
/**
126126
* Reset functions for connection. If undefined will use default ones.
127+
* @type {ResetFunctions}
127128
*/
128129
resetFunctions?: ResetFunctions;
129130
}
@@ -134,7 +135,7 @@ export interface LoaderOptions {
134135
* @param { number } progress Progress status number
135136
* @param {number } totalSize total size of packet.
136137
*/
137-
type FlashReadCallback = ((packet: Uint8Array, progress: number, totalSize: number) => void) | null;
138+
export type FlashReadCallback = ((packet: Uint8Array, progress: number, totalSize: number) => void) | null;
138139

139140
/**
140141
* Return the chip ROM based on the given magic number

src/index.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
export { IEspLoaderTerminal, ESPLoader, FlashOptions, LoaderOptions } from "./esploader";
1+
export {
2+
IEspLoaderTerminal,
3+
ESPLoader,
4+
FlashOptions,
5+
FlashReadCallback,
6+
LoaderOptions,
7+
ResetFunctions,
8+
} from "./esploader";
29
export { classicReset, customReset, hardReset, usbJTAGSerialReset, validateCustomResetStringSequence } from "./reset";
310
export { ROM } from "./targets/rom";
411
export { AbstractTransport, ISerialOptions } from "./transport/AbstractTransport";
512
export { SerialOptions, WebSerialTransport } from "./transport/WebSerialTransport";
13+
export { slipRead, slipReaderFormat, SlipReaderOutput, slipWriter } from "./utils/slip";

src/targets/esp32c2.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ESPLoader } from "../esploader";
2-
import { ESP32C3ROM } from "./esp32c3";
2+
import { ROM } from "./rom";
33
import ESP32C2_STUB from "./stub_flasher/stub_flasher_32c2.json";
44

5-
export class ESP32C2ROM extends ESP32C3ROM {
5+
export class ESP32C2ROM extends ROM {
66
public CHIP_NAME = "ESP32-C2";
77
public IMAGE_CHIP_ID = 12;
88
public EFUSE_BASE = 0x60008800;
@@ -68,7 +68,7 @@ export class ESP32C2ROM extends ESP32C3ROM {
6868
return desc;
6969
}
7070

71-
public async getChipFeatures(loader: ESPLoader) {
71+
public async getChipFeatures() {
7272
return ["Wi-Fi", "BLE"];
7373
}
7474

src/targets/esp32c3.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ export class ESP32C3ROM extends ROM {
6767
return desc;
6868
}
6969

70-
public async getChipFeatures(loader: ESPLoader) {
70+
public async getChipFeatures() {
7171
return ["Wi-Fi"];
7272
}
7373

74-
public async getCrystalFreq(loader: ESPLoader) {
74+
public async getCrystalFreq() {
7575
return 40;
7676
}
7777

src/targets/esp32c6.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ export class ESP32C6ROM extends ROM {
6767
return desc;
6868
}
6969

70-
public async getChipFeatures(loader: ESPLoader) {
70+
public async getChipFeatures() {
7171
return ["Wi-Fi"];
7272
}
7373

74-
public async getCrystalFreq(loader: ESPLoader) {
74+
public async getCrystalFreq() {
7575
return 40;
7676
}
7777

src/targets/esp32h2.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ export class ESP32H2ROM extends ROM {
4040
public ROM_DATA = ESP32H2_STUB.data;
4141
public ROM_TEXT = ESP32H2_STUB.text;
4242

43-
public async getChipDescription(loader: ESPLoader) {
43+
public async getChipDescription() {
4444
return this.CHIP_NAME;
4545
}
4646

47-
public async getChipFeatures(loader: ESPLoader) {
47+
public async getChipFeatures() {
4848
return ["BLE", "IEEE802.15.4"];
4949
}
5050

51-
public async getCrystalFreq(loader: ESPLoader) {
51+
public async getCrystalFreq() {
5252
// ESP32H2 XTAL is fixed to 32MHz
5353
return 32;
5454
}

src/targets/esp32s2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class ESP32S2ROM extends ROM {
7575
return features;
7676
}
7777

78-
public async getCrystalFreq(loader: ESPLoader) {
78+
public async getCrystalFreq() {
7979
return 40;
8080
}
8181
public _d2h(d: number) {

src/targets/esp32s3.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ export class ESP32S3ROM extends ROM {
4040
public ROM_DATA = ESP32S3_STUB.data;
4141
public ROM_TEXT = ESP32S3_STUB.text;
4242

43-
public async getChipDescription(loader: ESPLoader) {
43+
public async getChipDescription() {
4444
return "ESP32-S3";
4545
}
46-
public async getChipFeatures(loader: ESPLoader) {
46+
public async getChipFeatures() {
4747
return ["Wi-Fi", "BLE"];
4848
}
49-
public async getCrystalFreq(loader: ESPLoader) {
49+
public async getCrystalFreq() {
5050
return 40;
5151
}
5252
public _d2h(d: number) {

src/transport/AbstractTransport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export abstract class AbstractTransport {
6868

6969
/**
7070
* Connect to serial device using the Webserial open method.
71-
* @param {SerialOptions} serialOptions Serial Options for WebUSB SerialPort class.
71+
* @param {ISerialOptions} serialOptions Serial Options for WebUSB SerialPort class.
7272
*/
7373
public abstract connect(serialOptions: ISerialOptions): Promise<void>;
7474

src/utils/slip.ts

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,31 @@ export function slipWriter(data: Uint8Array): Uint8Array {
2222
return new Uint8Array(outData);
2323
}
2424

25+
/**
26+
* Slip reader output packet and left over as Uint8Array.
27+
* @interface SlipReaderOutput
28+
*/
29+
export interface SlipReaderOutput {
30+
/**
31+
* Formatted packet using SLIP escape sequences.
32+
* @type {Uint8Array}
33+
*/
34+
packet: Uint8Array;
35+
36+
/**
37+
* Updated left over bytes from read operation
38+
* @type {Uint8Array}
39+
*/
40+
newLeftOver: Uint8Array;
41+
}
42+
2543
/**
2644
* Take a data array and return the first well formed packet after
2745
* replacing the escape sequence. Reads at least 8 bytes.
2846
* @param {Uint8Array} data Unsigned 8 bit array from the device read stream.
29-
* @returns Formatted packet using SLIP escape sequences.
47+
* @returns {SlipReaderOutput} packet Formatted packet using SLIP escape sequences.
3048
*/
31-
export function slipReaderFormat(data: Uint8Array): { packet: Uint8Array; newLeftOver: Uint8Array } {
49+
export function slipReaderFormat(data: Uint8Array): SlipReaderOutput {
3250
let i = 0;
3351
let dataStart = 0,
3452
dataEnd = 0;
@@ -74,6 +92,7 @@ export function slipReaderFormat(data: Uint8Array): { packet: Uint8Array; newLef
7492

7593
/**
7694
* Read from serial device using the device ReadableStream.
95+
* @param {AbstractTransport} transport Implementation of serial transport class to perform serial read
7796
* @param {number} timeout Read timeout number
7897
* @param {number} minData Minimum packet array length
7998
* @returns {Promise<Uint8Array>} 8 bit unsigned data array read from device.
@@ -95,19 +114,18 @@ export async function slipRead(
95114
packet = transport.leftOver;
96115
transport.leftOver = new Uint8Array(0);
97116
}
98-
99117
packet = await transport.rawRead(timeout, minData, packet);
100118

101119
if (transport.tracing) {
102-
console.log("Read bytes");
120+
transport.trace("Read SLIP bytes");
103121
transport.trace(`Read ${packet.length} bytes: ${hexConvert(packet)}`);
104122
}
105123

106124
if (transport.slipReaderEnabled) {
107125
const slipReaderResult = slipReaderFormat(packet);
108126
transport.leftOver = slipReaderResult.newLeftOver;
109127
if (transport.tracing) {
110-
console.log("Slip reader results");
128+
transport.trace("Slip reader results");
111129
transport.trace(`Read ${slipReaderResult.packet.length} bytes: ${hexConvert(slipReaderResult.packet)}`);
112130
}
113131
return slipReaderResult.packet;

0 commit comments

Comments
 (0)