E40 Process Jobs + E94 Control Jobs + E30 communication state
GEM300 layer: SEMI E40-0705 Process Job and E94-0705 Control Job state machines, plus the E30 §6.1 communication-state machine that sits between HSMS SELECT and full GEM communication. Data-driven via data/process_job_state.yaml and data/control_job_state.yaml, mirroring the existing control_state.yaml pattern. Wire coverage: S14F9/F10 CreateObject (CJ) host -> equipment S14F11/F12 DeleteObject (CJ) host -> equipment S16F5/F6 PRJobCommand host -> equipment S16F9 PRJobAlert equipment -> host S16F11/F12 PRJobCreate (simplified body) host -> equipment S16F13/F14 PRJobDequeue host -> equipment S16F27/F28 CJobCommand host -> equipment Process Job FSM exposes 8 states matching PRJOBSTATE bytes (E40 §10.3.2); HOQ is reorder-aware (move-to-head against an insertion-order vector); Stop/Abort on a Queued PJ routes through ABORTING so the host observes PRJOBSTATE=7 on the wire (§6.3); alert_enabled is settable per-PJ for PRALERT control; FSM dispatches through ProcessJobStore::on_change_ dynamically so a late set_state_change_handler() reaches existing PJs. Hardening: loader rejects NoState (sentinel) as initial/from/to and rejects `on: created` rows; static_asserts pin enum values to wire bytes; ProcessJobStore is non-movable to keep the per-PJ this-capture safe. Server simulator cascades the full CJ -> PJ lifecycle on CJSTART so the wire trace exercises every legal state. CEIDs 400/401 fire on CJ state changes via the existing event-report pipeline. Tests: 60+ new assertions across test_process_jobs, test_control_jobs, test_communication_state, test_hsms_connection, plus loader and messages round-trip coverage. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -2,11 +2,14 @@
|
||||
|
||||
A C++20 SECS-II / HSMS / GEM client and server, fully containerised, with
|
||||
every behavioural rule encoded as YAML data (control state, equipment
|
||||
data dictionary, SECS-II message shapes).
|
||||
data dictionary, SECS-II message shapes, **E40 process-job + E94
|
||||
control-job state machines**).
|
||||
|
||||
See [COMPLIANCE.md](COMPLIANCE.md) for the per-capability E5/E30/E37 audit.
|
||||
Every GEM Fundamental and every GEM Additional capability that E30 binds
|
||||
to a concrete SECS-II message set is implemented and round-trip-tested.
|
||||
See [COMPLIANCE.md](COMPLIANCE.md) for the per-capability E5/E30/E37/E40/E94
|
||||
audit. Every GEM Fundamental and every GEM Additional capability that E30
|
||||
binds to a concrete SECS-II message set is implemented and
|
||||
round-trip-tested; E40 PJ and E94 CJ lifecycle messages (S16F5/F6/F9/F11/F12/F13/F14/F27/F28
|
||||
and S14F9/F10/F11/F12) are wired through the same data-driven runtime.
|
||||
|
||||
## Quick start
|
||||
|
||||
@@ -14,7 +17,7 @@ Everything runs in Docker — no compiler or build tools on the host.
|
||||
|
||||
```bash
|
||||
docker compose run --rm builder # configure + compile
|
||||
docker compose run --rm tests # 84+ test cases / 480+ assertions
|
||||
docker compose run --rm tests # 148 test cases / 794 assertions
|
||||
docker compose up --no-deps server client # live two-container demo
|
||||
```
|
||||
|
||||
@@ -26,11 +29,13 @@ the C++ is the engine that reads them.
|
||||
```
|
||||
┌──────────────────────────────────────────────────────────────┐
|
||||
│ data/ │
|
||||
│ messages.yaml SECS-II message catalog (44 SxFy) │
|
||||
│ control_state.yaml E30 §6.2 transition table │
|
||||
│ equipment.yaml SVIDs / DVIDs / ECIDs / CEIDs / │
|
||||
│ alarms / recipes / commands / │
|
||||
│ capabilities / spool / DVID list │
|
||||
│ messages.yaml SECS-II message catalog │
|
||||
│ control_state.yaml E30 §6.2 control transition table │
|
||||
│ process_job_state.yaml E40 §6 PJ transition table │
|
||||
│ control_job_state.yaml E94 §6 CJ transition table │
|
||||
│ equipment.yaml SVIDs / DVIDs / ECIDs / CEIDs / │
|
||||
│ alarms / recipes / commands / │
|
||||
│ capabilities / spool / DVID list │
|
||||
└──────────────────────┬───────────────────────────────────────┘
|
||||
│ (loaded at startup, codegened at build)
|
||||
▼
|
||||
@@ -51,10 +56,12 @@ the C++ is the engine that reads them.
|
||||
┌──────────────────────────────────────────────────────────────┐
|
||||
│ secsgem::config loader.hpp: YAML -> tables + data model │
|
||||
│ secsgem::gem ControlTransitionTable + ControlStateMachine,│
|
||||
│ EquipmentDataModel composing nine stores: │
|
||||
│ ProcessJobStateMachine (E40), │
|
||||
│ ControlJobStateMachine (E94), │
|
||||
│ EquipmentDataModel composing the stores: │
|
||||
│ SVID, DVID, ECID, Event Subscriptions, │
|
||||
│ Alarms, Recipes, Clock, Commands, Spool, │
|
||||
│ Limits, Traces │
|
||||
│ Limits, Traces, ProcessJobs, ControlJobs │
|
||||
│ Router (stream, function) -> handler │
|
||||
│ generated messages.hpp (all 44 SxFy) │
|
||||
│ secsgem::hsms Connection (Asio), Header, Frame, Timers │
|
||||
@@ -81,7 +88,8 @@ secs-gem/
|
||||
├── include/secsgem/
|
||||
│ ├── secs2/{item,codec,message}.hpp
|
||||
│ ├── hsms/{header,connection}.hpp
|
||||
│ ├── gem/{control_state,data_model,messages_helpers,router}.hpp
|
||||
│ ├── gem/{control_state,communication_state,data_model,messages_helpers,router}.hpp
|
||||
│ ├── gem/{process_job_state,control_job_state}.hpp # E40 / E94 FSMs
|
||||
│ ├── gem/store/ # one file per focused store:
|
||||
│ │ ├── status_variables.hpp # SVIDs + DVIDs
|
||||
│ │ ├── equipment_constants.hpp # ECIDs + EAC range validation
|
||||
@@ -92,7 +100,9 @@ secs-gem/
|
||||
│ │ ├── host_commands.hpp # RCMD registry
|
||||
│ │ ├── spool.hpp # spool queue + state
|
||||
│ │ ├── limits.hpp # variable limit definitions
|
||||
│ │ └── trace.hpp # active trace configs
|
||||
│ │ ├── trace.hpp # active trace configs
|
||||
│ │ ├── process_jobs.hpp # E40 PJ collection
|
||||
│ │ └── control_jobs.hpp # E94 CJ collection
|
||||
│ ├── config/loader.hpp
|
||||
│ └── endpoint.hpp
|
||||
├── src/{secs2,hsms,gem,config}/*.cpp + endpoint.cpp
|
||||
@@ -131,6 +141,19 @@ transitions:
|
||||
- {from: OnlineRemote, on: host_request_offline, to: EquipmentOffline, ack: Accept}
|
||||
```
|
||||
|
||||
### Add an E40 PJ transition (e.g. a tool-specific HOLD state)
|
||||
|
||||
```yaml
|
||||
# data/process_job_state.yaml
|
||||
transitions:
|
||||
- {from: Processing, on: hold, to: OnHold}
|
||||
- {from: OnHold, on: resume, to: Processing}
|
||||
```
|
||||
|
||||
(Adding a brand-new state requires bumping the `ProcessJobState` enum
|
||||
in `include/secsgem/gem/process_job_state.hpp` too — it's the wire enum
|
||||
that S16F9 carries.)
|
||||
|
||||
### Add a new SECS-II message
|
||||
|
||||
```yaml
|
||||
@@ -184,6 +207,16 @@ The two-container demo walks ~20 SECS transactions:
|
||||
[host] EVENT CEID=300 (from spool, post-fact)
|
||||
[host] -> S7F19 W [equip] -> S7F20 (2 PPIDs)
|
||||
[host] -> S7F5 W RECIPE-A [equip] -> S7F6
|
||||
[host] -> S16F11 W PJ-1 RECIPE-A [equip] -> S16F12 HCACK=0
|
||||
[host] -> S14F9 W CJ-1 [PJ-1] [equip] -> S14F10 OBJACK=0
|
||||
[host] -> S16F27 W CJ-1 CJSTART [equip] CJ Queued -> Executing
|
||||
[host] <- S6F11 CEID=400 PJ Queued -> SettingUp
|
||||
[host] <- S16F9 PJ-1 state=SettingUp PJ -> WaitingForStart
|
||||
[host] <- S16F9 PJ-1 state=WaitingForStart PJ -> Processing
|
||||
[host] <- S16F9 PJ-1 state=Processing PJ -> ProcessComplete
|
||||
[host] <- S16F9 PJ-1 state=ProcessComplete CJ -> Completed
|
||||
[host] <- S6F11 CEID=401
|
||||
[host] -> S14F11 W CJ-1 [equip] -> S14F12 OBJACK=0
|
||||
[host] -> S10F1 W [equip] TERMINAL[0] Hello equipment!
|
||||
[host] -> S1F15 W [equip] OnlineRemote -> HostOffline
|
||||
[host] -> Separate.req [equip] <- Separate.req
|
||||
|
||||
Reference in New Issue
Block a user