Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • msk-sw/laser-based-synchronisation/laser-pulse-arrival-time-monitor/lam-actuator-server-config
1 result
Show changes
Commits on Source (4)
...@@ -5,7 +5,7 @@ PROJECT(lam-actuator-server-config NONE) ...@@ -5,7 +5,7 @@ PROJECT(lam-actuator-server-config NONE)
# Note: Always keep MAJOR_VERSION and MINOR_VERSION identical to the server version. Count only the patch separately. # Note: Always keep MAJOR_VERSION and MINOR_VERSION identical to the server version. Count only the patch separately.
set(${PROJECT_NAME}_MAJOR_VERSION 00) set(${PROJECT_NAME}_MAJOR_VERSION 00)
set(${PROJECT_NAME}_MINOR_VERSION 01) set(${PROJECT_NAME}_MINOR_VERSION 01)
set(${PROJECT_NAME}_PATCH_VERSION 03) set(${PROJECT_NAME}_PATCH_VERSION 04)
include(cmake/set_version_numbers.cmake) include(cmake/set_version_numbers.cmake)
include(cmake/config_generator_project.cmake) include(cmake/config_generator_project.cmake)
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
"delimiter":"\r\n" "delimiter":"\r\n"
}, },
"registers": { "registers": {
"/listAxisIdentifiers":{"readCmd":"SAI?", "readResp":".*{{x.0}}\r\n", "type":"STRING"}, "/listAxisIdentifiers":{"readCmd":"SAI?", "readResp":"{{x.0}}\r\n", "type":"STRING"},
"/getDeviceId":{"readCmd":"*IDN?", "readResp":"(.*)\r\n", "type":"STRING"}, "/getDeviceId":{"readCmd":"*IDN?", "readResp":"{{x.0}}\r\n", "type":"STRING"},
"/status":{"readCmd":"\u0004", "readResp":"0x{{x.0}}\r\n", "type":"HEX"}, "/status":{"readCmd":"\u0004", "readResp":"0x{{x.0}}\r\n", "type":"HEX"},
"/motionStatus":{"readCmd":"\u0005", "readResp":"{{x.0}}\r\n", "type":"HEX"}, "/motionStatus":{"readCmd":"\u0005", "readResp":"{{x.0}}\r\n", "type":"HEX"},
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"/maxPosition" :{"writeCmd":"SPA 1 0x15 {{x.0}}", "readCmd":"TMX? 1", "readResp":"1={{x.0}}\r\n", "type":"DOUBLE"}, "/maxPosition" :{"writeCmd":"SPA 1 0x15 {{x.0}}", "readCmd":"TMX? 1", "readResp":"1={{x.0}}\r\n", "type":"DOUBLE"},
"/targetPosition":{"writeCmd":"MOV 1 {{x.0}}", "readCmd":"MOV? 1", "readResp":"1={{x.0}}\r\n", "type":"DOUBLE"}, "/targetPosition":{"writeCmd":"MOV 1 {{x.0}}", "readCmd":"MOV? 1", "readResp":"1={{x.0}}\r\n", "type":"DOUBLE"},
"/targetRelativePosition":{"writeCmd":"MVR 1 {{x.0}}", "type":"DOUBLE"}, "/targetRelativePosition":{"writeCmd":"MVR 1 {{x.0}}", "type":"DOUBLE"},
"/currentPostion":{"readCmd":"POS? 1", "readResp":"1={{x.0}}\r\n", "type":"DOUBLE"}, "/currentPosition":{"readCmd":"POS? 1", "readResp":"1={{x.0}}\r\n", "type":"DOUBLE"},
"/fastMoveToNegativeLimit" :{"writeCmd":"FNL 1", "type":"VOID"}, "/fastMoveToNegativeLimit" :{"writeCmd":"FNL 1", "type":"VOID"},
"/fastMoveToPositiveLimit" :{"writeCmd":"FPL 1", "type":"VOID"}, "/fastMoveToPositiveLimit" :{"writeCmd":"FPL 1", "type":"VOID"},
......