From d12dbbdad140ce6ce2b4e430e406333f09d58ee6 Mon Sep 17 00:00:00 2001
From: Pieter Donker <donker@astron.nl>
Date: Wed, 25 Nov 2009 14:33:32 +0000
Subject: [PATCH] Bug 335: new commands
---
.../PIC/TBB_Protocol/src/TBB_Protocol.prot | 53 +++++++++++++++++--
1 file changed, 49 insertions(+), 4 deletions(-)
diff --git a/MAC/APL/PIC/TBB_Protocol/src/TBB_Protocol.prot b/MAC/APL/PIC/TBB_Protocol/src/TBB_Protocol.prot
index d9957a72a8b..d41f2bd2f28 100644
--- a/MAC/APL/PIC/TBB_Protocol/src/TBB_Protocol.prot
+++ b/MAC/APL/PIC/TBB_Protocol/src/TBB_Protocol.prot
@@ -90,6 +90,7 @@ typedef struct TbbTriggerSetup // setup variables for 1 channel
uint8 stop_mode;
uint8 filter_select;
uint8 window;
+ uint8 trigger_mode;
uint8 operating_mode;
};
@@ -404,14 +405,32 @@ event = {
name = "setup";
type = "TbbTriggerSetup[MAX_N_RCUS]";
};
+};
+
+event = {
+ signal = TRIG_SETUP_ACK;
+ dir = OUT;
param = {
- name = "trigger_mode";
- type = uint16;
+ name = "status_mask";
+ type = "uint32[MAX_N_TBBOARDS]";
};
};
event = {
- signal = TRIG_SETUP_ACK;
+ signal = TRIG_SETUP_SAME;
+ dir = IN;
+ param = {
+ name = "rcu_mask";
+ type = "std::bitset<MAX_N_RCUS>";
+ };
+ param = {
+ name = "setup";
+ type = "TbbTriggerSetup";
+ };
+};
+
+event = {
+ signal = TRIG_SETUP_SAME_ACK;
dir = OUT;
param = {
name = "status_mask";
@@ -437,6 +456,28 @@ event = {
};
};
+event = {
+ signal = TRIG_COEF_SAME;
+ dir = IN;
+ param = {
+ name = "rcu_mask";
+ type = "std::bitset<MAX_N_RCUS>";
+ };
+ param = {
+ name = "coefficients";
+ type = "TbbTriggerCoef";
+ };
+};
+
+event = {
+ signal = TRIG_COEF_SAME_ACK;
+ dir = OUT;
+ param = {
+ name = "status_mask";
+ type = "uint32[MAX_N_TBBOARDS]";
+ };
+};
+
event = {
signal = TRIG_SETTINGS;
dir = IN;
@@ -823,7 +864,11 @@ event = {
type = "uint32[MAX_N_TBBOARDS]";
};
param = {
- name = "Image";
+ name = "CurrentImage";
+ type = "uint8[MAX_N_TBBOARDS]";
+ };
+ param = {
+ name = "FlashState";
type = "uint8[MAX_N_TBBOARDS]";
};
param = {
--
GitLab