88cdffddb6
Merge branch '7.0' release 7.4.0.1 into PSI-7.0
...
Conflicts:
.gitmodules
modules/database/src/ioc/db/Makefile
modules/libcom/test/epicsAtomicTest.cpp
modules/pvAccess
modules/pvData
modules/pvDatabase
modules/pva2pva
2020-06-03 10:46:07 +02:00
Michael Davidsaver
688bc3247c
missing include
2020-05-28 16:07:50 -07:00
Andrew Johnson
7ba12f600c
Perl: Close and delete output files when dying
2020-05-26 22:09:24 -05:00
Andrew Johnson
808cf80579
Fix Makefiles to use RULES_DIRS instead of _TOP
2020-05-26 22:09:24 -05:00
Andrew Johnson
dd1b65f32c
Many edits to record reference docs
...
Add documentation for aSub from wiki.
Fix incorrect document structures.
Remove inclusion of menu.dbd files.
Fix links to common doc's, remove some links to nowhere.
Adjust podToHtml.pl and the rule that calls it.
2020-05-26 21:49:35 -05:00
Andrew Johnson
b2fb83179a
Remove duplicate MBA template files
2020-05-24 21:37:11 -05:00
hir12111
0f88c67473
Add a getter function for field_type
2020-05-21 12:06:56 -07:00
Michael Davidsaver
4c192e7bba
Merge remote-tracking branch 'githubrl/doc-sim-mode' into 7.0
...
* githubrl/doc-sim-mode:
doc: update simulation parameters sections in dbds
doc: add description of improved simulation mode
# Conflicts:
# modules/database/src/std/rec/mbboRecord.dbd.pod
2020-05-21 11:42:24 -07:00
Ralph Lange
96f9f355c9
doc: update simulation parameters sections in dbds
...
- refer to appropriate sections in dbCommonInput/dbCommonOutput
2020-05-21 13:41:11 +02:00
36a8b51d8e
CleanupWhitespace
...
removed spaces at end of line
replaced tabs with spaces
2020-05-20 14:48:09 -07:00
Michael Davidsaver
799e72b1e3
libCom: actually use libComAPI.h in libCom
2020-05-20 14:47:51 -07:00
Ralph Lange
b0cd3518e4
doc: add description of improved simulation mode
...
- improve sections in dbCommonInput/dbCommonOutput
2020-05-20 19:48:22 +02:00
Michael Davidsaver
a9934792a0
Merge remote-tracking branch 'lp-anj7/expanded-rules' into 7.0
...
* lp-anj7/expanded-rules:
Generate module version files with new RULES_EXPAND facilities
Extend RULES_EXPAND to add more features
More generator doc updates
Document <library>_API = <stem> for Makefiles
Convert epicsShareAPI to epicsStdCall in modules/ca
Update generator script
Modify rules to allow multiple API.h libraries to be built
Convert modules/ca to use LIBCA_API instead of epicsShare
Try out a representative sample of APIs from multiple libraries
Add build rules to generate and install *API.h header files
Add script to generate *API.h headers
2020-04-30 11:34:34 -07:00
Michael Davidsaver
bc595e3a70
Merge remote-tracking branch 'lp-anj7/typed-dsets' into 7.0
...
* lp-anj7/typed-dsets:
Bump database version to 3.18.0, use in SHRLIB_VERSION
Adjust example code in devSup.h
Set USE_TYPED_DSET centrally now everything uses it
Update the wording of the Release Notes entry
- Record updates: . histogramRecord . eventRecord . aaiRecord . aaoRecord
- Record updates: . aoRecord . biRecord . boRecord . mbbiRecord . mbbiDirectRecord . mbboRecord . mbboDirectRecord . longinRecord . longoutRecord . stringoutRecord . stringinRecord . waveformRecord . calcoutRecord . subArrayRecord
initial typed-dset changes for ao record
Add Release Notes entry about dsets
Export and use aidset, set USE_TYPED_DSET
Remove duplicated include line
Add HAS_<record>dset macros to allow detection
Export and use int64outdset, set USE_TYPED_DSET
Export and use int64indset, set USE_TYPED_DSET
Modify lsodset, set USE_TYPED_DSET
Modify lsidset, set USE_TYPED_DSET
Modify printfdset, set USE_TYPED_DSET
2020-04-30 11:26:08 -07:00
Michael Davidsaver
5d5e552a7e
de-init hooks
2020-04-29 16:40:16 -07:00
Martin Konrad
fd5edce919
Warn if deprecated state record is used
2020-04-29 16:39:30 -07:00
Hinko Kocevar
8709fbb63f
add missing newline
2020-04-29 16:35:34 -07:00
Michael Davidsaver
ce4fb6085f
iocsh: add usage messages
2020-04-24 20:28:00 -07:00
Michael Davidsaver
f1cbe93b6c
Revert "replace most internal getCurrent() -> getMonotonic()"
...
This reverts commit 4f2228fb1d
except for some test code.
2020-04-24 15:37:48 -07:00
Andrew Johnson
85d1982890
Merge changes from 3.15 branch into 7.0
2020-04-15 21:39:54 -05:00
Andrew Johnson
5040af322d
Fixes in link type documentation
2020-03-26 15:55:27 -05:00
Michael Davidsaver
a8b2bc5c3b
asCa.c normalize indentation
...
whitespace only
2020-03-23 18:24:44 -07:00
Michael Davidsaver
bac8851132
Revert "asCaStop() join worker thread"
...
This reverts commit afc31f2f06 .
# Conflicts:
# modules/database/src/ioc/as/asCa.c
2020-03-23 18:22:16 -07:00
Andrew Johnson
5009f288ae
Generate module version files with new RULES_EXPAND facilities
...
Also removes the separate *VersionNum.h@ templates
2020-03-20 12:03:14 -05:00
Andrew Johnson
25bb966cbc
Use the dbChannel*() accessor macros in the array filter code
...
instead of exposing the dbChannel innards unnecessarily.
2020-03-14 16:19:26 -05:00
Andrew Johnson
0cf38bfb29
Try out a representative sample of APIs from multiple libraries
2020-03-07 01:32:36 -06:00
Andrew Johnson
e13b01208b
Bump database version to 3.18.0, use in SHRLIB_VERSION
2020-03-06 23:28:57 -06:00
Andrew Johnson
048689d6db
Adjust example code in devSup.h
2020-03-06 23:20:55 -06:00
Andrew Johnson
23cac3c1a8
Set USE_TYPED_DSET centrally now everything uses it
2020-03-06 22:49:58 -06:00
Gabriel Fedel
90c0f5c48d
Fix seq to work correctly on "Specified" mode
...
On Specified mode is expected that when seq is processed the value from
DOL0 (fixed or links) is set on LNK0, if SELN = 0 (and OFFS = 0).
2020-02-14 15:09:11 +00:00
Gabriel Fedel
d82529058a
Add a test to record seq in "Specified" mode
2020-02-14 15:09:11 +00:00
Michael Davidsaver
3465c0c8b0
simmTest imprecise
2020-02-14 13:25:43 +00:00
gabadinho
c54237e34a
- Record updates:
...
. histogramRecord
. eventRecord
. aaiRecord
. aaoRecord
- Device support updates:
. devHistogramSoft (histogramRecord)
. devEventSoft (eventRecord)
. devAaiSoft (aaiRecord)
. devAaoSoft (aaoRecord)
- Fixes in already-migrated records
. lsiRecord: replaced 'struct lsidset' with typedef(ed) 'lsidset'
. int64inRecord (similar as above)
. int64outRecord (similar as above)
. calcRecord: minor fix in init_record() prototype declaration
- Note: the comments about return values in dset structs were outright copied from .c to .pod/.dbd files without confirmation if they are indeed correct!
2020-02-14 11:07:11 +01:00
gabadinho
754eb73334
- Record updates:
...
. aoRecord
. biRecord
. boRecord
. mbbiRecord
. mbbiDirectRecord
. mbboRecord
. mbboDirectRecord
. longinRecord
. longoutRecord
. stringoutRecord
. stringinRecord
. waveformRecord
. calcoutRecord
. subArrayRecord
- Device support updates:
. devAoSoft, devAoSoftCallback, devAoSoftRaw (aoRecord)
. devBiSoft, devBiSoftCallback, devBiSoftRaw, devBiDbState (biRecord)
. devBoSoft, devBoSoftCallback, devBoSoftRaw, devBoDbState, devGeneralTime (boRecord)
. devMbbiSoft, devMbbiSoftCallback, devMbbiSoftRaw (mbbiRecord)
. devMbboSoft, devMbboSoftCallback, devMbboSoftRaw (mbboRecord)
. devMbbiDirectSoft, devMbbiDirectSoftCallback, devMbbiDirectSoftRaw (mbbiDirectRecord)
. devMbboDirectSoft, devMbboDirectSoftCallback, devMbboDirectSoftRaw (mbboDirectRecord)
. devGeneralTime, devLiSoft, devLiSoftCallback (longinRecord)
. devLoSoft, devLoSoftCallback (longoutRecord)
. devSoSoft, devSoSoftCallback, devStdio (stringoutRecord)
. devSiSoft, devSiSoftCallback, devEnviron, devGeneralTime, devTimestamp (stringinRecord)
. devWfSoft (waveformRecord)
. devCalcoutSoft, devCalcoutSoftCallback (recordCalcout)
. devSASoft (subArrayRecord)
2020-02-13 17:40:22 +01:00
Gabriel Fedel
6feb1c788d
Add extern C for all c headers
...
This allow that these files could be imported to c++ correctly
2020-02-13 14:21:54 +00:00
Karl Vestin
66f2a509db
Added initialization of alarm severity on probe. This value is not used, but should be initialized regardless. This was flagged as an error by the Codacy static code analysis.
...
Codacy link: https://app.codacy.com/gh/epics-base/epics-base/file/42103575016/issues/source?bid=16430872&fileBranchId=16430872#l604
Launchpad bug: https://bugs.launchpad.net/epics-base/+bug/1862918
LP: #1862918
2020-02-13 13:22:00 +00:00
Karl Vestin
538f532184
Added a free statement to release memory allocated for postbuf if the memory allocation for inbuf fails. Resolves an error level issue generated by the Codacy static code analysis.
...
Codacy link: https://app.codacy.com/gh/epics-base/epics-base/file/42098735308/issues/source?bid=16430872&fileBranchId=16430872#l201
Launchpad bug: https://bugs.launchpad.net/epics-base/+bug/1862917
LP: #1862917
2020-02-13 13:21:58 +00:00
gabadinho
55ec813908
initial typed-dset changes for ao record
2020-02-12 15:32:13 +01:00
Michael Davidsaver
e6810a4224
processTarget() remove unnecessary NULL test
...
psrc and pdst will always be non-NULL
2020-02-12 11:16:33 +00:00
Michael Davidsaver
f0bf61b4cb
rsrv: improve monitor/get error message
2020-02-12 11:16:26 +00:00
86adc529ef
Merge remote-tracking branch 'origin' into PSI-7.0
...
Conflicts:
configure/os/CONFIG_SITE.Common.linuxCommon
modules/libcom/src/log/iocLog.c
modules/libcom/src/log/logClient.c
modules/pvAccess
modules/pvData
modules/pvDatabase
2020-02-06 17:28:40 +01:00
Michael Davidsaver
468f965dc2
dbLoadTemplate.h missing extern "C"
2020-01-05 17:52:43 -08:00
Andrew Johnson
3b20e71da5
EPICS::IOC.pm Save parms, more debug annotations
2020-01-01 15:03:40 -06:00
Andrew Johnson
81df1b2892
Rearrange EPICS::IOC->close() to be more robust
2020-01-01 00:14:08 -06:00
Andrew Johnson
aad8a96b0d
Increase timeout for caget to 15 seconds
2020-01-01 00:08:06 -06:00
Andrew Johnson
83d2941405
netget: Run caget and pvget using EPICS::IOC instead of back-ticks
...
This lets us collect and echo their stderr streams, and if they
hang up without responding we can kill them directly instead of
just giving up and bailing out.
Left debug output turned on for now.
2019-12-31 22:28:43 -06:00
Andrew Johnson
b62ab817c6
Replace EPICS::IOC->kill() with exit() and close() methods
2019-12-31 22:21:03 -06:00
Andrew Johnson
70ea8d5476
Make EPICS::IOC->_geterrors() return on EOF from IOC's stderr
2019-12-31 22:15:22 -06:00
Andrew Johnson
5dc7995477
Enable IOC debug output in netget.plt
2019-12-27 17:36:37 -06:00
Andrew Johnson
e7715ba7b4
Merge 3.15 branch into 7.0
2019-12-18 23:58:02 -06:00