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

Wrong AO board index, fixed PS communication

Browse Source
This commit is contained in:
ferrog
2026-02-11 09:30:13 +00:00
parent b23b75115b
commit 1e0b797e9e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,6 +473,7 @@
DI0 = { DI0 = {
Type = uint8 Type = uint8
PortId = 0 PortId = 0
InversionMask = 0x40
} }
//# P1.0 I.08 ECPC Modulation //# P1.0 I.08 ECPC Modulation
//# P1.1 I.09 Fast Protection Trip //# P1.1 I.09 Fast Protection Trip

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

@@ -20,7 +20,7 @@
+NI6259_AO = { +NI6259_AO = {
Class = NI6259DAC Class = NI6259DAC
DeviceName = "/dev/pxi6259" // Mandatory DeviceName = "/dev/pxi6259" // Mandatory
BoardId = 0 // Mandatory BoardId = 1 // Mandatory
SamplingFrequency = @wg_clock SamplingFrequency = @wg_clock
Signals = { Signals = {
CCPS_REF = { CCPS_REF = {

4
generate.sh
View File

@@ -95,9 +95,9 @@ if [[ ${ok} != "0" ]]; then
cat patches/EC-GN-P01-PCF0CORE_userPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd > userPreDriverConf_patched.cmd cat patches/EC-GN-P01-PCF0CORE_userPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd > userPreDriverConf_patched.cmd
mv -f userPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd mv -f userPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/userPreDriverConf.cmd
# sed -i 's+# Add all the support libraries needed by this IOC+# Add all the support libraries needed by this IOC\n-include $(EPICS_ROOT)/mk/asyn.mk\n-include $(EPICS_ROOT)/mk/picmg.mk\n-include $(EPICS_ROOT)/mk/stream.mk\n-include $(EPICS_ROOT)/mk/nisync-epics.mk\n-include $(EPICS_ROOT)/mk/nisync-generalTime.mk\n-include $(EPICS_ROOT)/mk/nixseries-epics.mk\n-include $(EPICS_ROOT)/mk/pxi6259-epics.mk\n-include $(EPICS_ROOT)/mk/pxi6528-epics.mk+g' EC-GN-JA-PCF/src/main/epics/EC-GN-P01App/src/Makefile sed -i 's+# Add all the support libraries needed by this IOC+# Add all the support libraries needed by this IOC\n-include $(EPICS_ROOT)/mk/asyn.mk\n-include $(EPICS_ROOT)/mk/picmg.mk\n-include $(EPICS_ROOT)/mk/stream.mk+g' EC-GN-JA-PCF/src/main/epics/EC-GN-P01App/src/Makefile
# sed -i 's+epicsEnvSet("\(.*\)")+epicsEnvSet("\1:${TOP}/iocBoot/iocEC-GN-P01-PCF0CORE")+g' EC-GN-JA-PCF/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/envSystem sed -i 's+epicsEnvSet("\(.*\)")+epicsEnvSet("\1:${TOP}/iocBoot/iocEC-GN-P01-PCF0CORE")+g' EC-GN-JA-PCF/src/main/epics/iocBoot/iocEC-GN-P01-PCF0CORE/envSystem
fi fi
cid=$((cid+1)) cid=$((cid+1))