96b02f8b50
A fully containerised SECS/GEM toolchain. Single docker compose project,
no host build tools. 63 unit-test cases / 278 assertions, two demo
executables, end-to-end two-container demo exercising every implemented
capability.
Architecture (bottom-up):
secs2/ E5 SECS-II codec
Item variant over L/A/B/BOOLEAN/I1-8/U1-8/F4/F8
encode/decode big-endian, 1/2/3-byte length encoding
Message SxFy + W-bit + optional root item
to_sml human-readable text rendering
hsms/ E37 HSMS transport (TCP)
Header 10-byte header + SType enum (Data/Select/Deselect/
Linktest/Reject/Separate)
Frame 4-byte length prefix + payload encode/decode
Connection async Asio TCP, NOT-SELECTED -> SELECTED state machine,
T3/T5/T6/T7/T8 timers, system-bytes reply correlation,
graceful close-after-flush separation
endpoint active Client (connect with T5 retry) and passive Server
(accept loop) wrappers over Connection
gem/ E30 GEM logic
ControlStateMachine 5-state E30 control model with operator
actions, host requests, SEMI-mandated ack
codes (OnlineAck, OfflineAck, CommAck), and
a state-change handler
EquipmentDataModel in-memory dictionary: SVIDs, DVIDs, ECIDs
(with EAC), CEIDs, report defs, CEID->report
links, enabled-events set, alarm table
(ALCD, enabled, active), process programs,
host command registry, clock (16-char
YYYYMMDDhhmmsscc with offset)
messages.hpp builders + parsers for every SxFy below
GEM message coverage (full list):
S1F1/F2 Are You There / On Line Data
S1F3/F4 Selected Equipment Status Request / Data
S1F11/F12 Status Variable Namelist Request / Data
S1F13/F14 Establish Communications (+ CommAck)
S1F15/F16 Request OFFLINE (+ OfflineAck)
S1F17/F18 Request ONLINE (+ OnlineAck)
S2F13/F14 Equipment Constant Request / Data
S2F15/F16 EC Send + EquipmentAck (Accept/UnknownEcid/Busy/OutOfRange)
S2F17/F18 Date and Time Request / Data
S2F29/F30 Equipment Constant Namelist Request / Data
S2F31/F32 Date and Time Set Request / TimeAck
S2F33/F34 Define Report + DefineReportAck (5 enum values)
S2F35/F36 Link Event Report + LinkEventAck
S2F37/F38 Enable / Disable Event Report + EnableEventAck
S2F41/F42 Host Command + HostCmdAck (7 values) + per-param CPACKs
S5F1/F2 Alarm Report Send + AlarmAck (ALCD bit-7 set/cleared
+ lower-7 category)
S5F3/F4 Enable/Disable Alarm Send + AlarmAck
S5F5/F6 List Alarms Request / Data (active alarms tagged in ALCD)
S6F11/F12 Event Report Send (equipment-initiated CEID emission
with full report data) + EventReportAck
S7F3/F4 Process Program Send + ProcessProgramAck (7 values)
S7F5/F6 Process Program Request / Data
S7F19/F20 Current EPPD List Request / Data
S10F1/F2 Terminal Display Single (host->equipment) + TerminalAck
S10F3/F4 Terminal Display Single (equipment->host)
Demo apps:
apps/secs_server.cpp passive equipment. Populates the data model
with 3 SVIDs (ControlState, Clock,
EventsEnabled), 2 ECIDs, 3 CEIDs
(ControlStateChanged, AlarmSetEvent,
ProcessStarted), 2 alarms (Chiller Temp High
cat 4, Door Open cat 1), 2 recipes
(RECIPE-A, RECIPE-B), and 4 host commands
(START, STOP, PAUSE, FAULT). Emits S6F11 on
every control state transition + on START;
emits S5F1 + the AlarmSetEvent CEID on FAULT.
Pushes an S10F3 welcome message when the host
comes online.
apps/secs_client.cpp active host. Walks 17 steps: Establish ->
Online -> S1F11 SVID namelist -> S1F3 read ->
S2F29 EC namelist -> S2F13 read ->
S2F17 clock -> S2F33/S2F35/S2F37 dynamic
event subscription -> S2F41 START
(-> receives S6F11) -> S5F5 alarm list ->
S5F3 enable alarm 1 -> S2F41 FAULT
(-> receives S5F1 + S6F11) -> S7F19/S7F5
recipe list + body -> S10F1 terminal ->
S1F15 Offline -> Separate. Handles inbound
S6F11, S5F1, S10F3 primaries.
Testing:
tests/test_secs2.cpp codec round-trip for every format,
byte-layout assertions for known values,
truncation/trailing-byte rejection,
nested list round-trip, SML rendering
tests/test_hsms.cpp header byte layout, data + control
header round-trip, full frame round-
trip with length prefix, short-payload
rejection
tests/test_control_state.cpp every (state, event) pair in the E30
control state machine, including
AlreadyOnline / NotAccept rejections
and idempotent offline-while-offline
tests/test_data_model.cpp SVID/ECID/Alarm/Recipe CRUD, clock
format + parse, host command registry,
full event-report pipeline (define ->
link -> enable -> compose) with
every error path (InvalidVid,
UnknownCeid, UnknownRptid), alarm
set/clear with ALCD bit-7 semantics
tests/test_messages.cpp round-trip + byte-layout for every
builder/parser pair, including S6F11
event reports with mixed item types
Toolchain:
Dockerfile Ubuntu 24.04, g++-13, CMake, Ninja, libasio-dev
docker-compose.yml builder / tests / server / client services,
source bind-mounted, build artifacts in a
named volume so the host tree stays clean
CMakeLists.txt C++20, -Wall -Wextra -Wpedantic, standalone
Asio (ASIO_STANDALONE), doctest via FetchContent
Documentation:
README.md architecture, quick start, demo log
COMPLIANCE.md honest per-capability E5/E30/E37 audit with
spec section refs. Calls out what's implemented,
what's partial (Reject.req, Alarms missing F7/F8,
EC range validation, PP without verify, terminal
single-line only), and what's intentionally not
yet implemented (spooling, S9 error stream,
Documentation S1F19/F20+F21/F22, limits monitoring,
trace data collection, multi-block, material
movement). Does NOT claim "100% GEM-compliant" and
lists the work required to honestly make that claim.
This is Layer 0 + the start of Layer 1 from implementation_plan.md.
The transition-table-driven "spec-as-data" architecture (Layer 1
proper) is not yet implemented; the current code uses imperative
state machines that are structurally ready to be refactored onto
tables.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
265 lines
7.8 KiB
C++
265 lines
7.8 KiB
C++
#pragma once
|
|
|
|
#include <algorithm>
|
|
#include <cstdint>
|
|
#include <functional>
|
|
#include <map>
|
|
#include <optional>
|
|
#include <set>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "secsgem/secs2/item.hpp"
|
|
|
|
namespace secsgem::gem {
|
|
|
|
namespace s2 = secsgem::secs2;
|
|
|
|
// ---- Status / data / equipment-constant variables ------------------------
|
|
|
|
struct StatusVariable {
|
|
uint32_t id;
|
|
std::string name;
|
|
std::string units;
|
|
s2::Item value;
|
|
};
|
|
|
|
struct DataVariable {
|
|
uint32_t id;
|
|
std::string name;
|
|
std::string units;
|
|
s2::Item value;
|
|
};
|
|
|
|
struct EquipmentConstant {
|
|
uint32_t id;
|
|
std::string name;
|
|
std::string units;
|
|
s2::Item value;
|
|
s2::Item def_value;
|
|
std::string min_str; // optional, ASCII for S2F30 ECMIN/ECMAX
|
|
std::string max_str;
|
|
};
|
|
|
|
// ---- Event reports -------------------------------------------------------
|
|
|
|
struct CollectionEvent {
|
|
uint32_t id;
|
|
std::string name;
|
|
};
|
|
|
|
struct Report {
|
|
uint32_t id;
|
|
std::vector<uint32_t> vids;
|
|
};
|
|
|
|
// One report's worth of data at emission time: the RPTID and the values for
|
|
// each VID, in declaration order.
|
|
struct ReportData {
|
|
uint32_t rptid;
|
|
std::vector<s2::Item> values;
|
|
};
|
|
|
|
// ---- Alarms --------------------------------------------------------------
|
|
|
|
struct Alarm {
|
|
uint32_t id;
|
|
std::string text;
|
|
// Lower 7 bits of ALCD: alarm severity category (1=personal safety,
|
|
// 2=equipment safety, 4=parameter control error, ...). Bit 7 is the
|
|
// set/cleared flag, applied at emit time.
|
|
uint8_t severity_category;
|
|
};
|
|
|
|
// ---- Ack codes for the new SxFy ------------------------------------------
|
|
|
|
// S2F30 carries no ack; S2F34 / S2F36 / S2F38 do.
|
|
enum class DefineReportAck : uint8_t {
|
|
Accept = 0,
|
|
InsufficientSpace = 1,
|
|
InvalidFormat = 2,
|
|
RptidAlreadyDefined = 3,
|
|
InvalidVid = 5,
|
|
};
|
|
|
|
enum class LinkEventAck : uint8_t {
|
|
Accept = 0,
|
|
InsufficientSpace = 1,
|
|
InvalidFormat = 2,
|
|
UnknownCeid = 3,
|
|
UnknownRptid = 4,
|
|
CeidAlreadyLinked = 5,
|
|
};
|
|
|
|
enum class EnableEventAck : uint8_t {
|
|
Accept = 0,
|
|
UnknownCeid = 1,
|
|
};
|
|
|
|
// S5F2 / S5F4 alarm ack.
|
|
enum class AlarmAck : uint8_t {
|
|
Accept = 0,
|
|
Error = 1,
|
|
};
|
|
|
|
// S6F12 event-report ack.
|
|
enum class EventReportAck : uint8_t {
|
|
Accept = 0,
|
|
Denied = 1,
|
|
};
|
|
|
|
// S7F4 process-program ack.
|
|
enum class ProcessProgramAck : uint8_t {
|
|
Accept = 0,
|
|
PermissionNotGranted = 1,
|
|
LengthError = 2,
|
|
MatrixOverflow = 3,
|
|
PpidNotFound = 4,
|
|
ModeUnsupported = 5,
|
|
PerformanceError = 6,
|
|
};
|
|
|
|
// ---- Existing ack enums from earlier batches -----------------------------
|
|
|
|
enum class EquipmentAck : uint8_t {
|
|
Accept = 0,
|
|
Denied_UnknownEcid = 1,
|
|
Denied_Busy = 3,
|
|
Denied_OutOfRange = 4,
|
|
};
|
|
|
|
enum class TimeAck : uint8_t {
|
|
Accept = 0,
|
|
Error = 1,
|
|
NotDoneNotEmpty = 2,
|
|
};
|
|
|
|
enum class HostCmdAck : uint8_t {
|
|
Accept = 0,
|
|
InvalidCommand = 1,
|
|
CannotDoNow = 2,
|
|
ParameterInvalid = 3,
|
|
AcceptedWillFinishLater = 4,
|
|
Rejected = 5,
|
|
InvalidObject = 6,
|
|
};
|
|
|
|
enum class TerminalAck : uint8_t {
|
|
Accepted = 0,
|
|
WillNotDisplay = 1,
|
|
TerminalNotAvailable = 2,
|
|
};
|
|
|
|
// The in-memory equipment data dictionary. Owns SVIDs, DVIDs, ECIDs, the
|
|
// dynamic event-report subscription state (reports + links + enabled set),
|
|
// the alarm table, and a small process-program registry. Single-threaded;
|
|
// all access happens on the Asio executor.
|
|
class EquipmentDataModel {
|
|
public:
|
|
struct CommandParam {
|
|
std::string name;
|
|
s2::Item value;
|
|
};
|
|
using HostCommandHandler = std::function<HostCmdAck(const std::vector<CommandParam>&)>;
|
|
|
|
// --- SVID ---------------------------------------------------------------
|
|
void add_status_variable(StatusVariable sv);
|
|
std::optional<StatusVariable> status_variable(uint32_t id) const;
|
|
std::vector<StatusVariable> all_status_variables() const;
|
|
void set_status_value(uint32_t id, s2::Item value);
|
|
|
|
// --- DVID ---------------------------------------------------------------
|
|
void add_data_variable(DataVariable dv);
|
|
std::optional<DataVariable> data_variable(uint32_t id) const;
|
|
std::vector<DataVariable> all_data_variables() const;
|
|
void set_data_value(uint32_t id, s2::Item value);
|
|
|
|
// VID lookup that searches SVIDs then DVIDs (E30 §6.5 — VIDs share a
|
|
// namespace from the host's point of view).
|
|
std::optional<s2::Item> vid_value(uint32_t vid) const;
|
|
bool vid_exists(uint32_t vid) const;
|
|
|
|
// --- ECID ---------------------------------------------------------------
|
|
void add_equipment_constant(EquipmentConstant ec);
|
|
std::optional<EquipmentConstant> equipment_constant(uint32_t id) const;
|
|
std::vector<EquipmentConstant> all_equipment_constants() const;
|
|
EquipmentAck set_equipment_constant_value(uint32_t id, s2::Item value);
|
|
|
|
// --- Clock --------------------------------------------------------------
|
|
std::string current_time_string() const;
|
|
TimeAck set_time_string(const std::string& time_str);
|
|
|
|
// --- Host commands ------------------------------------------------------
|
|
void register_command(const std::string& rcmd, HostCommandHandler handler);
|
|
HostCmdAck dispatch_command(const std::string& rcmd,
|
|
const std::vector<CommandParam>& params) const;
|
|
bool has_command(const std::string& rcmd) const;
|
|
|
|
// --- Collection events --------------------------------------------------
|
|
void register_event(CollectionEvent ce);
|
|
bool has_event(uint32_t ceid) const;
|
|
std::vector<CollectionEvent> all_events() const;
|
|
|
|
// S2F33: define reports. `reports` maps RPTID -> VID list. An empty
|
|
// vector deletes all reports (and clears all links). An empty VID list
|
|
// for a given RPTID deletes that report.
|
|
DefineReportAck define_reports(
|
|
const std::vector<std::pair<uint32_t, std::vector<uint32_t>>>& reports);
|
|
|
|
// S2F35: link CEIDs to RPTID lists. `links` maps CEID -> RPTID list.
|
|
// An empty RPTID list for a CEID clears its links. An empty outer list
|
|
// clears all links.
|
|
LinkEventAck link_event_reports(
|
|
const std::vector<std::pair<uint32_t, std::vector<uint32_t>>>& links);
|
|
|
|
// S2F37: enable/disable events. Empty CEID list applies to *all*
|
|
// registered events.
|
|
EnableEventAck enable_events(bool enable, const std::vector<uint32_t>& ceids);
|
|
|
|
bool is_event_enabled(uint32_t ceid) const;
|
|
|
|
// Compose the report data for a CEID emission (S6F11 body's report list).
|
|
std::vector<ReportData> compose_reports_for(uint32_t ceid) const;
|
|
|
|
std::vector<Report> all_reports() const;
|
|
|
|
// --- Alarms -------------------------------------------------------------
|
|
void add_alarm(Alarm a);
|
|
std::optional<Alarm> alarm(uint32_t alid) const;
|
|
std::vector<Alarm> all_alarms() const;
|
|
AlarmAck set_alarm_enabled(uint32_t alid, bool enable);
|
|
bool alarm_enabled(uint32_t alid) const;
|
|
// Returns the ALCD byte to put on the wire (bit 7 indicates set/cleared).
|
|
// Returns nullopt for unknown alarms.
|
|
std::optional<uint8_t> alarm_set(uint32_t alid);
|
|
std::optional<uint8_t> alarm_clear(uint32_t alid);
|
|
bool alarm_active(uint32_t alid) const;
|
|
|
|
// --- Process programs ---------------------------------------------------
|
|
void add_process_program(std::string ppid, std::string ppbody);
|
|
std::optional<std::string> process_program(const std::string& ppid) const;
|
|
std::vector<std::string> process_program_list() const;
|
|
ProcessProgramAck delete_process_program(const std::string& ppid);
|
|
|
|
private:
|
|
std::map<uint32_t, StatusVariable> svids_;
|
|
std::map<uint32_t, DataVariable> dvids_;
|
|
std::map<uint32_t, EquipmentConstant> ecids_;
|
|
std::int64_t time_offset_seconds_ = 0;
|
|
std::map<std::string, HostCommandHandler> commands_;
|
|
|
|
std::map<uint32_t, CollectionEvent> ceids_;
|
|
std::map<uint32_t, Report> reports_;
|
|
std::map<uint32_t, std::vector<uint32_t>> ce_links_; // CEID -> RPTID list
|
|
std::set<uint32_t> events_enabled_;
|
|
|
|
std::map<uint32_t, Alarm> alarms_;
|
|
std::set<uint32_t> alarms_enabled_;
|
|
std::set<uint32_t> alarms_active_;
|
|
|
|
std::map<std::string, std::string> process_programs_;
|
|
};
|
|
|
|
} // namespace secsgem::gem
|