eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-19 15:24:28 +02:00
Code Issues 151 Wiki Activity

hardware protocol v2.1: device log, diagnostic routines, manual links

Browse Source 
Three additions, all driven from the simulator debug panel.

DEVICE_LOG lets a controller send text lines; they reach the simulator log
and a per connection view in the panel which keeps the last 64 of them.

Diagnostic routines: a controller lists the procedures it offers, the
operator picks one from a drop down and starts it, and the controller
reports progress and the result. While a routine runs the controller can
ask the simulator to show a message box with its own text and buttons and
gets back which one was pressed, which is what a valve or gauge
calibration needs. The message box appears whether the debug panel is
open or not.

Links can now be disconnected and reconnected by hand: disconnecting
closes the serial port so the controller can be reprogrammed, and the
session is rebuilt from scratch on reconnect. Ports which appear while
the simulation runs can be picked from a refreshed list, given a baud
rate and added as a new controller, so the manager now starts even with
no uart2 entries in eu07.ini.
This commit is contained in:
Hirek
2026-09-06 11:29:26 +00:00
parent da962cd91b
commit eed44dc858
10 changed files with 777 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hardware/protocol/protocol_session.h
View File

@@ -56,6 +56,16 @@ public:
// copies the current condition into the debug report
void fill_report( link_report &Report ) const;
// ---- diagnostics offered by the device, driven from the debug panel ----
// starts one of the routines the device advertised; false when it isn't available
bool start_diagnostic( std::uint8_t const Function );
void cancel_diagnostic();
// answers the message box the device asked the simulator to show
void answer_prompt( std::uint8_t const Option );
bool has_prompt() const { return m_prompt.active; }
diagnostic_prompt const &prompt() const { return m_prompt; }
std::vector<diagnostic_function> const &functions() const { return m_functions; }
session_state state() const { return m_state; }
link_state link_condition() const;
protocol_diagnostics const &diagnostics() const { return m_diagnostics; }
@@ -84,6 +94,11 @@ private:
void handle_control_set( decoded_packet const &Packet );
void handle_device_diagnostics( decoded_packet const &Packet );
void handle_heartbeat( decoded_packet const &Packet );
void handle_device_log( decoded_packet const &Packet );
void handle_diagnostic_functions( decoded_packet const &Packet );
void handle_diagnostic_status( decoded_packet const &Packet );
void handle_diagnostic_prompt( decoded_packet const &Packet );
void handle_device_answer( decoded_packet const &Packet, bool const Positive );
void send_state_update( std::vector<state_item> const &Items, bool const Snapshot );
void send_symbol_context_changed( std::uint32_t const Context );
@@ -109,6 +124,8 @@ private:
std::uint32_t m_sessionid = 0;
std::uint32_t m_sequence = 0;
std::uint32_t m_lastreceivedsequence = 0;
// transaction numbering for the few requests the simulator itself makes
std::uint32_t m_outgoingtransaction = 0;
bool m_sequenceseen = false;
std::size_t m_framesize = protocol_frame_size_default;
std::uint32_t m_capabilities = 0;
@@ -150,6 +167,10 @@ private:
protocol_diagnostics m_diagnostics;
device_diagnostics m_devicediagnostics;
std::vector<diagnostic_function> m_functions;
diagnostic_report m_diagnostic;
diagnostic_prompt m_prompt;
std::deque<device_log_entry> m_log;
rate_counter m_rxrate;
rate_counter m_txrate;
};