aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2025-12-13 02:52:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Increase timing for prog command responses for slow motor pairing #121 #127

Browse source
This commit is contained in:
Robert Strouse 2023-08-18 13:22:26 -07:00
parent 0314760bec
commit ff2d150ad8
10 changed files with 356 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

32
data/index.html
View file

@ -398,6 +398,19 @@
<option value="5">5 Times</option>
<option value="6">6 Times</option>
<option value="7">7 Times</option>
<option value="8">8 Times</option>
<option value="9">9 Times</option>
<option value="10">10 Times</option>
<option value="11">11 Times</option>
<option value="12">12 Times</option>
<option value="13">13 Times</option>
<option value="14">14 Times</option>
<option value="15">15 Times</option>
<option value="16">16 Times</option>
<option value="17">17 Times</option>
<option value="18">18 Times</option>
<option value="19">19 Times</option>
<option value="20">20 Times</option>
</select>
</div>
@ -653,6 +666,7 @@
</div>
</div>
<script type="text/javascript">
var mouseDown = false;
//ui.waitMessage(document.getElementById('divShadeControls'));
let tabs = document.querySelectorAll('div.tab-container > span');
tabs.forEach((tab) => {
@ -685,6 +699,24 @@
});
});
document.querySelectorAll('.subtab-container > span').forEach((tab) => { tab.addEventListener('click', (evt) => { ui.selectTab(evt.srcElement); }) });
document.addEventListener('mousedown', (event) => {
mouseDown = true;
});
document.addEventListener('mouseup', (event) => {
mouseDown = false;
});
document.addEventListener('mouseleave', (event) => {
mouseDown = false;
});
document.addEventListener('touchend', (event) => {
mouseDown = false;
});
document.addEventListener('touchstart', (event) => {
mouseDown = true;
});
document.addEventListener('touchcancel', (event) => {
mouseDown = false;
});
(async () => { await init(); })();
/*
security.init();

58
data/index.js
View file

@ -2901,22 +2901,55 @@ class Somfy {
html += '<div>Follow the instructions below to pair this shade with a Somfy motor</div>';
html += '<hr style="width:100%;margin:0px;"></hr>';
html += '<ul style="width:100%;margin:0px;padding-left:20px;font-size:14px;">';
html += '<li>Open the shade memory using an existing remote</li>';
html += '<li>Press the prog button on the back of the remote until the shade jogs</li>';
html += '<li>Open the shade memory using an existing remote by pressing the prog button on the back until the shade jogs.</li>';
html += '<li>After the shade jogs press the Prog button below</li>';
html += '<li>The shade should jog again indicating that the shade is paired</li>';
html += '<li>The shade should jog again indicating that the shade is paired. NOTE: On some motors you may need to press and hold the Prog button.</li>';
html += '<li>If the shade jogs, you can press the shade paired button.</li>';
html += '<li>If the shade does not jog, press the prog button again.</li>';
html += '<li>If the shade does not jog, try pressing the prog button again.</li>';
html += '</ul>';
html += `<div class="button-container">`;
html += `<button id="btnSendPairing" type="button" style="padding-left:20px;padding-right:20px;display:inline-block;" onclick="somfy.sendCommand(${shadeId}, 'prog', 1);">Prog</button>`;
html += `<button id="btnSendPairing" type="button" style="padding-left:20px;padding-right:20px;display:inline-block;">Prog</button>`;
html += `<button id="btnMarkPaired" type="button" style="padding-left:20px;padding-right:20px;display:inline-block;" onclick="somfy.setPaired(${shadeId}, true);">Shade Paired</button>`;
html += `<button id="btnStopPairing" type="button" style="padding-left:20px;padding-right:20px;display:inline-block" onclick="document.getElementById('divPairing').remove();">Close</button>`;
html += `<button id="btnStopPairing" type="button" style="padding-left:20px;padding-right:20px;display:inline-block" >Close</button>`;
html += `</div>`;
let fnRepeatProg = (err, shade) => {
if (this.btnTimer) {
clearTimeout(this.btnTimer);
this.btnTimer = null;
}
if (err) return;
if (mouseDown) {
somfy.sendCommandRepeat(shadeId, 'prog', null, fnRepeatProg);
}
}
div.innerHTML = html;
document.getElementById('somfyShade').appendChild(div);
document.getElementById('btnStopPairing').addEventListener('click', (event) => {
console.log(this);
console.log(event);
console.log('close');
if (this.btnTimer) {
clearInterval(this.btnTimer);
this.btnTimer = null;
}
document.getElementById('divPairing').remove();
});
let btn = document.getElementById('btnSendPairing');
btn.addEventListener('mousedown', (event) => {
console.log(this);
console.log(event);
console.log('mousedown');
somfy.sendCommand(shadeId, 'prog', null, (err, shade) => { fnRepeatProg(err, shade); });
}, true);
btn.addEventListener('touchstart', (event) => {
console.log(this);
console.log(event);
console.log('touchstart');
somfy.sendCommand(shadeId, 'prog', null, (err, shade) => { fnRepeatProg(err, shade); });
}, true);
return div;
}
unpairShade(shadeId) {
let div = document.createElement('div');
let html = `<div id="divPairing" class="instructions" data-type="link-remote" data-shadeid="${shadeId}">`;
@ -2939,16 +2972,25 @@ class Somfy {
document.getElementById('somfyShade').appendChild(div);
return div;
}
sendCommand(shadeId, command, repeat) {
sendCommand(shadeId, command, repeat, cb) {
console.log(`Sending Shade command ${shadeId}-${command}`);
let obj = { shadeId: shadeId };
if (isNaN(parseInt(command, 10))) obj.command = command;
else obj.target = parseInt(command, 10);
if (typeof repeat === 'number') obj.repeat = parseInt(repeat);
putJSON('/shadeCommand', obj, (err, shade) => {
if (typeof cb === 'function') cb(err, shade);
});
}
sendCommandRepeat(shadeId, command, repeat, cb) {
//console.log(`Sending Shade command ${shadeId}-${command}`);
let obj = { shadeId: shadeId, command: command };
if (typeof repeat === 'number') obj.repeat = parseInt(repeat);
putJSON(`/repeatCommand?shadeId=${shadeId}&command=${command}`, null, (err, shade) => {
if(typeof cb === 'function') cb(err, shade);
});
}
sendGroupCommand(groupId, command, repeat) {
console.log(`Sending Group command ${groupId}-${command}`);
let obj = { groupId: groupId };