Skip to content

Ticket5481 all iocs at least 2 numbers #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LilithCole wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Ticket5481 all iocs at least 2 numbers #509

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
219f087
added AG33220A-02
LilithCole Jun 16, 2020
6670ba0
Revert "added AG33220A-02"
LilithCole Jun 16, 2020
f540de7
added secondd AG33220A
LilithCole Jun 16, 2020
f7f08f2
added secondd AG53220A
LilithCole Jun 16, 2020
6eeafdf
second CAENMCA IOC
LilithCole Jun 16, 2020
ef08d94
added second CONEXAGP
LilithCole Jun 16, 2020
ff8b400
added second COUETTE
LilithCole Jun 16, 2020
7cd6167
added second DELFTSHEAR
LilithCole Jun 16, 2020
db3d7a2
added second DETADC
LilithCole Jun 16, 2020
6a84e5f
added second ECLAB
LilithCole Jun 16, 2020
358883a
added second EGXCOLIM
LilithCole Jun 16, 2020
4ab39c5
added second FERMCHOP
LilithCole Jun 16, 2020
a4a3c78
added second FZJDDFCH
LilithCole Jun 16, 2020
d798199
added second GAMRY
LilithCole Jun 16, 2020
9340444
added second GEMORC
LilithCole Jun 16, 2020
3823362
added second HVCAEN
LilithCole Jun 16, 2020
df9fbd0
added second IEG
LilithCole Jun 16, 2020
f05616a
Revert "added second COUETTE"
LilithCole Jun 16, 2020
234a44e
Revert "added second EGXCOLIM"
LilithCole Jun 16, 2020
c1a1e76
Revert "added second FERMCHOP"
LilithCole Jun 16, 2020
ca793eb
Revert "added second GEMORC"
LilithCole Jun 16, 2020
e536d94
Revert "added second FZJDDFCH"
LilithCole Jun 16, 2020
aa6e2b9
filled in templates
LilithCole Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions AG33220A/AG33220A-IOC-02App/Db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
TOP=../..
include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE

#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
#DB += xxx.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
# <anyname>_template = <templatename>

include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

9 changes: 9 additions & 0 deletions AG33220A/AG33220A-IOC-02App/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP = ..
include $(TOP)/configure/CONFIG
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*))
include $(TOP)/configure/RULES_DIRS

23 changes: 23 additions & 0 deletions AG33220A/AG33220A-IOC-02App/src/AG33220A-IOC-02Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* AG33220A-IOC-02Main.cpp */
/* Author: Marty Kraimer Date: 17MAR2000 */

#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <stdio.h>

#include "epicsExit.h"
#include "epicsThread.h"
#include "iocsh.h"

int main(int argc,char *argv[])
{
if(argc>=2) {
iocsh(argv[1]);
epicsThreadSleep(.2);
}
iocsh(NULL);
epicsExit(0);
return(0);
}
9 changes: 9 additions & 0 deletions AG33220A/AG33220A-IOC-02App/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP=../..
# This file should do very little - it's purpose is to set the APPNAME and then load build.mak

# this definition is used in build.mak
APPNAME=AG33220A-IOC-02

# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory
# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory
include $(TOP)/AG33220A-IOC-01App/src/build.mak
6 changes: 6 additions & 0 deletions AG33220A/iocBoot/iocAG33220A-IOC-02/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-debug
ARCH = $(EPICS_HOST_ARCH)
TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh
include $(TOP)/configure/RULES.ioc
18 changes: 18 additions & 0 deletions AG33220A/iocBoot/iocAG33220A-IOC-02/st.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!../../bin/windows-x64-debug/AG33220A-IOC-02

## You may have to change AG33220A-IOC-02 to something else
## everywhere it appears in this file

# Increase this if you get <<TRUNCATED>> or discarded messages warnings in your errlog output
errlogInit2(65536, 256)

< envPaths

