Actually clear the TX timeout

cyraxx · Nov 9, 2022 · 09d9da0 · 09d9da0
1 parent 5c4ed48
commit 09d9da0
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/rfm9x.js b/rfm9x.js
@@ -193,19 +193,20 @@ module.exports = class RFM9x extends EventEmitter {
         await this.#writeBits(REGISTERS.DIO_MAPPING_1, 2, 6, DIO0_MAPPINGS.TX_DONE);
 
         const promise = new Promise((resolve, reject) => {
-            this.#dio0Gpio.watch(async (err, value) => {
-                if (value === 1) {
-                    await this.#writeByte(REGISTERS.IRQ_FLAGS, 0xFF);
-                    resolve();
-                }
-            });
-            setTimeout(
+            const rejectTimeout = setTimeout(
                 () => {
                     this.#dio0Gpio.unwatchAll();
                     reject(new Error(`Send timeout of ${this.#options.txTimeoutMs}ms expired`));
                 },
                 this.#options.txTimeoutMs
             );
+            this.#dio0Gpio.watch(async (err, value) => {
+                if (value === 1) {
+                    clearTimeout(rejectTimeout);
+                    await this.#writeByte(REGISTERS.IRQ_FLAGS, 0xFF);
+                    resolve();
+                }
+            });
         });
 
         await this.#setOperatingMode(OP_MODES.TRANSMIT);