folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only send new terminal-data, no complete refresh (too slow)

Browse source
This commit is contained in:
folkert van heusden 2022-03-19 12:55:32 +01:00
parent a15dcc47c0
commit bba3e8c4c6
1 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ESP32/main.ino
View file

@ -88,10 +88,9 @@ void panel(void *p) {
SemaphoreHandle_t terminal_mutex = xSemaphoreCreateMutex(); SemaphoreHandle_t terminal_mutex = xSemaphoreCreateMutex();
TaskHandle_t wifi_task { nullptr };
char terminal[25][80]; char terminal[25][80];
uint8_t tx = 0, ty = 0; uint8_t tx = 0, ty = 0;
QueueHandle_t queue = xQueueCreate(10, sizeof(char));
void delete_first_line() { void delete_first_line() {
memmove(&terminal[0][0], &terminal[1][0], sizeof(terminal[1])); memmove(&terminal[0][0], &terminal[1][0], sizeof(terminal[1]));
@ -112,6 +111,7 @@ void telnet_terminal(void *p) {
xQueueReceive(tty_->getTerminalQueue(), &c, portMAX_DELAY); xQueueReceive(tty_->getTerminalQueue(), &c, portMAX_DELAY);
// update terminal buffer
xSemaphoreTake(terminal_mutex, portMAX_DELAY); xSemaphoreTake(terminal_mutex, portMAX_DELAY);
if (c == 13 || c == 10) { if (c == 13 || c == 10) {
@ -141,7 +141,9 @@ void telnet_terminal(void *p) {
xSemaphoreGive(terminal_mutex); xSemaphoreGive(terminal_mutex);
xTaskNotify(wifi_task, 0, eNoAction); // pass through to telnet clients
if (xQueueSend(queue, &c, portMAX_DELAY) != pdTRUE)
Serial.println(F("queue TTY character failed"));
} }
} }
@ -172,29 +174,37 @@ void wifi(void *p) {
if (rc == 1) { if (rc == 1) {
int client = accept(fd, nullptr, nullptr); int client = accept(fd, nullptr, nullptr);
if (client != -1) if (client != -1) {
clients.push_back(client); clients.push_back(client);
// send initial terminal stat
std::string out = "\033[2J";
xSemaphoreTake(terminal_mutex, portMAX_DELAY);
for(int y=0; y<25; y++)
out += format("\033[%dH", y + 1) + std::string(&terminal[y][0], 80);
xSemaphoreGive(terminal_mutex);
write(client, out.c_str(), out.size());
}
} }
if (xTaskNotifyWait(0, 0, &ulNotifiedValue, 100 / portMAX_DELAY) != pdTRUE) std::string out;
continue; char c { 0 };
while (xQueueReceive(tty_->getTerminalQueue(), &c, 10 / portMAX_DELAY) == pdTRUE)
out += c;
xSemaphoreTake(terminal_mutex, portMAX_DELAY); if (!out.empty()) {
for(size_t i=0; i<clients.size(); i++) {
std::string out = "\033[2J"; if (write(clients.at(i), out.c_str(), out.size()) == -1) {
close(clients.at(i));
for(int y=0; y<25; y++) clients.erase(clients.begin() + i);
out += format("\033[%dH", y + 1) + std::string(&terminal[y][0], 80); }
else {
xSemaphoreGive(terminal_mutex); i++;
}
for(size_t i=0; i<clients.size(); i++) {
if (write(clients.at(i), out.c_str(), out.size()) == -1) {
close(clients.at(i));
clients.erase(clients.begin() + i);
}
else {
i++;
} }
} }
} }
@ -284,7 +294,7 @@ void setup() {
memset(terminal, ' ', sizeof(terminal)); memset(terminal, ' ', sizeof(terminal));
xTaskCreatePinnedToCore(&telnet_terminal, "telnet", 2048, b, 7, nullptr, 0); xTaskCreatePinnedToCore(&telnet_terminal, "telnet", 2048, b, 7, nullptr, 0);
xTaskCreatePinnedToCore(&wifi, "wifi", 2048, b, 7, &wifi_task, 0); xTaskCreatePinnedToCore(&wifi, "wifi", 2048, b, 7, nullptr, 0);
setup_wifi_stations(); setup_wifi_stations();