cd "${TOP}"

## Register all support components
dbLoadDatabase "dbd/AG33220A-IOC-02.dbd"
AG33220A_IOC_02_registerRecordDeviceDriver pdbbase

## calling common command file in ioc 01 boot dir
< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd
Copy link
Copy Markdown
Member

@Tom-Willemsen Tom-Willemsen Jun 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs filling in. This means the ioc can't boot and the ioc tests for ioc _02 fail.

This is also true for all of the other IOCs in this PR.

18 changes: 18 additions & 0 deletions AG53220A/AG53220A-IOC-02App/Db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
TOP=../..
include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE

#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
#DB += xxx.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
# <anyname>_template = <templatename>

include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

9 changes: 9 additions & 0 deletions AG53220A/AG53220A-IOC-02App/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP = ..
include $(TOP)/configure/CONFIG
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*))
include $(TOP)/configure/RULES_DIRS

23 changes: 23 additions & 0 deletions AG53220A/AG53220A-IOC-02App/src/AG53220A-IOC-02Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* AG53220A-IOC-02Main.cpp */
/* Author: Marty Kraimer Date: 17MAR2000 */

#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <stdio.h>

#include "epicsExit.h"
#include "epicsThread.h"
#include "iocsh.h"

int main(int argc,char *argv[])
{
if(argc>=2) {
iocsh(argv[1]);
epicsThreadSleep(.2);
}
iocsh(NULL);
epicsExit(0);
return(0);
}
9 changes: 9 additions & 0 deletions AG53220A/AG53220A-IOC-02App/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP=../..
# This file should do very little - it's purpose is to set the APPNAME and then load build.mak

# this definition is used in build.mak
APPNAME=AG53220A-IOC-02

# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory
# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory
include $(TOP)/AG53220A-IOC-01App/src/build.mak
6 changes: 6 additions & 0 deletions AG53220A/iocBoot/iocAG53220A-IOC-02/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-debug
ARCH = $(EPICS_HOST_ARCH)
TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh
include $(TOP)/configure/RULES.ioc
18 changes: 18 additions & 0 deletions AG53220A/iocBoot/iocAG53220A-IOC-02/st.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!../../bin/windows-x64-debug/AG53220A-IOC-02

## You may have to change AG53220A-IOC-02 to something else
## everywhere it appears in this file

# Increase this if you get <<TRUNCATED>> or discarded messages warnings in your errlog output
errlogInit2(65536, 256)

< envPaths

cd "${TOP}"

## Register all support components
dbLoadDatabase "dbd/AG53220A-IOC-02.dbd"
AG53220A_IOC_02_registerRecordDeviceDriver pdbbase

## calling common command file in ioc 01 boot dir
< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd
18 changes: 18 additions & 0 deletions CAENMCA/CAENMCA-IOC-02App/Db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
TOP=../..
include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE

#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
#DB += xxx.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
# <anyname>_template = <templatename>

include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

9 changes: 9 additions & 0 deletions CAENMCA/CAENMCA-IOC-02App/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP = ..
include $(TOP)/configure/CONFIG
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*))
include $(TOP)/configure/RULES_DIRS

23 changes: 23 additions & 0 deletions CAENMCA/CAENMCA-IOC-02App/src/CAENMCA-IOC-02Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* CAENMCA-IOC-02Main.cpp */
/* Author: Marty Kraimer Date: 17MAR2000 */

#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <stdio.h>

#include "epicsExit.h"
#include "epicsThread.h"
#include "iocsh.h"

int main(int argc,char *argv[])
{
if(argc>=2) {
iocsh(argv[1]);
epicsThreadSleep(.2);
}
iocsh(NULL);
epicsExit(0);
return(0);
}
9 changes: 9 additions & 0 deletions CAENMCA/CAENMCA-IOC-02App/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP=../..
# This file should do very little - it's purpose is to set the APPNAME and then load build.mak

