2d60571a9c
Adds a Docker-based interop harness that drives the C++ server with
secsgem-py 0.3.0 as the active host and probes a secsgem-py-passive
equipment from a minimal C++ active client. Surfaces and fixes four
interoperability bugs uncovered by cross-testing:
* SEMI E5 identifier formatcodes are a U1|U2|U4|U8 wildcard;
secsgem-py picks the narrowest fitting width while our parsers
only accepted U4. `as_uN_scalar` / `as_iN_scalar` now accept
any unsigned/signed width and range-check the downcast.
* PPBODY (S7F3/F6) is "ASCII | Binary | List" per the spec;
secsgem-py defaults to ASCII. Added BINARY_OR_ASCII codegen
item type with `as_text_or_binary` accessor.
* S1F23/F24 Collection Event Namelist was unimplemented; added
schema + `vids_for(ceid)` accessor on EventReportSubscriptions
plus the dispatch handler.
* S10F1 was registered as a host->equipment handler, but per
SEMI E5 §12 S10F1 is equipment->host; S10F3 is the actual
host->equipment Terminal Display Single. Added an S10F3
handler alongside (we keep S10F1 too for backward compat).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
301 lines
11 KiB
C++
301 lines
11 KiB
C++
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <functional>
|
|
#include <limits>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <variant>
|
|
#include <vector>
|
|
|
|
#include "secsgem/gem/data_model.hpp"
|
|
#include "secsgem/secs2/item.hpp"
|
|
#include "secsgem/secs2/message.hpp"
|
|
|
|
// Hand-written helpers used by the generated messages.hpp: scalar accessors
|
|
// (one per SECS-II type), a few list helpers, and the two special-case
|
|
// messages whose shape doesn't fit the codegen schema (S1F4 needs per-row
|
|
// optional values; S5F6 needs a callback to compute ALCD per alarm).
|
|
|
|
namespace secsgem::gem {
|
|
|
|
namespace s2 = secsgem::secs2;
|
|
namespace secs2 = secsgem::secs2; // alias used by generated code
|
|
|
|
// ---- Scalar accessors ----------------------------------------------------
|
|
|
|
inline std::optional<std::string> as_ascii(const s2::Item& item) {
|
|
if (item.format() != s2::Format::ASCII) return std::nullopt;
|
|
return item.as_ascii();
|
|
}
|
|
|
|
inline std::optional<std::string> as_binary_string(const s2::Item& item) {
|
|
if (item.format() != s2::Format::Binary) return std::nullopt;
|
|
const auto& v = item.as_bytes();
|
|
return std::string(v.begin(), v.end());
|
|
}
|
|
|
|
// SEMI E5 §13.16 PPBODY (and §13 documents-with-data-format-wildcards
|
|
// generally) is encoded as "List | Binary | ASCII". We expose a single
|
|
// helper that accepts either ASCII or Binary and returns a std::string
|
|
// (Lists end up rejected — callers with list-shaped PPBODY must use the
|
|
// ITEM passthrough type).
|
|
inline std::optional<std::string> as_text_or_binary(const s2::Item& item) {
|
|
if (item.format() == s2::Format::ASCII || item.format() == s2::Format::JIS8) {
|
|
return item.as_ascii();
|
|
}
|
|
if (item.format() == s2::Format::Binary) {
|
|
const auto& v = item.as_bytes();
|
|
return std::string(v.begin(), v.end());
|
|
}
|
|
return std::nullopt;
|
|
}
|
|
|
|
inline std::optional<uint8_t> as_binary_first(const s2::Item& item) {
|
|
if (item.format() != s2::Format::Binary) return std::nullopt;
|
|
const auto& v = item.as_bytes();
|
|
if (v.empty()) return std::nullopt;
|
|
return v.front();
|
|
}
|
|
|
|
inline std::optional<bool> as_boolean(const s2::Item& item) {
|
|
if (item.format() != s2::Format::Boolean) return std::nullopt;
|
|
const auto& v = item.as_bytes();
|
|
if (v.empty()) return std::nullopt;
|
|
return v.front() != 0;
|
|
}
|
|
|
|
// Templated typed-scalar accessor — one specialization per SECS-II numeric.
|
|
template <typename Vec>
|
|
inline std::optional<typename Vec::value_type> first_or_none(const s2::Item& item,
|
|
s2::Format want) {
|
|
if (item.format() != want) return std::nullopt;
|
|
const auto& v = std::get<Vec>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return v.front();
|
|
}
|
|
|
|
// SEMI E5 declares most identifier fields (DATAID, RPTID, CEID, VID,
|
|
// ALID, EXID, …) with FORMATCODE = "U1 | U2 | U4 | U8" — meaning a peer
|
|
// is free to encode them as any unsigned width that fits. secsgem-py,
|
|
// for example, picks the smallest type that holds the value (so an
|
|
// ALID of 1 goes out as U1). We therefore accept any unsigned width
|
|
// in the as_uN_scalar helpers, range-checking the downcast. Same logic
|
|
// for the signed I-types. Strictly typed fields (Binary, Boolean,
|
|
// ASCII, F4/F8) stay strict.
|
|
template <typename Out>
|
|
inline std::optional<Out> any_unsigned_first(const s2::Item& item) {
|
|
auto take = [](auto width) -> std::optional<Out> {
|
|
using W = decltype(width);
|
|
if constexpr (sizeof(W) == 0) return std::nullopt; // unreachable
|
|
else {
|
|
if (static_cast<uint64_t>(width) > static_cast<uint64_t>(std::numeric_limits<Out>::max()))
|
|
return std::nullopt;
|
|
return static_cast<Out>(width);
|
|
}
|
|
};
|
|
switch (item.format()) {
|
|
case s2::Format::U1: {
|
|
const auto& v = std::get<std::vector<uint8_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
case s2::Format::U2: {
|
|
const auto& v = std::get<std::vector<uint16_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
case s2::Format::U4: {
|
|
const auto& v = std::get<std::vector<uint32_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
case s2::Format::U8: {
|
|
const auto& v = std::get<std::vector<uint64_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
default: return std::nullopt;
|
|
}
|
|
}
|
|
|
|
template <typename Out>
|
|
inline std::optional<Out> any_signed_first(const s2::Item& item) {
|
|
auto take = [](auto width) -> std::optional<Out> {
|
|
using W = decltype(width);
|
|
if constexpr (sizeof(W) == 0) return std::nullopt;
|
|
else {
|
|
const int64_t w = static_cast<int64_t>(width);
|
|
if (w < static_cast<int64_t>(std::numeric_limits<Out>::min()) ||
|
|
w > static_cast<int64_t>(std::numeric_limits<Out>::max()))
|
|
return std::nullopt;
|
|
return static_cast<Out>(w);
|
|
}
|
|
};
|
|
switch (item.format()) {
|
|
case s2::Format::I1: {
|
|
const auto& v = std::get<std::vector<int8_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
case s2::Format::I2: {
|
|
const auto& v = std::get<std::vector<int16_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
case s2::Format::I4: {
|
|
const auto& v = std::get<std::vector<int32_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
case s2::Format::I8: {
|
|
const auto& v = std::get<std::vector<int64_t>>(item.storage());
|
|
if (v.empty()) return std::nullopt;
|
|
return take(v.front());
|
|
}
|
|
default: return std::nullopt;
|
|
}
|
|
}
|
|
|
|
inline std::optional<uint8_t> as_u1_scalar(const s2::Item& i) { return any_unsigned_first<uint8_t>(i); }
|
|
inline std::optional<uint16_t> as_u2_scalar(const s2::Item& i) { return any_unsigned_first<uint16_t>(i); }
|
|
inline std::optional<uint32_t> as_u4_scalar(const s2::Item& i) { return any_unsigned_first<uint32_t>(i); }
|
|
inline std::optional<uint64_t> as_u8_scalar(const s2::Item& i) { return any_unsigned_first<uint64_t>(i); }
|
|
inline std::optional<int8_t> as_i1_scalar(const s2::Item& i) { return any_signed_first<int8_t>(i); }
|
|
inline std::optional<int16_t> as_i2_scalar(const s2::Item& i) { return any_signed_first<int16_t>(i); }
|
|
inline std::optional<int32_t> as_i4_scalar(const s2::Item& i) { return any_signed_first<int32_t>(i); }
|
|
inline std::optional<int64_t> as_i8_scalar(const s2::Item& i) { return any_signed_first<int64_t>(i); }
|
|
inline std::optional<float> as_f4_scalar(const s2::Item& i) { return first_or_none<std::vector<float>>(i, s2::Format::F4); }
|
|
inline std::optional<double> as_f8_scalar(const s2::Item& i) { return first_or_none<std::vector<double>>(i, s2::Format::F8); }
|
|
|
|
// ---- List helpers --------------------------------------------------------
|
|
|
|
inline s2::Item u4_list_item(const std::vector<uint32_t>& ids) {
|
|
s2::Item::List children;
|
|
children.reserve(ids.size());
|
|
for (auto id : ids) children.push_back(s2::Item::u4(id));
|
|
return s2::Item::list(std::move(children));
|
|
}
|
|
|
|
inline std::optional<std::vector<uint32_t>> parse_u4_list_body(const s2::Message& m) {
|
|
if (!m.body || !m.body->is_list()) return std::nullopt;
|
|
std::vector<uint32_t> out;
|
|
for (const auto& c : m.body->as_list()) {
|
|
auto v = as_u4_scalar(c);
|
|
if (!v) return std::nullopt;
|
|
out.push_back(*v);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
// Generic "body is <B ack>" reader, used by tests + apps as a quick helper.
|
|
inline std::optional<uint8_t> ack_byte(const s2::Message& m) {
|
|
if (!m.body) return std::nullopt;
|
|
return as_binary_first(*m.body);
|
|
}
|
|
|
|
// ---- S1F4: list of values, nullopt -> <L,0> -----------------------------
|
|
|
|
inline s2::Message s1f4_selected_status_data(
|
|
const std::vector<std::optional<s2::Item>>& values) {
|
|
s2::Item::List children;
|
|
children.reserve(values.size());
|
|
for (const auto& v : values) {
|
|
children.push_back(v ? *v : s2::Item::list({}));
|
|
}
|
|
return s2::Message(1, 4, false, s2::Item::list(std::move(children)));
|
|
}
|
|
|
|
// ---- S5F6: alarm directory; ALCD bit-7 from per-row callback ------------
|
|
|
|
inline s2::Message s5f6_list_alarms_data(const std::vector<Alarm>& alarms,
|
|
const std::function<bool(uint32_t)>& active) {
|
|
s2::Item::List rows;
|
|
rows.reserve(alarms.size());
|
|
for (const auto& a : alarms) {
|
|
const uint8_t alcd = (a.severity_category & 0x7F) |
|
|
static_cast<uint8_t>(active(a.id) ? 0x80 : 0x00);
|
|
rows.push_back(s2::Item::list(
|
|
{s2::Item::binary({alcd}), s2::Item::u4(a.id), s2::Item::ascii(a.text)}));
|
|
}
|
|
return s2::Message(5, 6, false, s2::Item::list(std::move(rows)));
|
|
}
|
|
|
|
// ---- ALED byte constants for S5F3 ---------------------------------------
|
|
|
|
inline constexpr uint8_t kAlarmEnableByte = 0x80;
|
|
inline constexpr uint8_t kAlarmDisableByte = 0x00;
|
|
|
|
// ---- Ack enums that aren't tied to a specific store -------------------
|
|
|
|
enum class EventReportAck : uint8_t { // S6F12
|
|
Accept = 0,
|
|
Denied = 1,
|
|
};
|
|
|
|
enum class TerminalAck : uint8_t { // S10F2, S10F4
|
|
Accepted = 0,
|
|
WillNotDisplay = 1,
|
|
TerminalNotAvailable = 2,
|
|
};
|
|
|
|
// E5 §13 S12 (Wafer Maps). Encoded as separate enums even though the
|
|
// underlying byte semantics differ slightly across F2/F6/F8 — keeping
|
|
// them distinct preserves call-site readability.
|
|
// Reference point on a wafer/substrate map (E5 §13.7.4 REFP). Declared
|
|
// out of line so the messages.yaml catalog can mark it `external_struct`
|
|
// and reuse the same C++ type across F1 / F4.
|
|
struct ReferencePoint {
|
|
int32_t x;
|
|
int32_t y;
|
|
};
|
|
|
|
enum class MapSetupAck : uint8_t { // S12F2 SDACK
|
|
Accept = 0,
|
|
Error = 1,
|
|
};
|
|
|
|
enum class MapTransmitGrant : uint8_t { // S12F6 GRANT
|
|
Granted = 0,
|
|
BusyTryAgain = 1,
|
|
NoSpaceAvailable = 2,
|
|
DuplicateMID = 3,
|
|
MaterialNotRecognized = 4,
|
|
};
|
|
|
|
enum class MapDataAck : uint8_t { // S12F8 MAPER
|
|
Accept = 0,
|
|
FormatError = 1,
|
|
UnknownID = 2,
|
|
AbortNoMap = 3,
|
|
};
|
|
|
|
// E87 §10.2 carrier-action ack code (CAACK). Same byte used by S3F18,
|
|
// S3F26 (carrier transfer), and S3F28 (cancel carrier).
|
|
enum class CarrierActionAck : uint8_t {
|
|
Accept = 0,
|
|
Invalid = 1,
|
|
ParameterInvalid = 2,
|
|
CarrierIDUnknown = 3,
|
|
CarrierActionInvalid = 4,
|
|
CarrierInaccessible = 5,
|
|
CarrierActionInProgress = 6,
|
|
};
|
|
|
|
// E87 §10.4 port-group change ack code.
|
|
enum class PortGroupAck : uint8_t {
|
|
Accept = 0,
|
|
Error = 1,
|
|
};
|
|
|
|
// E87 slot-map verify ack code (SVACK). Same byte used by S3F20
|
|
// (verify reply) and S3F22 (host's ack of equipment's slot-map report).
|
|
enum class SlotMapVerifyAck : uint8_t {
|
|
Accept = 0,
|
|
Mismatch = 1,
|
|
CarrierUnknown = 2,
|
|
Error = 3,
|
|
};
|
|
|
|
} // namespace secsgem::gem
|