Skip to content

Commit

Permalink
Merge 7d80472 into de63ec4
Browse files Browse the repository at this point in the history
  • Loading branch information
simon-ess authored Sep 14, 2023
2 parents de63ec4 + 7d80472 commit c0a961e
Show file tree
Hide file tree
Showing 16 changed files with 2,497 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ __pycache__/
*.orig
*.log
.*.swp
.vscode
35 changes: 35 additions & 0 deletions documentation/pvalink-schema-0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://mdavidsaver.github.io/pvxs/pvalink-schema-0.json",
"title": "PVA Link schema",
"type": ["string", "object"],
"properties": {
"pv": { "type": "string" },
"field": {
"type": "string",
"default": "value"
},
"Q": {
"type": "integer",
"default": 4
},
"proc": {
"type": ["boolean", "string", "null"],
"enum": [true, false, null, "", "NPP", "PP", "CP", "CPP"],
"default": null
},
"sevr": {
"type": ["boolean", "string"],
"enum": [true, false, "NMS", "MS", "MSI", "MSS"],
"default": "NMS"
},
"time": { "type": "boolean", "default": false },
"monorder": { "type": "integer", "default": 0 },
"defer": { "type": "boolean", "default": false },
"retry": { "type": "boolean", "default": false },
"pipeline": { "type": "boolean", "default": false },
"always": { "type": "boolean", "default": false },
"local": { "type": "boolean", "default": false }
},
"additionalProperties": false
}
16 changes: 12 additions & 4 deletions ioc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@ pvxsIoc_SRCS += groupconfigprocessor.cpp
pvxsIoc_SRCS += groupprocessorcontext.cpp
pvxsIoc_SRCS += groupsource.cpp
pvxsIoc_SRCS += groupsourcehooks.cpp

else # BASE_7_0

pvxsIoc_SRCS += dummygroup.cpp
pvxsIoc_SRCS += pvalink.cpp
pvxsIoc_SRCS += pvalink_channel.cpp
pvxsIoc_SRCS += pvalink_jlif.cpp
pvxsIoc_SRCS += pvalink_link.cpp
pvxsIoc_SRCS += pvalink_lset.cpp

endif # BASE_7_0

Expand All @@ -84,3 +85,10 @@ include $(TOP)/configure/RULES_PVXS_MODULE
#----------------------------------------
# ADD RULES AFTER THIS LINE

ifdef BASE_7_0
../O.Common/pvxsIoc.dbd: ../pvxs7x.dbd
$(CP) $< $@
else
../O.Common/pvxsIoc.dbd: ../pvxs3x.dbd
$(CP) $< $@
endif
Loading

0 comments on commit c0a961e

Please sign in to comment.