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

update main.jst #679

Merged
merged 2 commits into from
Feb 18, 2023
Merged

update main.jst #679

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b6bb8
Update main.js
jojo535275 Feb 18, 2023
9f5766b
Merge branch 'FPGAwars:develop' into develop
jojo535275 Feb 18, 2023
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
31 changes: 16 additions & 15 deletions app/resources/plugins/serial-term/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ var serialManager = function () {
if (this.receiverUserF !== false) {
this.receiverUserF(
this.decoder.decode(info.data).
//replace(/(?:\\[n]|[\n])/g, "\n\r") // one more line after a received data
replace(/(?:\\[n]|[\n])/g, "\r")
replace(/(?:\\[n]|[\n])/g, "\n\r") // one more line after a received data
);
}

Expand Down Expand Up @@ -336,13 +335,14 @@ function renderRec(data) {
//-- Write the bytes to the terminal
for (byte of buf) {
term.write(colorRx + `${byte.toString(16)} `+ colorinput);
// print( "<- "+ colorRx + `${byte.toString(16)} `+ colorinput);
// print( "<- "+ colorRx + `${byte.toString(16)} `+ colorinput);
}
}

//-- ASCII mode
else {
term.write(colorRx + data + colorinput);
// print( "<- "+colorRx + data + colorinput);
// print( "<- "+colorRx + data + colorinput);

}

Expand Down Expand Up @@ -452,8 +452,9 @@ function renderPlug(connectionInfo) {
});

term.onData(function (data) {
if (_receive_flag) {
term.write("\r\n");

if (_receive_flag) {
if (flushOnEnter) term.write("\r\n");
_receive_flag = false;
term.setOption("cursorStyle", "bar");
term.setOption("cursorBlink", true);
Expand Down Expand Up @@ -1049,7 +1050,6 @@ function handleData(data) {
switch (data) {
case "\x7F": // BACKSPACE
handleCursorErase(true);
// _cursorH = this.entries.length - 1;
break;

case "\r": // ENTER
Expand All @@ -1058,10 +1058,10 @@ function handleData(data) {
handleCursorInsert("\r");
} else {
_finishedLastEntry = true;

push1 ("");
_cursorH = this.entries.length-1;

clearInput(); // clear and go to "home"
_cursor = 0;

Expand All @@ -1071,9 +1071,8 @@ function handleData(data) {
term.write( colorTx + _input.replace(/\f/g, "\r\n") + colorinput );
// term.write (colorTx + _input.replace(/\f/g, "\r") + colorinput );
// term.write (colorTx + _input + colorinput );
term.write("\r\n");
}

}
term.write("\r\n");
sm.write(_input.replace(/\f/g, "\r") + onEnterMode);
_input = "";
_ReturnsPosition = [];
Expand All @@ -1089,10 +1088,12 @@ function handleData(data) {
} else {
//send directly every key press to the serial port (no flush on enter = 0 )

if (data.charCodeAt(0) == 13) {
//enter key
if (localEcho) term.write("\r\n");
if (data.charCodeAt(0) == 13) { //enter key
sm.write(onEnterMode);

if (hexView) setTimeout(() => { term.write("\r\n"); }, 15); // wait a bit to let the time to receive and display all (up to 3) the "OnEnterSend Mode" chars
else term.write("\r\n");

} else {
// terminal echoing of cursor movements avoided outside the "flush on enter" mode
if (
Expand Down