Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
MSK-SW
Low-Level Radio Frequency
DCM Server
DCM Config
Commits
7af85492
Commit
7af85492
authored
Oct 21, 2022
by
Dietrich Rothe
Browse files
let SIGNAL.DCM_CH and ATT_CH count beginning from 1
which is convention requested by Christian
parent
85604e17
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
7af85492
...
...
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.5)
# Note: Always keep MAJOR_VERSION and MINOR_VERSION identical to the server version. Count only the patch separately.
set
(
${
PROJECT_NAME
}
_MAJOR_VERSION 08
)
set
(
${
PROJECT_NAME
}
_MINOR_VERSION 00
)
set
(
${
PROJECT_NAME
}
_PATCH_VERSION 0
4
)
set
(
${
PROJECT_NAME
}
_PATCH_VERSION 0
5
)
include
(
cmake/set_version_numbers.cmake
)
include
(
cmake/config_generator_project.cmake
)
dcmctrl7/templates/dcm_base_config.xml
View file @
7af85492
...
...
@@ -20,8 +20,9 @@
% for SIG in SIGNALS[PORT]:
<module
name=
"signal${SIG.ID}"
>
<variable
name=
"ADC_channel"
type=
"int16"
value=
"${SIG.ADC_CH}"
></variable>
<variable
name=
"DCM_channel"
type=
"int16"
value=
"${SIG.DCM_CH}"
></variable>
<variable
name=
"ATT_channel"
type=
"int16"
value=
"${SIG.ATT_CH}"
></variable>
<!-- convention requested by LLRF: let DCM_channel and ATT_channel count from 1 in server. But not in generating python code! server only displays value -->
<variable
name=
"DCM_channel"
type=
"int16"
value=
"${SIG.DCM_CH + 1}"
></variable>
<variable
name=
"ATT_channel"
type=
"int16"
value=
"${SIG.ATT_CH + 1}"
></variable>
<variable
name=
"id"
type=
"int16"
value=
"${SIG.ID}"
></variable>
<variable
name=
"name"
type=
"string"
value=
"${SIG.NAME}"
></variable>
</module>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment