jasder
/
comNG
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- optimise behavior of rts/dtr signal

This commit is contained in:
Xen 2020-07-30 20:46:15 +08:00
parent c9abec0d21
commit 4e42075e6b
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/index.html
View File

@ -442,13 +442,13 @@
<div class="col s1"></div>
<a
class="btn-small waves-effect z-depth-0 modem-btn col s1"
class="btn-small waves-effect modem-btn grey col s1"
id="rts-btn"
>RTS</a
>
<div class="col s1"></div>
<a
class="btn-small waves-effect z-depth-0 modem-btn col s1"
class="btn-small waves-effect modem-btn grey col s1"
id="dtr-btn"
>DTR</a
>

53
src/serialport.js
View File

@ -7,8 +7,8 @@ var modemSignal = {
cts: false,
dsr: false,
dcd: false,
rts: true,
dtr: true,
rts: false,
dtr: false,
};
function portUpdate() {
@ -74,16 +74,12 @@ function modemSignalReset() {
modemSignal.cts = false;
modemSignal.dsr = false;
modemSignal.dcd = false;
modemSignal.rts = true;
modemSignal.dtr = true;
document.getElementById("cts-btn").style.cssText =
"background-color: #dfdfdf !important";
document.getElementById("dsr-btn").style.cssText =
"background-color: #dfdfdf !important";
document.getElementById("dcd-btn").style.cssText =
"background-color: #dfdfdf !important";
document.getElementById("rts-btn").style.backgroundColor = "";
document.getElementById("dtr-btn").style.backgroundColor = "";
}
function serialGetOptions() {
@ -159,10 +155,15 @@ document.getElementById("port-switch").onclick = (e) => {
if (config.general.modemSignal === true) {
modemSignalTimer = setInterval(modemSignalTimerHandle, 100);
}
// Set below signal will cause some device reboot.
// port.set({ rts: true, dtr: true }, (e) => {
// if (e !== null) console.error(e);
// });
// Some device use rts/dtr for private purpose, so below code
// may cause strange behaviors.
// Below setting can fix known issues on certain devices, but may
// cause issues to other devices.
// To fit your device's private behavior, first config setting before
// open the port.
port.set({ rts: modemSignal.rts, dtr: modemSignal.dtr }, (e) => {
if (e !== null) console.error(e);
});
});
port.on("error", (e) => {
@ -202,38 +203,34 @@ document.getElementById("port-switch").onclick = (e) => {
document.getElementById("rts-btn").onclick = (e) => {
console.log("rts click");
if (port === undefined || port.isOpen === false) return;
if (modemSignal.rts === true) {
modemSignal.rts = false;
e.target.style.backgroundColor = "#dfdfdf";
port.set({ rts: false }, (e) => {
if (e !== null) console.error(e);
});
e.target.classList.add("grey");
} else {
modemSignal.rts = true;
e.target.style.backgroundColor = "";
port.set({ rts: modemSignal.rts, dtr: modemSignal.dtr }, (e) => {
if (e !== null) console.error(e);
});
e.target.classList.remove("grey");
}
if (port === undefined || port.isOpen === false) return;
port.set({ rts: modemSignal.rts, dtr: modemSignal.dtr }, (e) => {
if (e !== null) console.error(e);
});
};
document.getElementById("dtr-btn").onclick = (e) => {
console.log("dtr click");
if (port === undefined || port.isOpen === false) return;
if (modemSignal.dtr === true) {
modemSignal.dtr = false;
e.target.style.backgroundColor = "#dfdfdf";
port.set({ dtr: false }, (e) => {
if (e !== null) console.error(e);
});
e.target.classList.add("grey");
} else {
modemSignal.dtr = true;
e.target.style.backgroundColor = "";
port.set({ rts: modemSignal.rts, dtr: true }, (e) => {
if (e !== null) console.error(e);
});
e.target.classList.remove("grey");
}
if (port === undefined || port.isOpen === false) return;
port.set({ rts: modemSignal.rts, dtr: modemSignal.dtr }, (e) => {
if (e !== null) console.error(e);
});
};