eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 23:19:19 +02:00
Code Issues 123 Wiki Activity

(uart, improvement) not quitting when serial port is unavailable + automatic reconnect + no repeating uart error messages

Browse Source
This commit is contained in:
Marcin Nowak
2021-10-16 00:41:57 +02:00
parent d101b08626
commit 0c1bcdcadf
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
uart.cpp
View File

@@ -12,11 +12,9 @@ uart_input::uart_input()
{ {
conf = Global.uart_conf; conf = Global.uart_conf;
if (!setup_port())
throw std::runtime_error("uart: cannot open port");
old_packet.fill(0); old_packet.fill(0);
last_update = std::chrono::high_resolution_clock::now(); last_update = std::chrono::high_resolution_clock::now();
last_setup = std::chrono::high_resolution_clock::now();
} }
bool uart_input::setup_port() bool uart_input::setup_port()
@@ -27,13 +25,21 @@ bool uart_input::setup_port()
port = nullptr; port = nullptr;
} }
last_setup = std::chrono::high_resolution_clock::now();
if (sp_get_port_by_name(conf.port.c_str(), &port) != SP_OK) { if (sp_get_port_by_name(conf.port.c_str(), &port) != SP_OK) {
ErrorLog("uart: cannot find specified port"); if(!error_notified) {
ErrorLog("uart: cannot find specified port '"+conf.port+"'");
}
error_notified = true;
return false; return false;
} }
if (sp_open(port, (sp_mode)(SP_MODE_READ | SP_MODE_WRITE)) != SP_OK) { if (sp_open(port, (sp_mode)(SP_MODE_READ | SP_MODE_WRITE)) != SP_OK) {
ErrorLog("uart: cannot open port"); if(!error_notified) {
ErrorLog("uart: cannot open port '"+conf.port+"'");
}
error_notified = true;
port = nullptr; port = nullptr;
return false; return false;
} }
@@ -47,7 +53,10 @@ bool uart_input::setup_port()
sp_set_config_stopbits(config, 1) != SP_OK || sp_set_config_stopbits(config, 1) != SP_OK ||
sp_set_config_parity(config, SP_PARITY_NONE) != SP_OK || sp_set_config_parity(config, SP_PARITY_NONE) != SP_OK ||
sp_set_config(port, config) != SP_OK) { sp_set_config(port, config) != SP_OK) {
ErrorLog("uart: cannot set config"); if(!error_notified) {
ErrorLog("uart: cannot set config");
}
error_notified = true;
port = nullptr; port = nullptr;
return false; return false;
} }
@@ -55,11 +64,16 @@ bool uart_input::setup_port()
sp_free_config(config); sp_free_config(config);
if (sp_flush(port, SP_BUF_BOTH) != SP_OK) { if (sp_flush(port, SP_BUF_BOTH) != SP_OK) {
ErrorLog("uart: cannot flush"); if(!error_notified) {
ErrorLog("uart: cannot flush");
}
error_notified = true;
port = nullptr; port = nullptr;
return false; return false;
} }
error_notified = false;
return true; return true;
} }
@@ -163,6 +177,11 @@ void uart_input::poll()
return; return;
last_update = now; last_update = now;
/* if connection error occured, slow down reconnection tries */
if (!port && error_notified && std::chrono::duration<float>(now - last_setup).count() < 1.0) {
return;
}
if (!port) { if (!port) {
setup_port(); setup_port();
return; return;

4
uart.h
View File

@@ -64,7 +64,7 @@ private:
using input_pin_t = std::tuple<std::size_t, input_type_t, user_command, user_command>; using input_pin_t = std::tuple<std::size_t, input_type_t, user_command, user_command>;
using inputpin_sequence = std::vector<input_pin_t>; using inputpin_sequence = std::vector<input_pin_t>;
bool setup_port(); bool setup_port();
// members // members
@@ -73,7 +73,9 @@ private:
command_relay relay; command_relay relay;
std::array<std::uint8_t, 16> old_packet; // TBD, TODO: replace with vector of configurable size? std::array<std::uint8_t, 16> old_packet; // TBD, TODO: replace with vector of configurable size?
std::chrono::time_point<std::chrono::high_resolution_clock> last_update; std::chrono::time_point<std::chrono::high_resolution_clock> last_update;
std::chrono::time_point<std::chrono::high_resolution_clock> last_setup;
conf_t conf; conf_t conf;
bool data_pending = false; bool data_pending = false;
bool error_notified = false;
std::uint8_t m_trainstatecab { 0 }; // helper, keeps track of last active cab. 0: front cab, 1: rear cab std::uint8_t m_trainstatecab { 0 }; // helper, keeps track of last active cab. 0: front cab, 1: rear cab
}; };