epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity
15,304 Commits 8 Branches 204 Tags
b4ce30cfe5a9cd1b5dfc73af0eca9b39472daa4b
Commit Graph

15304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Davidsaver b4ce30cfe5 update modules/pvAccess 2018-07-06 16:31:50 -07:00
Michael Davidsaver d77a96d23d update PVA modules 2018-06-27 16:55:32 -07:00
Andrew Johnson 1b6ec2676c Document branch recombination 2018-06-21 00:30:02 -05:00
Andrew Johnson 7e598c60cc Merge changes from 3.16 branch into 7.0 2018-06-20 23:27:49 -05:00
Ralph Lange 0248570123 Merge branch 'database/master' back 2018-06-20 09:32:23 +02:00
Ralph Lange cdd8f610ec Merge branch 'ca/master' back 2018-06-20 08:57:14 +02:00
Ralph Lange 4441399dcb Merge branch 'libcom/master' back 2018-06-19 16:52:24 +02:00
Ralph Lange 893fbae559 Remove EPICS Base submodules 2018-06-19 11:49:10 +02:00
Ralph Lange e165567234 Move all under modules/ca 2018-06-19 11:33:25 +02:00
Ralph Lange 568c405165 Move all under modules/database 2018-06-19 11:31:13 +02:00
Ralph Lange 833648c977 Move all under modules/libcom 2018-06-19 11:25:46 +02:00
Andrew Johnson 7d28ae3732 Merge ioc template changes from 3.15 branch into 3.16 2018-06-05 00:15:22 -05:00
Andrew Johnson a9d7f7be13 Template iocBoot/ioc Makefile fix for Unix-like OSs 
Fixes lp: #1766349
 2018-06-04 23:14:45 -05:00
