Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scan RF code of specified frequency #706

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Scan RF code of specified frequency #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions accessories/learnCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@ class LearnIRAccessory extends BroadlinkRMAccessory {

toggleLearning(props, on, callback) {
const { config, serviceManager } = this;
const { disableAutomaticOff, scanRF, scanFrequency } = config;
const { disableAutomaticOff, scanRF, scanFrequency, frequency } = config;

const turnOffCallback = () => {
serviceManager.setCharacteristic(Characteristic.On, false);
}

if (scanRF || scanFrequency) {
const scan = frequency ?? undefined;
if (on) {
learnRFData.start(this.host, callback, turnOffCallback, this.log, disableAutomaticOff, this.logLevel);
learnRFData.start(this.host, scan, callback, turnOffCallback, this.log, disableAutomaticOff, this.logLevel);
} else {
learnRFData.stop(this.log, this.logLevel);

Expand Down
30 changes: 18 additions & 12 deletions helpers/learnRFData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const stop = (log, device, logLevel) => {
if(this.initalDebug !== undefined && currentDevice) {currentDevice.debug = this.initalDebug;}
}

const start = (host, callback, turnOffCallback, log, disableTimeout, logLevel) => {
const start = (host, frequency, callback, turnOffCallback, log, disableTimeout, logLevel) => {
stop()

// Get the Broadlink device
Expand Down Expand Up @@ -91,7 +91,7 @@ const start = (host, callback, turnOffCallback, log, disableTimeout, logLevel) =
if (!closeClient) {return;}

if (getDataTimeout2) {clearTimeout(getDataTimeout2);}
getDataTimeout = null;
getDataTimeout2 = null;

log(`\x1b[35m[INFO]\x1b[0m Scan RF (found frequency - 2 of 2)`)
log(`\x1b[35m[ACTION]\x1b[0m Press the RF button multiple times with a pause between them to get code.`);
Expand Down Expand Up @@ -119,15 +119,21 @@ const start = (host, callback, turnOffCallback, log, disableTimeout, logLevel) =
device.on('rawRFData2', onRawData2);
device.on('rawData', onRawData3);

device.enterRFSweep();
log(`\x1b[35m[INFO]\x1b[0m Scan RF (scanning)`);
log(`\x1b[35m[ACTION]\x1b[0m Hold down the button that sends the RF frequency.`);

if (callback) {callback();}

getDataTimeout = setTimeout(() => {
getData(device);
}, 1000);
if (!frequency) {
device.enterRFSweep();
log(`\x1b[35m[INFO]\x1b[0m Scan RF (scanning)`);
log(`\x1b[35m[ACTION]\x1b[0m Hold down the button that sends the RF frequency.`);

getDataTimeout = setTimeout(() => {
getData(device);
}, 1000);
} else {
getDataTimeout2 = setTimeout(() => {
getData2(device, frequency);
}, 1000);
}

if (disableTimeout) {return;}

Expand Down Expand Up @@ -155,14 +161,14 @@ const getData = (device) => {
}, 1000);
}

const getData2 = (device) => {
const getData2 = (device, frequency = undefined) => {
if (getDataTimeout2) {clearTimeout(getDataTimeout2);}
if (!closeClient) {return;}

device.checkRFData2();
device.checkRFData2(frequency);

getDataTimeout2 = setTimeout(() => {
getData2(device);
getData2(device, frequency);
}, 1000);
}

Expand Down