Commit Graph

12972 Commits

Author SHA1 Message Date
d0e83116e6 merge logClient changes from 7.0.3 2019-09-03 09:30:35 +02:00
3276e22c82 Merge branch 'PSI-3.14' of git.psi.ch:epics_base/base-3-14-12 into PSI-3.14 2019-09-02 09:25:13 +02:00
8b5225c14f merged with origin/PSI-3.14 2019-05-09 16:31:51 +02:00
962bf4d2dd added newer eldk53-ppc4xxFP (DeltaTau) 2019-05-09 16:25:23 +02:00
8a53c494ff Don't build with clang for SL6 any more 2019-05-09 16:25:02 +02:00
f65c39c0d2 backport dbQuietMacroWarnings 2018-09-14 15:23:13 +02:00
26b857a8da Merge remote-tracking branch 'origin/3.14' into PSI-3.14 2018-09-14 15:17:29 +02:00
ee1b68d229 Merge remote-tracking branch 'launchpad/3.14' into PSI-3.14 2018-09-14 15:12:46 +02:00
cbd4634224 install header needed by iocStats 2018-09-14 12:00:47 +02:00
fc3f1fab6a moved -fno-strict-aliasing to generic linux config file 2018-06-08 09:14:46 +02:00
Michael Davidsaver
4b4d302ded apply patch "db_close_events cleanup" 2018-05-28 15:51:25 +02:00
24ab504920 raspberry pi architecture added 2018-05-28 15:32:55 +02:00
2db93163c1 restore lost include line 2018-05-18 09:56:30 +02:00
2ef70f6d7c Merge branch 'PSI-3.14' of git.psi.ch:epics_base/base-3-14-12 into PSI-3.14 2018-05-04 11:20:00 +02:00
Andrew Johnson
116c90c2ea Reformatting, no code changes 2018-05-03 14:40:12 -05:00
Andrew Johnson
3f3696fb91 dbStatic: Prevent modifying a NAME field using a DB file
Fixes LP: #1597809
2018-05-03 14:28:44 -05:00
06a330ccf8 prevent time jumps in NTP client 2018-05-03 09:55:29 +02:00
ccbaf557a0 comment fixed 2018-05-03 09:54:31 +02:00
720cc3e84e Merge branch 'PSI-3.14' of git.psi.ch:epics_base/base-3-14-12 into PSI-3.14 2018-04-04 16:03:22 +02:00
6f3e74095c update osdThread.c from ../posix while keeping thread name and LWP ID 2018-04-04 11:53:45 +02:00
871e5c496e for easier debugging: overwrite destroyed event mutex 2018-04-04 10:45:40 +02:00
44d4e47ec2 add simple calculations to macros 2018-04-04 09:41:36 +02:00
394bf30dbf use dynamic vxWorks BSP function binding because we don't know which functions are implememted in any particular BSP 2018-04-04 09:40:10 +02:00
9b9daa9a7c by Helge 2018-04-04 09:37:51 +02:00
zimoch
ec3b7c364b Put thread names in ps -L output and thread ids in epicsThreadShowAll output 2018-04-04 09:31:01 +02:00
afcb81927e catch tNTP time jumps in vxWorks 2018-03-29 13:32:27 +02:00
5fe0429c48 undo change of ROFF from LONG to ULONG in commit f498b36438 2018-03-29 11:48:55 +02:00
19c04ace1d remove strict aliasing warnings for vxWorks 6.3 and mvl40-xscale_be (Moxa) PSI-3.14.12.7 2018-03-28 11:36:33 +02:00
Andrew Johnson
b9443f8813 Tell MSVC to use absolute filenames in diagnostics (-FC flag) 2018-03-23 11:39:53 -05:00
538bc88760 where possible compile always with debug infos with gcc 2018-03-22 10:45:11 +01:00
0b6eb67137 merge updates from main branch 2018-03-21 11:51:56 +01:00
5c080a64f9 bind info to reacord instead of alias 2018-03-21 11:04:15 +01:00
Andrew Johnson
b7d4609e57 Merge Bruce Hill's camonitor-server-relative-ts-bug-3.14 branch 2018-03-15 17:33:32 -05:00
Andrew Johnson
c8a7e1597d VxWorks Timezone updates
Remove 2017; fix hour in MET settings
2018-03-15 10:57:55 -05:00
Andrew Johnson
ceaff61c09 Pull in the podToHtml.pl script and rules from 3.15
This lets src/cap5 build with Perl installations that lack Perl's
podchecker and pod2html scripts (e.g. Fedora 27).
2018-03-14 14:12:12 -05:00
Bruce Hill
6cc623a7b4 Fixed camonitor server side relative timestamps bug
tsFirst needs to get initialized from the first server side
timestamp instead of the client side tsNow.
2018-03-08 01:40:11 -08:00
3f1a366291 better fix for 32 bit calc 2018-03-02 13:32:25 +01:00
0d332dbb41 channel access to info fields 2018-03-02 13:31:18 +01:00
c1447d9cb4 handle changing datatype in camonitor reconnect 2018-02-28 17:06:24 +01:00
76ba742563 allow unterminated conditionals in CALC 2018-02-28 16:54:12 +01:00
6a75f3258b add EPICS_ALLOW_MULTIPLE_IOCS to prevent starting more than one IOC on one machine 2018-02-28 16:53:35 +01:00
a2bf0f3c66 backward compatibility function wrappers 2018-02-28 16:52:34 +01:00
d2c4fd85d7 named events 2018-02-28 16:51:09 +01:00
2772d57842 set PP on SELN and SELM fields 2018-02-28 16:42:33 +01:00
c9a8a551e8 remove strict alias warnings on more architectures 2018-02-28 16:18:31 +01:00
2718a0d706 install additional header files for caGateway 2018-02-22 17:17:34 +01:00
1b9a104215 install additional header file for iocStats 2018-02-22 17:16:55 +01:00
c6a9818539 Copy src and tar rule 2018-02-22 17:13:40 +01:00
f400e12743 PSI configuration 2018-02-22 17:11:56 +01:00
Andrew Johnson
ac4d5c95ac Clean up some compiler warnings from clang 2018-02-09 10:56:52 -06:00