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

(uart) add possibility to enable/disable UART transmission from Debug panel

Browse Source
This commit is contained in:
Marcin Nowak
2021-10-16 16:56:28 +02:00
parent a0153b1d7b
commit 3f308cf812
3 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
driveruipanels.cpp
View File

@@ -614,7 +614,7 @@ debug_panel::render() {
render_section_settings(); render_section_settings();
#ifdef WITH_UART #ifdef WITH_UART
if(true == render_section( "UART", m_uartlines)) { if(true == render_section( "UART", m_uartlines)) {
//ImGui::Checkbox("Enabled", &Global.uart_conf.enable); ImGui::Checkbox("Enabled", &Application.uart_status.enabled);
} }
#endif #endif
// toggles // toggles
@@ -1230,8 +1230,14 @@ debug_panel::update_section_scantable( std::vector<text_line> &Output ) {
#ifdef WITH_UART #ifdef WITH_UART
void void
debug_panel::update_section_uart( std::vector<text_line> &Output ) { debug_panel::update_section_uart( std::vector<text_line> &Output ) {
Output.emplace_back(("Port: " + Global.uart_conf.port).c_str(), Global.UITextColor); Output.emplace_back(
Output.emplace_back(("Baud: " + std::to_string(Global.uart_conf.baud)).c_str(), Global.UITextColor); ("Port: " + Application.uart_status.port_name).c_str(),
Global.UITextColor
);
Output.emplace_back(
("Baud: " + std::to_string(Application.uart_status.baud)).c_str(),
Global.UITextColor
);
if(Application.uart_status.is_connected) { if(Application.uart_status.is_connected) {
std::string synctext = Application.uart_status.is_synced ? "SYNCED" : "NOT SYNCED"; std::string synctext = Application.uart_status.is_synced ? "SYNCED" : "NOT SYNCED";
Output.emplace_back(("CONNECTED, " + synctext).c_str(), Global.UITextColor); Output.emplace_back(("CONNECTED, " + synctext).c_str(), Global.UITextColor);

36
uart.cpp
View File

@@ -12,6 +12,11 @@
uart_input::uart_input() uart_input::uart_input()
{ {
conf = Global.uart_conf; conf = Global.uart_conf;
UartStatus *status = &Application.uart_status;
status->enabled = conf.enable;
status->port_name = conf.port;
status->baud = conf.baud;
old_packet.fill(0); old_packet.fill(0);
last_update = std::chrono::high_resolution_clock::now(); last_update = std::chrono::high_resolution_clock::now();
@@ -27,10 +32,11 @@ bool uart_input::setup_port()
} }
last_setup = std::chrono::high_resolution_clock::now(); last_setup = std::chrono::high_resolution_clock::now();
UartStatus *status = &Application.uart_status;
if (sp_get_port_by_name(conf.port.c_str(), &port) != SP_OK) { if (sp_get_port_by_name(status->port_name.c_str(), &port) != SP_OK) {
if(!error_notified) { if(!error_notified) {
Application.uart_status.is_connected = false; status->is_connected = false;
ErrorLog("uart: cannot find specified port '"+conf.port+"'"); ErrorLog("uart: cannot find specified port '"+conf.port+"'");
} }
error_notified = true; error_notified = true;
@@ -39,8 +45,8 @@ bool uart_input::setup_port()
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) {
if(!error_notified) { if(!error_notified) {
Application.uart_status.is_connected = false; status->is_connected = false;
ErrorLog("uart: cannot open port '"+conf.port+"'"); ErrorLog("uart: cannot open port '"+status->port_name+"'");
} }
error_notified = true; error_notified = true;
port = nullptr; port = nullptr;
@@ -50,14 +56,14 @@ bool uart_input::setup_port()
sp_port_config *config; sp_port_config *config;
if (sp_new_config(&config) != SP_OK || if (sp_new_config(&config) != SP_OK ||
sp_set_config_baudrate(config, conf.baud) != SP_OK || sp_set_config_baudrate(config, status->baud) != SP_OK ||
sp_set_config_flowcontrol(config, SP_FLOWCONTROL_NONE) != SP_OK || sp_set_config_flowcontrol(config, SP_FLOWCONTROL_NONE) != SP_OK ||
sp_set_config_bits(config, 8) != SP_OK || sp_set_config_bits(config, 8) != SP_OK ||
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) {
if(!error_notified) { if(!error_notified) {
Application.uart_status.is_connected = false; status->is_connected = false;
ErrorLog("uart: cannot set config"); ErrorLog("uart: cannot set config");
} }
error_notified = true; error_notified = true;
@@ -69,7 +75,7 @@ bool uart_input::setup_port()
if (sp_flush(port, SP_BUF_BOTH) != SP_OK) { if (sp_flush(port, SP_BUF_BOTH) != SP_OK) {
if(!error_notified) { if(!error_notified) {
Application.uart_status.is_connected = false; status->is_connected = false;
ErrorLog("uart: cannot flush"); ErrorLog("uart: cannot flush");
} }
error_notified = true; error_notified = true;
@@ -77,10 +83,10 @@ bool uart_input::setup_port()
return false; return false;
} }
if(error_notified || !Application.uart_status.is_connected) { if(error_notified || ! status->is_connected) {
error_notified = false; error_notified = false;
ErrorLog("uart: connected to '"+conf.port+"'"); ErrorLog("uart: connected to '"+status->port_name+"'");
Application.uart_status.is_connected = true; status->is_connected = true;
} }
return true; return true;
@@ -181,6 +187,16 @@ uart_input::recall_bindings() {
void uart_input::poll() void uart_input::poll()
{ {
if(!Application.uart_status.enabled) {
if(port) {
sp_close(port);
sp_free_port(port);
port = nullptr;
}
Application.uart_status.is_connected = false;
return;
}
auto now = std::chrono::high_resolution_clock::now(); auto now = std::chrono::high_resolution_clock::now();
if (std::chrono::duration<float>(now - last_update).count() < conf.updatetime) if (std::chrono::duration<float>(now - last_update).count() < conf.updatetime)
return; return;

3
uart.h
View File

@@ -5,6 +5,9 @@
class UartStatus { class UartStatus {
public: public:
std::string port_name = "";
int baud = 0;
bool enabled = false;
bool is_connected = false; bool is_connected = false;
bool is_synced = false; bool is_synced = false;
unsigned long packets_sent = 0; unsigned long packets_sent = 0;