Skip to content
Snippets Groups Projects
Commit e73a61c5 authored by Gabriel Fedel's avatar Gabriel Fedel :speech_balloon:
Browse files

Merge branch 'icshwi-8457_housekeeping' into 'master' 

ICSHWI-8457: Housekeeping

See merge request e3/wrappers/rf/e3-sis8300llrf!30
parents f410c9ac 4741a7b0
No related branches found
No related tags found
1 merge request!30ICSHWI-8457: Housekeeping
Pipeline #103983 failed
Hide whitespace changes
Inline Side-by-side
configure/CONFIG_MODULE
+ 2
− 14
View file @ e73a61c5
EPICS_MODULE_NAME:=sis8300llrf
#
EPICS_MODULE_TAG:=5.6.2
#
E3_MODULE_VERSION:=5.6.2
#
ASYN_DEP_VERSION=4.41.0
#
LOKI_DEP_VERSION=1.0.0
#
SCALING_DEP_VERSION=1.9.0
#
NDS_DEP_VERSION=2.3.4
#
SIS8300DRV_DEP_VERSION=4.10.2
#
SIS8300_DEP_VERSION=3.5.0
#
SIS8300LLRFDRV_DEP_VERSION=6.2.1
#
SEQUENCER_DEP_VERSION=2.2.8
#
E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
#
E3_MODULE_SRC_PATH:=sis8300llrf
#
E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
#
-include $(TOP)/configure/CONFIG_OPTIONS
# The definitions shown below can also be placed in an untracked CONFIG_MODULE*.local
-include $(TOP)/configure/CONFIG_MODULE.local
......
configure/RELEASE
+ 0
− 1
View file @ e73a61c5
#
EPICS_BASE=/epics/base-7.0.5
E3_REQUIRE_NAME:=require
......
docs/.MODULE_LOG deleted 100644 → 0
+ 0
− 12
View file @ f410c9ac
USER : joaopaulomartins
TIME : 2018May03-1729-57CEST
>>
EPICS_MODULE_NAME : sis8300llrf
E3_MODULE_SRC_PATH : m-epics-sis8300llrf
EPICS_MODULE_URL : https://bitbucket.org/europeanspallationsource
E3_TARGET_URL : https://github.com/icshwi
>>
e3 module name : e3-sis8300llrf
e3 module url full : https://bitbucket.org/europeanspallationsource/m-epics-sis8300llrf
e3 target url full : https://github.com/icshwi/e3-sis8300llrf
>>
docs/.UPDATE_MODULE_LOG deleted 100644 → 0
+ 0
− 14
View file @ f410c9ac
>>
Update Log Time : 2018Nov13-1537-48CET
>>
Script is used : e3TemplateGenerator
Script Path : /home/jhlee/gitsrc/e3-tools/e3TemplateGenerator
User : jhlee
e3 repo Hash : cd3dbb0
EPICS_MODULE_NAME : sis8300llrf
E3 MODULE VERSION : 3.6.5
EPICS BASE VERSION : base-3.15.5
E3 REQUIRE VERSION : 3.0.2
>>
docs/sis8300llrf.conf deleted 100644 → 0
+ 0
− 8
View file @ f410c9ac
#
EPICS_MODULE_NAME:=sis8300llrf
#
EPICS_MODULE_URL:=https://bitbucket.org/europeanspallationsource
#
E3_TARGET_URL:=https://github.com/icshwi
#
E3_MODULE_SRC_PATH:=m-epics-sis8300llrf
patch/Site/HISTORY.md deleted 100644 → 0
+ 0
− 7
View file @ f410c9ac
# what_ever_filename.p0.patch
Generic Description.....
* created by Jeong Han Lee, han.lee@esss.se
* related URL or reference https://github.com/icshwi
* Tuesday, February 13 13:24:57 CET 2018
patch/Site/README.md deleted 100644 → 0
+ 0
− 22
View file @ f410c9ac
# Site Specific EPICS Module Patch Files
## Changes
The changes were tested in local environemnt, and commits to the forked repository and do pull request to the epics community module repository.
* Check the original HASH, and your own master
* feb8856 : The original HASH
* master : Changed
## How to create a p0 patch file between commits
* Show what the difference between commits
* Create p0 patch
```
$git diff feb8856 master --no-prefix > ../patch/Site/what_ever_filename.p0.patch
```
sis8300llrf.Makefile
+ 13
− 18
View file @ e73a61c5
......@@ -21,7 +21,7 @@
# email : gabrielfedel@ess.eu
# joaopaulomartins@esss.se
# jeonghan.lee@gmail.com
#
where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
include $(E3_REQUIRE_TOOLS)/driver.makefile
include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
......@@ -66,9 +66,9 @@ USR_CPPFLAGS += -std=c++11
EXCLUDE_ARCHS += linux-corei7-poky
APP:=.
APPDB:=$(APP)/db
APPSRC:=$(APP)/src
APP := .
APPDB := $(APP)/db
APPSRC := $(APP)/src
HEADERS += $(wildcard $(APPSRC)/*.h)
SOURCES += $(wildcard $(APPSRC)/*.cpp)
......@@ -95,14 +95,14 @@ TEMPLATES += $(APPDB)/sp-calib-sel.db
ifeq ($(T_A),linux-ppc64e6500)
USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/libxml2
#USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/boost
USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/libxml2
#USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/boost
else ifeq ($(T_A),linux-corei7-poky)
USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/libxml2
#USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/boost
USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/libxml2
#USR_INCLUDES += -I$(SDKTARGETSYSROOT)/usr/include/boost
else
USR_INCLUDES += -I/usr/include/libxml2
#USR_INCLUDES += -I/usr/include/boost
USR_INCLUDES += -I/usr/include/libxml2
#USR_INCLUDES += -I/usr/include/boost
endif
#USR_LIBS += boost_regex
......@@ -116,29 +116,24 @@ USR_DBFLAGS += -I $(APPDB)
USR_DBFLAGS += -I $(E3_SITELIBS_PATH)/sis8300_$(SIS8300_DEP_VERSION)_db
SUBS=$(wildcard $(APPDB)/*.substitutions)
.PHONY: db
db: $(SUBS) $(TMPS)
.PHONY: $(SUBS)
$(SUBS):
@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
@rm -f $(basename $(@)).db.d $(basename $(@)).db
@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db -S $@ > $(basename $(@)).db.d
@$(MSI) $(USR_DBFLAGS) -o $(basename $(@)).db -S $@
.PHONY: $(TMPS)
$(TMPS):
@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
@rm -f $(basename $(@)).db.d $(basename $(@)).db
@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@ > $(basename $(@)).db.d
@$(MSI) $(USR_DBFLAGS) -o $(basename $(@)).db $@
.PHONY: db $(SUBS) $(TMPS)
#
.PHONY: vlibs
vlibs:
#
tests.out deleted 100644 → 0
+ 0
− 82
View file @ f410c9ac
# Tests runned on 20-02-06 at TIGER
============================= test session starts ==============================
platform linux -- Python 3.6.7, pytest-5.2.2, py-1.8.0, pluggy-0.13.0 -- /usr/bin/python3.6
cachedir: .pytest_cache
Modules versions:
require - 3.1.2
devlib2 - 2.9.0
mrfioc2 - 2.2.0-rc8
asyn - 4.36.0
loki - 1.0.0
nds - 2.3.4
sis8300drv - 4.8.0
scaling - 1.6.2
sis8300 - 2.9.3
sis8300llrfdrv - 5.5.1
sis8300llrf - 3.14.3
rootdir: /home/iocuser/e3-clean/e3-sis8300llrf/m-epics-sis8300llrf/test, inifile: pytest.ini
collecting ... collected 58 items
test_params.py::test_params[/dev/sis8300-4-LLRF-TIGER] PASSED [ 1%]
test_ai_channels.py::TestAIChannels::test_en_all[LLRF-TIGER] PASSED [ 3%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-0] PASSED [ 5%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-1] PASSED [ 6%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-2] PASSED [ 8%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-3] PASSED [ 10%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-4] PASSED [ 12%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-5] PASSED [ 13%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-6] PASSED [ 15%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-7] PASSED [ 17%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-8] PASSED [ 18%]
test_ai_channels.py::TestAIChannels::test_acq[/dev/sis8300-4-LLRF-TIGER-9] PASSED [ 20%]
test_ai_channels.py::TestAIChannels::test_dis_01[LLRF-TIGER] PASSED [ 22%]
test_ai_channels.py::TestAIChannels::test_dis_29[LLRF-TIGER] PASSED [ 24%]
test_other.py::TestVM::test_output_en[/dev/sis8300-4-LLRF-TIGER] PASSED [ 25%]
test_other.py::TestVM::test_output_dis[/dev/sis8300-4-LLRF-TIGER] PASSED [ 27%]
test_other.py::TestState::test_states[LLRF-TIGER] PASSED [ 29%]
test_triggers.py::TestSimBPTrig::test_bp_trig[/dev/sis8300-4-LLRF-TIGER-50] PASSED [ 31%]
test_triggers.py::TestSimBPTrig::test_bp_trig[/dev/sis8300-4-LLRF-TIGER-49] PASSED [ 32%]
test_triggers.py::TestSimBPTrig::test_bp_trig[/dev/sis8300-4-LLRF-TIGER-9] PASSED [ 34%]
test_attenuation.py::TestAttenuation::test_init[/dev/sis8300-4-LLRF-TIGER] PASSED [ 36%]
test_attenuation.py::TestAttenuation::test_on[/dev/sis8300-4-LLRF-TIGER] PASSED [ 37%]
test_attenuation.py::TestAttenuation::test_after_reset[/dev/sis8300-4-LLRF-TIGER] PASSED [ 39%]
test_lp.py::TestLowPass::test_enable[/dev/sis8300-4-LLRF-TIGER] PASSED [ 41%]
test_lp.py::TestLowPass::test_rand_values[/dev/sis8300-4-LLRF-TIGER] PASSED [ 43%]
test_lp.py::TestNotch::test_enable[/dev/sis8300-4-LLRF-TIGER] PASSED [ 44%]
test_lp.py::TestNotch::test_rand_values[/dev/sis8300-4-LLRF-TIGER] PASSED [ 46%]
test_tables.py::TestTablesNormal::test_tables_sp_qi[/dev/sis8300-4-LLRF-TIGER] PASSED [ 48%]
test_tables.py::TestTablesNormal::test_tables_ff_qi[/dev/sis8300-4-LLRF-TIGER] PASSED [ 50%]
test_tables.py::TestTablesSpecial::test_tables_sp_mag_ang[/dev/sis8300-4-LLRF-TIGER] PASSED [ 51%]
test_tables.py::TestTablesSpecial::test_tables_ff_mag_ang[/dev/sis8300-4-LLRF-TIGER] PASSED [ 53%]
test_tables.py::TestTablesSpecial::test_tables_sp_qi[/dev/sis8300-4-LLRF-TIGER] PASSED [ 55%]
test_tables.py::TestTablesSpecial::test_tables_ff_qi[/dev/sis8300-4-LLRF-TIGER] PASSED [ 56%]
test_decimation.py::TestDecimation::test_dec_rbv[LLRF-TIGER] PASSED [ 58%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-0] PASSED [ 60%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-1] PASSED [ 62%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-2] PASSED [ 63%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-3] PASSED [ 65%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-4] PASSED [ 67%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-5] PASSED [ 68%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-6] PASSED [ 70%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-7] PASSED [ 72%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-8] PASSED [ 74%]
test_decimation.py::TestDecimation::test_dec_ch[LLRF-TIGER-9] PASSED [ 75%]
test_decimation.py::TestDecimation::test_ai_size[/dev/sis8300-4-LLRF-TIGER] PASSED [ 77%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-0] PASSED [ 79%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-1] PASSED [ 81%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-2] PASSED [ 82%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-3] PASSED [ 84%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-4] PASSED [ 86%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-5] PASSED [ 87%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-6] PASSED [ 89%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-7] PASSED [ 91%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-8] PASSED [ 93%]
test_xax.py::TestXAxis::test_xax_ch[LLRF-TIGER-9] PASSED [ 94%]
test_iq_samp.py::TestIQSampling::test_mn_rbv[LLRF-TIGER] PASSED [ 96%]
test_iq_samp.py::TestIQSampling::test_cav_inp[LLRF-TIGER] PASSED [ 98%]
test_iq_samp.py::TestIQSampling::test_iq_ang_off[LLRF-TIGER] PASSED [100%]
======================== 58 passed in 139.59s (0:02:19) ========================
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment