martino/ec-gn-ja-pcf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linked PCF_FLT and PXI_FLT to Thread3

Browse Source
This commit is contained in:
ferrog
2026-02-09 17:13:22 +00:00
parent cdafede708
commit 34b7b68f67
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
View File

@@ -252,11 +252,11 @@
} }
PCF_FLT = { PCF_FLT = {
PVName = (@rfid .. "-GPF:PCF4210-CTRP") PVName = (@rfid .. "-GPF:PCF4210-CTRP")
Type = uint32 Type = uint8
} }
PXI_FLT = { PXI_FLT = {
PVName = (@rfid .. "-GPS:PLC4110-RV2") PVName = (@rfid .. "-GPS:PLC4110-RV2")
Type = uint32 Type = uint8
} }
HVARMED = { HVARMED = {
PVName = (@rfid .. "-GPF:PCF4210-YTS-GA1") PVName = (@rfid .. "-GPF:PCF4210-YTS-GA1")

11
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte
View File

@@ -87,6 +87,12 @@
FHPS_RU = { FHPS_RU = {
Type = uint8 Type = uint8
} }
PXI_FAULT = {
Type = uint8
}
PCF_FAULT = {
Type = uint8
}
} }
} }
@@ -110,7 +116,10 @@
Type = float32 Type = float32
} }
PXI_FAULT = { PXI_FAULT = {
Type = uint32 Type = uint8
}
PCF_FAULT = {
Type = uint8
} }
} }
} }

18
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte
View File

@@ -20,6 +20,7 @@
Type = uint32 Type = uint32
Value = 0 Value = 0
} }
BPS_OUT = { BPS_OUT = {
DataSource = DDB1 DataSource = DDB1
} }
@@ -107,11 +108,18 @@
// MARTe Internal PCF_FLT // MARTe Internal PCF_FLT
PCF_FAULT = { PCF_FAULT = {
DataSource = DDB1 DataSource = DDB1
Type = uint32 }
PCF_FAULT_Sync = {
Alias = PCF_FAULT
DataSource = DDB1
} }
PXI_FAULT = { PXI_FAULT = {
DataSource = DDB1 DataSource = DDB1
} }
PXI_FAULT_Sync = {
Alias = PXI_FAULT
DataSource = DDB1
}
BEAM_ON_STAT = { BEAM_ON_STAT = {
DataSource = DDB1 DataSource = DDB1
Type = uint8 Type = uint8
@@ -323,9 +331,17 @@
PCF_FLT = { PCF_FLT = {
DataSource = EPICSCAOutput DataSource = EPICSCAOutput
} }
PCF_FAULT_Sync = {
Alias = PCF_FAULT
DataSource = Th1Bridge
}
PXI_FLT = { PXI_FLT = {
DataSource = EPICSCAOutput DataSource = EPICSCAOutput
} }
PXI_FAULT_Sync = {
Alias = PXI_FAULT
DataSource = Th1Bridge
}
BEAM_ON_STAT = { BEAM_ON_STAT = {
DataSource = EPICSCAOutput DataSource = EPICSCAOutput
} }

2
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte
View File

@@ -35,7 +35,7 @@
OutputSignals = { OutputSignals = {
PXI_FAULT = { PXI_FAULT = {
DataSource = DDB1 DataSource = DDB1
Type = uint32 Type = uint8
DefaultValue = 0 DefaultValue = 0
Value = 1 Value = 1
} }

12
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte
View File

@@ -117,6 +117,12 @@
DataSource = FastTimer DataSource = FastTimer
Frequency = @fast_clock Frequency = @fast_clock
} }
PCF_FAULT = {
DataSource = Th1Bridge
}
PXI_FAULT = {
DataSource = Th1Bridge
}
} }
OutputSignals = { OutputSignals = {
Time = { Time = {
@@ -125,6 +131,12 @@
Counter = { Counter = {
DataSource = DDB3 DataSource = DDB3
} }
PCF_FAULT = {
DataSource = DDB3
}
PXI_FAULT = {
DataSource = DDB3
}
} }
} }
+WGTimerGAM = { +WGTimerGAM = {