Andrew Johnson 55db6525ee Merge Perl s/use vars/our/ changes from 3.15 into 3.16 2018-05-28 17:41:23 -05:00
Andrew Johnson fe1ec6ed31 Replace > with > in Release Notes code examples 2018-05-28 17:40:57 -05:00
Andrew Johnson 8fb6c6d610 Merge changes from 3.15 into 3.16 2018-05-28 17:39:24 -05:00
Andrew Johnson 23c4eb42a3 Perl s/use vars/our/ 2018-05-28 17:31:16 -05:00
Andrew Johnson 6d7f70f200 Merge changes from 3.14 branch into 3.15 2018-05-28 17:00:35 -05:00
Andrew Johnson 67844bacc3 Perl s/use vars/our/ 2018-05-28 16:13:14 -05:00
Ralph Lange 7e7d230d8c templates: fix warnings for xxxRecord.c in exampleApp 
(fixes #1772833)
 2018-05-23 09:24:56 +02:00
Ralph Lange c0cbf8e985 Merge Dirk's mbbioDirect32bit branch (revamped) into 3.16 2018-05-22 14:18:17 +02:00
Ralph Lange 498b248811 std/rec/test: add test for mbbiDirect/mbboDirect 
(drop dysfunctional async test from original proposal)
 2018-05-22 14:14:10 +02:00
Andrew Johnson c1ece40f41 Updated Release Notes for Base-3.14.12.8 2018-05-19 22:42:23 -05:00
Andrew Johnson a732539eee epicsMath.h defines 'finite()' not 'isfinite()' 2018-05-19 21:14:36 -05:00
Ralph Lange 3bc0805a89 rec: fix missing includes in longin/longout 2018-05-18 09:54:42 +02:00
Ralph Lange c72e35c769 Merge Ralph's fix-1770292 branch into 3.14 2018-05-17 17:16:07 +02:00
Ralph Lange 7e293e60a6 std/dev,std/rec: treat val/sval/rval as ULONG for mbbiDirect/mbboDirect 2018-05-15 16:54:46 +02:00
Ralph Lange c80783dfa9 std/rec: fix promptgroup labels in mbboDirect 2018-05-15 16:25:23 +02:00
Ralph Lange 3b6a4ad5a6 doc: update release notes 2018-05-15 15:50:55 +02:00
zimoch ccc8f75ec7 std/dev: adapt mbbiDirect/mbboDirect soft support to 32bit 2018-05-15 14:43:30 +02:00
zimoch d9742d5240 std/rec: make VAL (etc.) of mbbiDirect/mbboDirect LONG 
(not ULONG because of CA)
 2018-05-15 14:40:39 +02:00
zimoch 7aa2ae2094 std/rec: make SHFT field of mbboDirect USHRT (as mbbiDirect) 2018-05-15 11:56:52 +02:00
zimoch ab517a9392 std/rec: move mbboDirect bits to end (as mbbiDirect) 2018-05-15 11:55:34 +02:00
zimoch 4df39bb425 std/rec: make mbbiDirect prompts consistent with mbboDirect 2018-05-15 11:54:08 +02:00
zimoch 6ff271527b std/rec: fix typo in mbboDirect promptgroup 2018-05-15 11:52:56 +02:00
Ralph Lange 2d9c5e99a1 db: correctly convert NaN alarm levels to integers 
(fixes lp #1771298)
 2018-05-15 11:18:11 +02:00
Ralph Lange ca22d50831 rec: consistent get_alarm_double() for longin/longout 
(fixes lp #1770292)
 2018-05-15 11:18:10 +02:00
Michael Davidsaver 4972803ce2 scanEventTest: use testSyncCallback() 2018-05-14 10:49:49 -07:00
Michael Davidsaver 3b7e348a8c dbUnitTest.h add callback sync. and global mutex 
Add testSyncCallback() to wait for in queued and
in-progress callbacks to complete.

Also add testGlobalLock() to help tests avoid
use after free when destroying sync. primitives.
 2018-05-14 10:49:49 -07:00
Michael Davidsaver 00a974ce52 callback.h: add epicsCallback alternative to CALLBACK 
Add epicsCallback as an IDE friendly alternative to CALLBACK.

IDEs like qtcreator have long been confused by the use
of CALLBACK, a name which has long been used by other libraries,
which prevents code using it from being parsed correctly.
 2018-05-14 10:49:49 -07:00
Michael Davidsaver 490c504736 scanEventTest: use dbUnitTest.h for IOC lifecycle 2018-05-14 10:49:49 -07:00
Andrew Johnson 35ad28dde1 Merge fix from 3.15 into 3.16 2018-05-12 22:42:52 -05:00
Andrew Johnson ba4c609506 Merge changes from 3.15 into 3.16 2018-05-12 22:39:37 -05:00
Andrew Johnson 49371cfe00 Fix RTEMS build in src/std/rec/test 
Also back-ported Michael's change from commit b9b8cde5f6 to avoid
using callocMustSucceed() in eventNameToHandle()
 2018-05-12 22:25:15 -05:00
Andrew Johnson 06ad4a0d70 Merge Bruce Hill's pv-name-in-ca-error-msgs branch into 3.15 
Actually this is fixing CAS error messages.
I added the additional changes suggested by Ralph in his code-review.
 2018-05-12 21:37:44 -05:00
Andrew Johnson a2ae07dfcd Merge Dirk Zimoch's named-events-backward-compatibility branch into 3.15 2018-05-12 21:15:26 -05:00
Andrew Johnson b539ced6d5 Merge J. Lewis Muir's doc-filters-typo branch into 3.15 2018-05-12 20:54:20 -05:00
Andrew Johnson 1b332361e7 Merge changes from 3.14 into 3.15 2018-05-12 20:47:54 -05:00
Andrew Johnson 5cb91d9f6d Merge Ben Franksen's deadlock_warning branch into 3.14 2018-05-12 20:20:30 -05:00
Andrew Johnson 116c90c2ea Reformatting, no code changes 2018-05-03 14:40:12 -05:00