From e46abe175f19650892d8ab2ab2ec068885fa83fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?=
Date: Thu, 7 Sep 2017 02:27:05 +0200
Subject: [PATCH] reduced buffers, not really needed
---
html_orig/js/app.js | 12 ++++++------
html_orig/jssrc/term_upload.js | 12 ++++++------
html_orig/pages/term.php | 2 +-
user/uart_buffer.c | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/html_orig/js/app.js b/html_orig/js/app.js
index e664544..a3f59d2 100644
--- a/html_orig/js/app.js
+++ b/html_orig/js/app.js
@@ -2410,9 +2410,9 @@ var TermUpl = (function() {
send_delay_ms = qs('#fu_delay').value;
// sanitize - 0 causes overflows
- if (send_delay_ms <= 0) {
- send_delay_ms = 1;
- qs('#fu_delay').value = 1;
+ if (send_delay_ms < 0) {
+ send_delay_ms = 0;
+ qs('#fu_delay').value = send_delay_ms;
}
nl_str = {
@@ -2451,7 +2451,6 @@ var TermUpl = (function() {
inline_pos += MAX_LINE_LEN;
}
- console.log("-> " + chunk);
if (!Input.sendString(chunk)) {
fuStatus("FAILED!");
return;
@@ -2470,14 +2469,15 @@ var TermUpl = (function() {
function closeWhenReady() {
if (!Conn.canSend()) {
+ // stuck in XOFF still, wait to process...
fuStatus("Waiting for Tx buffer...");
- setTimeout(closeWhenReady, 250);
+ setTimeout(closeWhenReady, 100);
} else {
fuStatus("Done.");
// delay to show it
setTimeout(function() {
fuClose();
- }, 250);
+ }, 100);
}
}
diff --git a/html_orig/jssrc/term_upload.js b/html_orig/jssrc/term_upload.js
index aed0a46..2c92110 100644
--- a/html_orig/jssrc/term_upload.js
+++ b/html_orig/jssrc/term_upload.js
@@ -43,9 +43,9 @@ var TermUpl = (function() {
send_delay_ms = qs('#fu_delay').value;
// sanitize - 0 causes overflows
- if (send_delay_ms <= 0) {
- send_delay_ms = 1;
- qs('#fu_delay').value = 1;
+ if (send_delay_ms < 0) {
+ send_delay_ms = 0;
+ qs('#fu_delay').value = send_delay_ms;
}
nl_str = {
@@ -84,7 +84,6 @@ var TermUpl = (function() {
inline_pos += MAX_LINE_LEN;
}
- console.log("-> " + chunk);
if (!Input.sendString(chunk)) {
fuStatus("FAILED!");
return;
@@ -103,14 +102,15 @@ var TermUpl = (function() {
function closeWhenReady() {
if (!Conn.canSend()) {
+ // stuck in XOFF still, wait to process...
fuStatus("Waiting for Tx buffer...");
- setTimeout(closeWhenReady, 250);
+ setTimeout(closeWhenReady, 100);
} else {
fuStatus("Done.");
// delay to show it
setTimeout(function() {
fuClose();
- }, 250);
+ }, 100);
}
}
diff --git a/html_orig/pages/term.php b/html_orig/pages/term.php
index 15af52b..3f64b60 100644
--- a/html_orig/pages/term.php
+++ b/html_orig/pages/term.php
@@ -27,7 +27,7 @@
-
+
diff --git a/user/uart_buffer.c b/user/uart_buffer.c
index 4cfda64..a32f8d8 100644
--- a/user/uart_buffer.c
+++ b/user/uart_buffer.c
@@ -8,8 +8,8 @@
#include
#include
-#define UART_TX_BUFFER_SIZE 1024 //Ring buffer length of tx buffer
-#define UART_RX_BUFFER_SIZE 1024 //Ring buffer length of rx buffer
+#define UART_TX_BUFFER_SIZE 512 //Ring buffer length of tx buffer
+#define UART_RX_BUFFER_SIZE 512 //Ring buffer length of rx buffer
struct UartBuffer {
uint32 UartBuffSize;