From c000863edd91b7c19cfdd4c1898ef2aa9686bb7e Mon Sep 17 00:00:00 2001 From: hadaq Date: Sun, 28 Feb 2021 19:02:01 +0100 Subject: [PATCH] update TriggerBox register definitions --- web/htdocs/layout/blue.css | 3 +- xml-db/database/TriggerBox.xml | 1295 +++++++++++++++----------------- 2 files changed, 613 insertions(+), 685 deletions(-) diff --git a/web/htdocs/layout/blue.css b/web/htdocs/layout/blue.css index 7e02a4f..25f5b8f 100644 --- a/web/htdocs/layout/blue.css +++ b/web/htdocs/layout/blue.css @@ -395,7 +395,8 @@ th:hover .tooltip, td:hover .tooltip { table.queryresult th div, table.queryresult td div { position:relative; cursor:default; -} + min-width:32px; + } tr.endslice td { diff --git a/xml-db/database/TriggerBox.xml b/xml-db/database/TriggerBox.xml index c58a40b..76f3a0a 100644 --- a/xml-db/database/TriggerBox.xml +++ b/xml-db/database/TriggerBox.xml @@ -89,38 +89,38 @@ RPC S3 RPC S4 RPC S5 - Virtual Input 0 - Virtual Input 1 - Virtual Input 2 - Virtual Input 3 - Virtual Input 4 - Virtual Input 5 - Virtual Input 6 - Virtual Input 7 - Virtual Input 8 - Virtual Input 9 - Virtual Input 10 - Virtual Input 11 - Virtual Input 12 - Virtual Input 13 - Virtual Input 14 - Virtual Input 15 - Virtual Input 16 - Virtual Input 17 - Virtual Input 18 - Virtual Input 19 - Virtual Input 20 - Virtual Input 21 - Virtual Input 22 - Virtual Input 23 - Virtual Input 24 - Virtual Input 25 - Virtual Input 26 - Virtual Input 27 - Virtual Input 28 - Virtual Input 29 - Virtual Input 30 - Virtual Input 31 + Virtual 0 + Virtual 1 + Virtual 2 + Virtual 3 + Virtual 4 + Virtual 5 + Virtual 6 + Virtual 7 + Virtual 8 + Virtual 9 + Virtual 10 + Virtual 11 + Virtual 12 + Virtual 13 + Virtual 14 + Virtual 15 + Virtual 16 + Virtual 17 + Virtual 18 + Virtual 19 + Virtual 20 + Virtual 21 + Virtual 22 + Virtual 23 + Virtual 24 + Virtual 25 + Virtual 26 + Virtual 27 + Virtual 28 + Virtual 29 + Virtual 30 + Virtual 31 Enable Input @@ -251,94 +251,94 @@ Select Inputs 0 to 32 in group - Processed Input 0 - Processed Input 1 - Processed Input 2 - Processed Input 3 - Processed Input 4 - Processed Input 5 - Processed Input 6 - Processed Input 7 - Processed Input 8 - Processed Input 9 - Processed Input 10 - Processed Input 11 - Processed Input 12 - Processed Input 13 - Processed Input 14 - Processed Input 15 - Processed Input 16 - Processed Input 17 - Processed Input 18 - Processed Input 19 - Processed Input 20 - Processed Input 21 - Processed Input 22 - Processed Input 23 - Processed Input 24 - Processed Input 25 - Processed Input 26 - Processed Input 27 - Processed Input 28 - Processed Input 29 - Processed Input 30 - Processed Input 31 + iTOF S0 + iTOF S0 P0 + iTOF S0 P1 + iTOF S0 P2 + iTOF S1 + iTOF S1 P0 + iTOF S1 P1 + iTOF S1 P2 + iTOF S2 + iTOF S2 P0 + iTOF S2 P1 + iTOF S2 P2 + iTOF S3 + iTOF S3 P0 + iTOF S3 P1 + iTOF S3 P2 + iTOF S4 + iTOF S4 P0 + iTOF S4 P1 + iTOF S4 P2 + iTOF S5 + iTOF S5 P0 + iTOF S5 P1 + iTOF S5 P2 + Secondary 0 + Secondary 1 + Secondary 2 + Secondary 3 + J 0 + J 1 + J 2 + J 3 Select Inputs 32 to 63 in group - Processed Input 32 - Processed Input 33 - Processed Input 34 - Processed Input 35 - Processed Input 36 - Processed Input 37 - Processed Input 38 - Processed Input 39 - Processed Input 40 - Processed Input 41 - Processed Input 42 - Processed Input 43 - Processed Input 44 - Processed Input 45 - Processed Input 46 - Processed Input 47 - Multiplexed Input 0 - Multiplexed Input 1 - Multiplexed Input 2 - Multiplexed Input 3 - Multiplexed Input 4 - Multiplexed Input 5 - Multiplexed Input 6 - Multiplexed Input 7 - Multiplexed Input 8 - Multiplexed Input 9 - Multiplexed Input 10 - Multiplexed Input 11 - Multiplexed Input 12 - Multiplexed Input 13 - Multiplexed Input 14 - Multiplexed Input 15 + TOF S0 + TOF S1 + TOF S2 + TOF S3 + TOF S4 + TOF S5 + Input 38 + Input 39 + RPC S0 + RPC S1 + RPC S2 + RPC S3 + Input 44 + RPC S4 + RPC S5 + Input 47 + Virtual 0 + Virtual 1 + Virtual 2 + Virtual 3 + Virtual 4 + Virtual 5 + Virtual 6 + Virtual 7 + Virtual 8 + Virtual 9 + Virtual 10 + Virtual 11 + Virtual 12 + Virtual 13 + Virtual 14 + Virtual 15 Select Inputs 64 to 95 in group - Multiplexed Input 16 - Multiplexed Input 17 - Multiplexed Input 18 - Multiplexed Input 19 - Multiplexed Input 20 - Multiplexed Input 21 - Multiplexed Input 22 - Multiplexed Input 23 - Multiplexed Input 24 - Multiplexed Input 25 - Multiplexed Input 26 - Multiplexed Input 27 - Multiplexed Input 28 - Multiplexed Input 29 - Multiplexed Input 30 - Multiplexed Input 31 + Virtual 16 + Virtual 17 + Virtual 18 + Virtual 19 + Virtual 20 + Virtual 21 + Virtual 22 + Virtual 23 + Virtual 24 + Virtual 25 + Virtual 26 + Virtual 27 + Virtual 28 + Virtual 29 + Virtual 30 + Virtual 31 - - + - + Group signals with 'or' for output before 'and' with group B - + Use Inputs 0 to 31 for output - - iTOF S0 - iTOF S0 P0 - iTOF S0 P1 - iTOF S0 P2 - iTOF S1 - iTOF S1 P0 - iTOF S1 P1 - iTOF S1 P2 - iTOF S2 - iTOF S2 P0 - iTOF S2 P1 - iTOF S2 P2 - iTOF S3 - iTOF S3 P0 - iTOF S3 P1 - iTOF S3 P2 - iTOF S4 - iTOF S4 P0 - iTOF S4 P1 - iTOF S4 P2 - iTOF S5 - iTOF S5 P0 - iTOF S5 P1 - iTOF S5 P2 - Secondary 0 - Secondary 1 - Secondary 2 - Secondary 3 - 28 - 29 - 30 - 31 + + iTOF S0 + iTOF S0 P0 + iTOF S0 P1 + iTOF S0 P2 + iTOF S1 + iTOF S1 P0 + iTOF S1 P1 + iTOF S1 P2 + iTOF S2 + iTOF S2 P0 + iTOF S2 P1 + iTOF S2 P2 + iTOF S3 + iTOF S3 P0 + iTOF S3 P1 + iTOF S3 P2 + iTOF S4 + iTOF S4 P0 + iTOF S4 P1 + iTOF S4 P2 + iTOF S5 + iTOF S5 P0 + iTOF S5 P1 + iTOF S5 P2 + Secondary 0 + Secondary 1 + Secondary 2 + Secondary 3 + 28 + 29 + 30 + 31 - + Group signals with 'or' for output before 'and' with group A - + Use Inputs 0 to 31 for output - - iTOF S0 - iTOF S0 P0 - iTOF S0 P1 - iTOF S0 P2 - iTOF S1 - iTOF S1 P0 - iTOF S1 P1 - iTOF S1 P2 - iTOF S2 - iTOF S2 P0 - iTOF S2 P1 - iTOF S2 P2 - iTOF S3 - iTOF S3 P0 - iTOF S3 P1 - iTOF S3 P2 - iTOF S4 - iTOF S4 P0 - iTOF S4 P1 - iTOF S4 P2 - iTOF S5 - iTOF S5 P0 - iTOF S5 P1 - iTOF S5 P2 - Secondary 0 - Secondary 1 - Secondary 2 - Secondary 3 - J 0 - J 1 - J 2 - J 3 + + iTOF S0 + iTOF S0 P0 + iTOF S0 P1 + iTOF S0 P2 + iTOF S1 + iTOF S1 P0 + iTOF S1 P1 + iTOF S1 P2 + iTOF S2 + iTOF S2 P0 + iTOF S2 P1 + iTOF S2 P2 + iTOF S3 + iTOF S3 P0 + iTOF S3 P1 + iTOF S3 P2 + iTOF S4 + iTOF S4 P0 + iTOF S4 P1 + iTOF S4 P2 + iTOF S5 + iTOF S5 P0 + iTOF S5 P1 + iTOF S5 P2 + Secondary 0 + Secondary 1 + Secondary 2 + Secondary 3 + J 0 + J 1 + J 2 + J 3 - + Group signals with 'or' for output before 'and' with group B - + Use Inputs 32 to 63 for output - - TOF S0 - TOF S1 - TOF S2 - TOF S3 - TOF S4 - TOF S5 - 38 - 39 - RPC S0 - RPC S1 - RPC S2 - RPC S3 - 44 - RPC S4 - RPC S5 - 47 - Virtual Input 0 - Virtual Input 1 - Virtual Input 2 - Virtual Input 3 - Virtual Input 4 - Virtual Input 5 - Virtual Input 6 - Virtual Input 7 - Virtual Input 8 - Virtual Input 9 - Virtual Input 10 - Virtual Input 11 - Virtual Input 12 - Virtual Input 13 - Virtual Input 14 - Virtual Input 15 + + TOF S0 + TOF S1 + TOF S2 + TOF S3 + TOF S4 + TOF S5 + 38 + 39 + RPC S0 + RPC S1 + RPC S2 + RPC S3 + 44 + RPC S4 + RPC S5 + 47 + Virtual 0 + Virtual 1 + Virtual 2 + Virtual 3 + Virtual 4 + Virtual 5 + Virtual 6 + Virtual 7 + Virtual 8 + Virtual 9 + Virtual 10 + Virtual 11 + Virtual 12 + Virtual 13 + Virtual 14 + Virtual 15 - + Group signals with 'or' for output before 'and' with group A - + Use Inputs 32 to 63 for output - - TOF S0 - TOF S1 - TOF S2 - TOF S3 - TOF S4 - TOF S5 - 38 - 39 - RPC S0 - RPC S1 - RPC S2 - RPC S3 - 44 - RPC S4 - RPC S5 - 47 - Virtual Input 0 - Virtual Input 1 - Virtual Input 2 - Virtual Input 3 - Virtual Input 4 - Virtual Input 5 - Virtual Input 6 - Virtual Input 7 - Virtual Input 8 - Virtual Input 9 - Virtual Input 10 - Virtual Input 11 - Virtual Input 12 - Virtual Input 13 - Virtual Input 14 - Virtual Input 15 + + TOF S0 + TOF S1 + TOF S2 + TOF S3 + TOF S4 + TOF S5 + 38 + 39 + RPC S0 + RPC S1 + RPC S2 + RPC S3 + 44 + RPC S4 + RPC S5 + 47 + Virtual 0 + Virtual 1 + Virtual 2 + Virtual 3 + Virtual 4 + Virtual 5 + Virtual 6 + Virtual 7 + Virtual 8 + Virtual 9 + Virtual 10 + Virtual 11 + Virtual 12 + Virtual 13 + Virtual 14 + Virtual 15 - + Group signals with 'or' for output before 'and' with group B - - Use Inputs 64 to 79 for output - - Virtual Input 16 - Virtual Input 17 - Virtual Input 18 - Virtual Input 19 - Virtual Input 20 - PVirtual Input 21 - Virtual Input 22 - Virtual Input 23 - Virtual Input 24 - Virtual Input 25 - Virtual Input 26 - Virtual Input 27 - Virtual Input 28 - Virtual Input 29 - Virtual Input 30 - Virtual Input 31 + + Use Inputs 64 to 95 for output + + Virtual 16 + Virtual 17 + Virtual 18 + Virtual 19 + Virtual 20 + PVirtual 21 + Virtual 22 + Virtual 23 + Virtual 24 + Virtual 25 + Virtual 26 + Virtual 27 + Virtual 28 + Virtual 29 + Virtual 30 + Virtual 31 + Coincidence 0 + Coincidence 1 + Coincidence 2 + Coincidence 3 + Coincidence 4 + Coincidence 5 + Coincidence 6 + Coincidence 7 + Coincidence 8 + Coincidence 9 + Coincidence 10 + Coincidence 11 + Coincidence 12 + Coincidence 13 + Coincidence 14 + Coincidence 15 - + Group signals with 'or' for output before 'and' with group A - - Use Inputs 64 to 79 for output - - Virtual Input 16 - Virtual Input 17 - Virtual Input 18 - Virtual Input 19 - Virtual Input 20 - Virtual Input 21 - Virtual Input 22 - Virtual Input 23 - Virtual Input 24 - Virtual Input 25 - Virtual Input 26 - Virtual Input 27 - Virtual Input 28 - Virtual Input 29 - Virtual Input 30 - Virtual Input 31 + + Use Inputs 64 to 95 for output + + Virtual 16 + Virtual 17 + Virtual 18 + Virtual 19 + Virtual 20 + Virtual 21 + Virtual 22 + Virtual 23 + Virtual 24 + Virtual 25 + Virtual 26 + Virtual 27 + Virtual 28 + Virtual 29 + Virtual 30 + Virtual 31 + Coincidence 0 + Coincidence 1 + Coincidence 2 + Coincidence 3 + Coincidence 4 + Coincidence 5 + Coincidence 6 + Coincidence 7 + Coincidence 8 + Coincidence 9 + Coincidence 10 + Coincidence 11 + Coincidence 12 + Coincidence 13 + Coincidence 14 + Coincidence 15 - + - + Group signals with 'or' for output before 'and' with group B - + Use Inputs 96 to 111 for output - - Multiplicity Input 0 - Multiplicity Input 1 - Multiplicity Input 2 - Multiplicity Input 3 - Multiplicity Input 4 - Multiplicity Input 5 - Multiplicity Input 6 - Multiplicity Input 7 - Multiplicity Input 8 - Multiplicity Input 9 - Multiplicity Input 10 - Multiplicity Input 11 - Multiplicity Input 12 - Multiplicity Input 13 - Multiplicity Input 14 - Multiplicity Input 15 + + Multiplicity 0 + Multiplicity 1 + Multiplicity 2 + Multiplicity 3 + Multiplicity 4 + Multiplicity 5 + Multiplicity 6 + Multiplicity 7 + Multiplicity 8 + Multiplicity 9 + Multiplicity 10 + Multiplicity 11 + Multiplicity 12 + Multiplicity 13 + Multiplicity 14 + Multiplicity 15 - + Group signals with 'or' for output before 'and' with group A - + Use Inputs 96 to 111 for output - - Multiplicity Input 0 - Multiplicity Input 1 - Multiplicity Input 2 - Multiplicity Input 3 - Multiplicity Input 4 - Multiplicity Input 5 - Multiplicity Input 6 - Multiplicity Input 7 - Multiplicity Input 8 - Multiplicity Input 9 - Multiplicity Input 10 - Multiplicity Input 11 - Multiplicity Input 12 - Multiplicity Input 13 - Multiplicity Input 14 - Multiplicity Input 15 + + Multiplicity 0 + Multiplicity 1 + Multiplicity 2 + Multiplicity 3 + Multiplicity 4 + Multiplicity 5 + Multiplicity 6 + Multiplicity 7 + Multiplicity 8 + Multiplicity 9 + Multiplicity 10 + Multiplicity 11 + Multiplicity 12 + Multiplicity 13 + Multiplicity 14 + Multiplicity 15 - + @@ -1560,38 +1487,38 @@ proc.RPC S4 proc.RPC S5 --- - proc.Virtual Input 0 - proc.Virtual Input 1 - proc.Virtual Input 2 - proc.Virtual Input 3 - proc.Virtual Input 4 - proc.Virtual Input 5 - proc.Virtual Input 6 - proc.Virtual Input 7 - proc.Virtual Input 8 - proc.Virtual Input 9 - proc.Virtual Input 10 - proc.Virtual Input 11 - proc.Virtual Input 12 - proc.Virtual Input 13 - proc.Virtual Input 14 - proc.Virtual Input 15 - proc.Virtual Input 16 - proc.Virtual Input 17 - proc.Virtual Input 18 - proc.Virtual Input 19 - proc.Virtual Input 20 - proc.Virtual Input 21 - proc.Virtual Input 22 - proc.Virtual Input 23 - proc.Virtual Input 24 - proc.Virtual Input 25 - proc.Virtual Input 26 - proc.Virtual Input 27 - proc.Virtual Input 28 - proc.Virtual Input 29 - proc.Virtual Input 30 - proc.Virtual Input 31 + proc.Virtual 0 + proc.Virtual 1 + proc.Virtual 2 + proc.Virtual 3 + proc.Virtual 4 + proc.Virtual 5 + proc.Virtual 6 + proc.Virtual 7 + proc.Virtual 8 + proc.Virtual 9 + proc.Virtual 10 + proc.Virtual 11 + proc.Virtual 12 + proc.Virtual 13 + proc.Virtual 14 + proc.Virtual 15 + proc.Virtual 16 + proc.Virtual 17 + proc.Virtual 18 + proc.Virtual 19 + proc.Virtual 20 + proc.Virtual 21 + proc.Virtual 22 + proc.Virtual 23 + proc.Virtual 24 + proc.Virtual 25 + proc.Virtual 26 + proc.Virtual 27 + proc.Virtual 28 + proc.Virtual 29 + proc.Virtual 30 + proc.Virtual 31 Group 0 Group 1 Group 2 -- 2.43.0