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

Set Analog DAN on different CPU that ADC

Browse Source
This commit is contained in:
ferrog
2026-02-09 18:58:15 +00:00
parent d2c858ce40
commit 7a1a8da39c
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@
Class = EPICSCAOutput Class = EPICSCAOutput
CPUMask = @cpus_epics// change from 0x200 CPUMask = @cpus_epics// change from 0x200
StackSize = 10000000 StackSize = 10000000
NumberOfBuffers = 2 NumberOfBuffers = 50
Signals = { Signals = {
PCF_STATE = { PCF_STATE = {
PVName = (@rfid .. "-GAF:STAT-SM") PVName = (@rfid .. "-GAF:STAT-SM")

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

@@ -94,7 +94,7 @@
// Digital Output port access. // Digital Output port access.
// EPICS PV to one uint8 variable // EPICS PV to one uint8 variable
+NI6528_0_WriterGAM = { +NI6528_0_WriterGAM = {
Class = IOExt::CompactBitGAM Class = "IOExt::CompactBitGAM"
InputSignals = { InputSignals = {
APS_HVON = { APS_HVON = {
DataSource = DDB3 DataSource = DDB3

6
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread4/adc_2_dan.marte
View File

@@ -131,7 +131,7 @@
+FastAnalogDAN = { +FastAnalogDAN = {
Class = "DAN::DANSource" Class = "DAN::DANSource"
NumberOfBuffers = 10000 NumberOfBuffers = 10000
CPUMask = @cpus_adc CPUMask = @cpus_fdan
StackSize = 10000000 StackSize = 10000000
DanBufferMultiplier = 10000 //10s at 1kHz loop (1M with 1k samples) DanBufferMultiplier = 10000 //10s at 1kHz loop (1M with 1k samples)
StoreOnTrigger = 1 StoreOnTrigger = 1
@@ -212,9 +212,9 @@
} }
+AnalogEpicsOutput = { +AnalogEpicsOutput = {
Class = "EPICSCA::EPICSCAOutput" Class = "EPICSCA::EPICSCAOutput"
CPUMask = @cpus_adc // change from 0x200 CPUMask = @cpus_epics // change from 0x200
StackSize = 10000000 StackSize = 10000000
NumberOfBuffers = 2 NumberOfBuffers = 50
Signals = { Signals = {
PXI6368_Status = { PXI6368_Status = {
Type = uint32 Type = uint32

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

@@ -7,7 +7,6 @@
SleepNature = "Busy" SleepNature = "Busy"
SleepPercentage = 40 SleepPercentage = 40
ExecutionMode = "RealTimeThread" ExecutionMode = "RealTimeThread"
CPUMask = 0x200
Signals = { Signals = {
Counter = { Counter = {
Type = uint32 Type = uint32
@@ -23,7 +22,6 @@
SleepNature = "Busy" SleepNature = "Busy"
SleepPercentage = 40 SleepPercentage = 40
ExecutionMode = "RealTimeThread" ExecutionMode = "RealTimeThread"
CPUMask = 0x400
Signals = { Signals = {
Counter = { Counter = {
Type = uint32 Type = uint32
@@ -42,7 +40,6 @@
SleepNature = "Busy" SleepNature = "Busy"
SleepPercentage = 40 SleepPercentage = 40
ExecutionMode = "RealTimeThread" ExecutionMode = "RealTimeThread"
CPUMask = 0x700
Signals = { Signals = {
Counter = { Counter = {
Type = uint32 Type = uint32

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

@@ -42,3 +42,4 @@
#var cpus_dio: uint = 0x80 #var cpus_dio: uint = 0x80
#var cpus_dan: uint = 0x100 #var cpus_dan: uint = 0x100
#var cpus_wg: uint = 0x200 #var cpus_wg: uint = 0x200
#var cpus_fdan: uint = 0x400