# this definition is used in build.mak
APPNAME=CAENMCA-IOC-02

# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory
# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory
include $(TOP)/CAENMCA-IOC-01App/src/build.mak
6 changes: 6 additions & 0 deletions CAENMCA/iocBoot/iocCAENMCA-IOC-02/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-debug
ARCH = $(EPICS_HOST_ARCH)
TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh
include $(TOP)/configure/RULES.ioc
18 changes: 18 additions & 0 deletions CAENMCA/iocBoot/iocCAENMCA-IOC-02/st.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!../../bin/windows-x64-debug/CAENMCA-IOC-02

## You may have to change CAENMCA-IOC-02 to something else
## everywhere it appears in this file

# Increase this if you get <<TRUNCATED>> or discarded messages warnings in your errlog output
errlogInit2(65536, 256)

< envPaths

cd "${TOP}"

## Register all support components
dbLoadDatabase "dbd/CAENMCA-IOC-02.dbd"
CAENMCA_IOC_02_registerRecordDeviceDriver pdbbase

## calling common command file in ioc 01 boot dir
< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd
18 changes: 18 additions & 0 deletions CAENV895/CAENV895-IOC-02App/Db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
TOP=../..
include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE

#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
#DB += xxx.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
# <anyname>_template = <templatename>

include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

9 changes: 9 additions & 0 deletions CAENV895/CAENV895-IOC-02App/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP = ..
include $(TOP)/configure/CONFIG
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*))
include $(TOP)/configure/RULES_DIRS

23 changes: 23 additions & 0 deletions CAENV895/CAENV895-IOC-02App/src/CAENV895-IOC-02Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* CAENV895-IOC-02Main.cpp */
/* Author: Marty Kraimer Date: 17MAR2000 */

#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <stdio.h>

#include "epicsExit.h"
#include "epicsThread.h"
#include "iocsh.h"

int main(int argc,char *argv[])
{
if(argc>=2) {
iocsh(argv[1]);
epicsThreadSleep(.2);
}
iocsh(NULL);
epicsExit(0);
return(0);
}
9 changes: 9 additions & 0 deletions CAENV895/CAENV895-IOC-02App/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP=../..
# This file should do very little - it's purpose is to set the APPNAME and then load build.mak

# this definition is used in build.mak
APPNAME=CAENV895-IOC-02

# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory
# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory
include $(TOP)/CAENV895-IOC-01App/src/build.mak
6 changes: 6 additions & 0 deletions CAENV895/iocBoot/iocCAENV895-IOC-02/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
#ARCH = windows-x64-debug
ARCH = $(EPICS_HOST_ARCH)
TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh
include $(TOP)/configure/RULES.ioc
18 changes: 18 additions & 0 deletions CAENV895/iocBoot/iocCAENV895-IOC-02/st.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!../../bin/windows-x64-debug/CAENV895-IOC-02

## You may have to change CAENV895-IOC-02 to something else
## everywhere it appears in this file

# Increase this if you get <<TRUNCATED>> or discarded messages warnings in your errlog output
errlogInit2(65536, 256)

< envPaths

cd "${TOP}"

## Register all support components
dbLoadDatabase "dbd/CAENV895-IOC-02.dbd"
CAENV895_IOC_02_registerRecordDeviceDriver pdbbase

## calling common command file in ioc 01 boot dir
< ${TOP}/iocBoot/ioc_01_APP_NAME_/st-common.cmd
18 changes: 18 additions & 0 deletions CONEXAGP/CONEXAGP-IOC-02App/Db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
TOP=../..
include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE

#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
#DB += xxx.db

#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
# <anyname>_template = <templatename>

include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

9 changes: 9 additions & 0 deletions CONEXAGP/CONEXAGP-IOC-02App/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TOP = ..
include $(TOP)/configure/CONFIG
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*))
include $(TOP)/configure/RULES_DIRS

Loading