bernardo/ISTTOK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chanegd to epics 7

Browse Source
This commit is contained in:
Bernardo Carvalho
2021-05-11 11:20:40 +01:00
parent 807a1ff0e5
commit 641da82642
7 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/ISTTOKrpiMain.cpp
View File

@@ -13,7 +13,7 @@
int main(int argc,char *argv[]) int main(int argc,char *argv[])
{ {
if(argc>=2) { if(argc>=2) {
iocsh(argv[1]); iocsh(argv[1]);
epicsThreadSleep(.2); epicsThreadSleep(.2);
} }

46
epics/iocs/ISTTOKrpi/ISTTOKrpiApp/src/IsttokSeqExec.stt
View File

@@ -114,7 +114,7 @@ monitor STARTINGSTATE;
short CLEANINGSTATE; short CLEANINGSTATE;
assign CLEANINGSTATE to "ISTTOK:central:CLEANINGSTATE"; assign CLEANINGSTATE to "ISTTOK:central:CLEANINGSTATE";
monitor CLEANINGSTATE; monitor CLEANINGSTATE;
short CLEANINGMANMODE; short CLEANINGMANMODE;
assign CLEANINGMANMODE to "ISTTOK:central:CLEANINGMANMODE"; assign CLEANINGMANMODE to "ISTTOK:central:CLEANINGMANMODE";
monitor CLEANINGMANMODE; monitor CLEANINGMANMODE;
@@ -128,48 +128,48 @@ monitor STOPPINGSTATE;
short IsttokRPump1_Motor; short IsttokRPump1_Motor;
assign IsttokRPump1_Motor to "ISTTOK:central:RPump1-Motor"; assign IsttokRPump1_Motor to "ISTTOK:central:RPump1-Motor";
short IsttokRPump1_Valve; short IsttokRPump1_Valve;
assign IsttokRPump1_Valve to "ISTTOK:central:RPump1-Valve"; assign IsttokRPump1_Valve to "ISTTOK:central:RPump1-Valve";
short IsttokRPump2_Motor; short IsttokRPump2_Motor;
assign IsttokRPump2_Motor to "ISTTOK:central:RPump2-Motor"; assign IsttokRPump2_Motor to "ISTTOK:central:RPump2-Motor";
short IsttokRPump2_Valve; short IsttokRPump2_Valve;
assign IsttokRPump2_Valve to "ISTTOK:central:RPump2-Valve"; assign IsttokRPump2_Valve to "ISTTOK:central:RPump2-Valve";
short IsttokTMPump1_ControllerOff; short IsttokTMPump1_ControllerOff;
assign IsttokTMPump1_ControllerOff to "ISTTOK:central:TMPump1-ControllerOff"; assign IsttokTMPump1_ControllerOff to "ISTTOK:central:TMPump1-ControllerOff";
short IsttokTMPump1_ControllerOn; short IsttokTMPump1_ControllerOn;
assign IsttokTMPump1_ControllerOn to "ISTTOK:central:TMPump1-ControllerOn"; assign IsttokTMPump1_ControllerOn to "ISTTOK:central:TMPump1-ControllerOn";
short IsttokTMPump1_MotorOff; short IsttokTMPump1_MotorOff;
assign IsttokTMPump1_MotorOff to "ISTTOK:central:TMPump1-MotorOff"; assign IsttokTMPump1_MotorOff to "ISTTOK:central:TMPump1-MotorOff";
short IsttokTMPump1_MotorOn; short IsttokTMPump1_MotorOn;
assign IsttokTMPump1_MotorOn to "ISTTOK:central:TMPump1-MotorOn"; assign IsttokTMPump1_MotorOn to "ISTTOK:central:TMPump1-MotorOn";
short IsttokTMPump2_Motor; short IsttokTMPump2_Motor;
assign IsttokTMPump2_Motor to "ISTTOK:central:TMPump2-Motor"; assign IsttokTMPump2_Motor to "ISTTOK:central:TMPump2-Motor";
short TMPump1NormalOperation; short TMPump1NormalOperation;
assign TMPump1NormalOperation to "ISTTOK:central:TMPump1-NormalOperation"; assign TMPump1NormalOperation to "ISTTOK:central:TMPump1-NormalOperation";
monitor TMPump1NormalOperation; monitor TMPump1NormalOperation;
short IsttokTMPump1_Power; short IsttokTMPump1_Power;
assign IsttokTMPump1_Power to "ISTTOK:central:TMPump1-Power"; assign IsttokTMPump1_Power to "ISTTOK:central:TMPump1-Power";
monitor IsttokTMPump1_Power; monitor IsttokTMPump1_Power;
short IsttokTMPump1_Emergency; short IsttokTMPump1_Emergency;
assign IsttokTMPump1_Emergency to "ISTTOK:central:TMPump1-Emergency"; assign IsttokTMPump1_Emergency to "ISTTOK:central:TMPump1-Emergency";
monitor IsttokTMPump1_Emergency; monitor IsttokTMPump1_Emergency;
short IsttokTMPump1_ManualValve; short IsttokTMPump1_ManualValve;
assign IsttokTMPump1_ManualValve to "ISTTOK:central:TMPump1-ManualValve"; assign IsttokTMPump1_ManualValve to "ISTTOK:central:TMPump1-ManualValve";
monitor IsttokTMPump1_ManualValve; monitor IsttokTMPump1_ManualValve;
/* /*
short IsttokTMPump2_Emergency; short IsttokTMPump2_Emergency;
assign IsttokTMPump2_Emergency to "ISTTOK:central:TMPump2-Emergency"; assign IsttokTMPump2_Emergency to "ISTTOK:central:TMPump2-Emergency";
monitor IsttokTMPump2_Emergency; monitor IsttokTMPump2_Emergency;
@@ -178,8 +178,8 @@ monitor IsttokTMPump2_Emergency;
float IsttokRPump1_Pressure; float IsttokRPump1_Pressure;
assign IsttokRPump1_Pressure to "ISTTOK:vacuum:RPump1-Pressure"; assign IsttokRPump1_Pressure to "ISTTOK:vacuum:RPump1-Pressure";
monitor IsttokRPump1_Pressure; monitor IsttokRPump1_Pressure;
/* /*
float IsttokRPump2_Pressure; float IsttokRPump2_Pressure;
assign IsttokRPump2_Pressure to "ISTTOK:central:RPump2-Pressure"; assign IsttokRPump2_Pressure to "ISTTOK:central:RPump2-Pressure";
monitor IsttokRPump2_Pressure; monitor IsttokRPump2_Pressure;
@@ -191,25 +191,25 @@ monitor IsttokVVesselTemperature;
short IsttokShotBuzzer; short IsttokShotBuzzer;
assign IsttokShotBuzzer to "ISTTOK:central:Buzzer"; assign IsttokShotBuzzer to "ISTTOK:central:Buzzer";
short IsttokShotLab_WarningLight; short IsttokShotLab_WarningLight;
assign IsttokShotLab_WarningLight to "ISTTOK:central:Lab-WarningLight"; assign IsttokShotLab_WarningLight to "ISTTOK:central:Lab-WarningLight";
short IsttokShotGasIS_Valves; short IsttokShotGasIS_Valves;
assign IsttokShotGasIS_Valves to "ISTTOK:central:GasIS-Valves"; assign IsttokShotGasIS_Valves to "ISTTOK:central:GasIS-Valves";
short IsttokShotVVessel_Filament; short IsttokShotVVessel_Filament;
assign IsttokShotVVessel_Filament to "ISTTOK:central:VVessel-Filament"; assign IsttokShotVVessel_Filament to "ISTTOK:central:VVessel-Filament";
short IsttokShotCapBank_Charge; short IsttokShotCapBank_Charge;
assign IsttokShotCapBank_Charge to "ISTTOK:central:CapBank-Charge"; assign IsttokShotCapBank_Charge to "ISTTOK:central:CapBank-Charge";
short IsttokShotCapBank_Discharge; short IsttokShotCapBank_Discharge;
assign IsttokShotCapBank_Discharge to "ISTTOK:central:CapBank-Discharge"; assign IsttokShotCapBank_Discharge to "ISTTOK:central:CapBank-Discharge";
short IsttokShotClean_TorContactor; short IsttokShotClean_TorContactor;
assign IsttokShotClean_TorContactor to "ISTTOK:central:Clean-TorContactor"; assign IsttokShotClean_TorContactor to "ISTTOK:central:Clean-TorContactor";
short IsttokShotClean_TorPneuBreaker; short IsttokShotClean_TorPneuBreaker;
assign IsttokShotClean_TorPneuBreaker to "ISTTOK:central:Clean-TorPneuBreaker"; assign IsttokShotClean_TorPneuBreaker to "ISTTOK:central:Clean-TorPneuBreaker";

3
epics/iocs/ISTTOKrpi/configure/CONFIG_SITE
View File

@@ -23,8 +23,7 @@ CHECK_RELEASE = YES
# To install files into a location other than $(TOP) define # To install files into a location other than $(TOP) define
# INSTALL_LOCATION here. # INSTALL_LOCATION here.
INSTALL_LOCATION=/opt/epics/iocs/ISTTOKrpi #INSTALL_LOCATION=</absolute/path/to/install/top>
#</absolute/path/to/install/top>
# Set this when the IOC and build host use different paths # Set this when the IOC and build host use different paths
# to the install location. This may be needed to boot from # to the install location. This may be needed to boot from

33
epics/iocs/ISTTOKrpi/configure/RELEASE
View File

@@ -1,13 +1,12 @@
# RELEASE - Location of external support modules # RELEASE - Location of external support modules
# #
# IF YOU MAKE ANY CHANGES to this file you must subsequently # IF YOU CHANGE ANY PATHS in this file or make API changes to
# do a "gnumake rebuild" in this application's top level # any modules it refers to, you should do a "make rebuild" in
# directory. # this application's top level directory.
# #
# The build process does not check dependencies against files # The EPICS build process does not check dependencies against
# that are outside this application, thus you should do a # any files from outside the application, so it is safest to
# "gnumake rebuild" in the top level directory after EPICS_BASE # rebuild it completely if any modules it depends on change.
# or any other external module pointed to below is rebuilt.
# #
# Host- or target-specific settings can be given in files named # Host- or target-specific settings can be given in files named
# RELEASE.$(EPICS_HOST_ARCH).Common # RELEASE.$(EPICS_HOST_ARCH).Common
@@ -15,7 +14,7 @@
# RELEASE.$(EPICS_HOST_ARCH).$(T_A) # RELEASE.$(EPICS_HOST_ARCH).$(T_A)
# #
# This file is parsed by both GNUmake and an EPICS Perl script, # This file is parsed by both GNUmake and an EPICS Perl script,
# so it can ONLY contain definititions of paths to other support # so it may ONLY contain definititions of paths to other support
# modules, variable definitions that are used in module paths, # modules, variable definitions that are used in module paths,
# and include statements that pull in other RELEASE files. # and include statements that pull in other RELEASE files.
# Variables may be used before their values have been set. # Variables may be used before their values have been set.
@@ -23,25 +22,21 @@
# the CONFIG_SITE file. # the CONFIG_SITE file.
# Variables and paths to dependent modules: # Variables and paths to dependent modules:
SUPPORT=$(EPICS_BASE)/../synApps_5_8/support #MODULES = /path/to/modules
#MYMODULE = $(MODULES)/my-module
# If using the sequencer, point SNCSEQ at its top directory: # If using the sequencer, point SNCSEQ at its top directory:
SNCSEQ = $(SUPPORT)/seq-2-2-1 #SNCSEQ = $(MODULES)/seq-ver
ASYN = $(SUPPORT)/asyn-4-26
STREAM = $(SUPPORT)/stream-2-6a
AUTOSAVE = $(SUPPORT)/autosave-5-6-1
DRVASYNI2C = $(EPICS_BASE)/../modules/drvAsynI2C
#
# EPICS_BASE should appear last so earlier modules can override stuff: # EPICS_BASE should appear last so earlier modules can override stuff:
EPICS_BASE = /usr/local/epics/base EPICS_BASE = /home/pi/Apps/epics7/epics-base
# Set RULES here if you want to use build rules from somewhere # Set RULES here if you want to use build rules from somewhere
# other than EPICS_BASE: # other than EPICS_BASE:
#RULES = $(MODULES)/build-rules #RULES = $(MODULES)/build-rules
# These allow developers to override the RELEASE variable settings # These lines allow developers to override these RELEASE settings
# without having to modify the configure/RELEASE file itself. # without having to modify this file directly.
-include $(TOP)/../RELEASE.local -include $(TOP)/../RELEASE.local
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
-include $(TOP)/configure/RELEASE.local -include $(TOP)/configure/RELEASE.local

2
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
View File

@@ -1,4 +1,4 @@
# autosave R5.3 Automatically generated - DO NOT MODIFY - 210510-201940 # autosave R5.3 Automatically generated - DO NOT MODIFY - 210511-111857
! 2 channel(s) not connected - or not all gets were successful ! 2 channel(s) not connected - or not all gets were successful
ISTTOK:central:PULSE-NUMBER.VAL 0 ISTTOK:central:PULSE-NUMBER.VAL 0
ISTTOK:central:LogMessage.VAL ISTTOK:central:LogMessage.VAL

21
epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
View File

@@ -4,9 +4,9 @@
## everywhere it appears in this file ## everywhere it appears in this file
< envPaths < envPaths
epicsEnvSet( "STREAM_PROTOCOL_PATH", "$(TOP)/protocols" ) epicsEnvSet( "STREAM_PROTOCOL_PATH", "$(TOP)/db" )
epicsEnvSet( "SAVE_DIR", "$(TOP)/iocBoot/$(IOC)" ) epicsEnvSet( "SAVE_DIR", "$(TOP)/iocBoot/$(IOC)" )
epicsEnvSet( "EPICS_CA_ADDR_LIST", "localhost 192.168.1.152") epicsEnvSet( "EPICS_CA_ADDR_LIST", "localhost 192.168.1.120 192.168.1.152")
cd "${TOP}" cd "${TOP}"
@@ -25,17 +25,18 @@ dbLoadRecords("db/ISTTOKtda8444.db","P=ISTTOK:,R=central:")
dbLoadRecords("db/ISTTOKmachineControl.db","P=ISTTOK:,R=central:") dbLoadRecords("db/ISTTOKmachineControl.db","P=ISTTOK:,R=central:")
## Load Serial drivers ## Load Serial drivers
drvAsynSerialPortConfigure("RS0","/dev/ttyUSB0") #drvAsynSerialPortConfigure("RS0","/dev/ttyUSB0")
#drvAsynSerialPortConfigure("RS0","/dev/ttyAMA0") #drvAsynSerialPortConfigure("RS0","/dev/ttyAMA0")
asynSetOption("RS0", 0, "baud", "9600") #asynSetOption("RS0", 0, "baud", "9600")
asynSetOption("RS0", 0, "bits", "8") #asynSetOption("RS0", 0, "bits", "8")
asynSetOption("RS0", 0, "parity", "none") #asynSetOption("RS0", 0, "parity", "none")
asynSetOption("RS0", 0, "stop", "1") #asynSetOption("RS0", 0, "stop", "1")
asynSetOption("RS0", 0, "clocal", "Y") #asynSetOption("RS0", 0, "clocal", "Y")
asynSetOption("RS0", 0, "crtscts", "N") #asynSetOption("RS0", 0, "crtscts", "N")
dbLoadRecords("db/ISTTOKpfeiffer.db","P=ISTTOK:,R=central:,bus=RS0") # Pfeiffer sensor are connectoed to other RPI /(192.168.1.120)
#dbLoadRecords("db/ISTTOKpfeiffer.db","P=ISTTOK:,R=central:,bus=RS0")
# connect to the MAIL server mail.ipfn.tecnico.ulisboa.pt # connect to the MAIL server mail.ipfn.tecnico.ulisboa.pt
# ,priority,noAutoConnect,noProcessEos # ,priority,noAutoConnect,noProcessEos

8
epics/iocs/RELEASE.local
View File

@@ -5,12 +5,16 @@ SUPPORT=$(HOME)/Apps/epics7/support
# #
ASYN=$(SUPPORT)/asyn ASYN=$(SUPPORT)/asyn
STREAM=$(SUPPORT)/StreamDevice STREAM=$(SUPPORT)/StreamDevice
#CALC=$(SUPPORT)/calc
AUTOSAVE = $(SUPPORT)/autosave
DRVASYNI2C =$(SUPPORT)/drvAsynI2C
SNCSEQ=$(SUPPORT)/seq-2-2
# IPAC release V2-7 or later is required. # IPAC release V2-7 or later is required.
IPAC= #IPAC=
#$(SUPPORT)/ipac-2-15 #$(SUPPORT)/ipac-2-15
# #
# # SEQ is required for testIPServer # # SEQ is required for testIPServer
SNCSEQ=
#$(SUPPORT)/seq-2-2-5 #$(SUPPORT)/seq-2-2-5
# #
CALC= CALC=