epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

nanoSecond => nanosecond

Browse Source
This commit is contained in:
Marty Kraimer
2014-08-20 06:30:13 -04:00
parent 124972605a
commit eefd499adc
6 changed files with 1646 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DEMO
View File

@ -42,7 +42,7 @@ uri:ev4:nt/2012/pwd:NTScalar
string message
time_t timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
int nanoseconds 0
int userTag 0
display_t display
double limitLow 0
@ -64,7 +64,7 @@ uri:ev4:nt/2012/pwd:NTScalar
int lowWarningSeverity 0
int highWarningSeverity 0
int highAlarmSeverity 0
double hystersis 0
double hysteresis 0
6. Get the values of some fields of V4 record (-r is pvAccess request string)
@ -75,7 +75,7 @@ structure
double value 1.23
time_t timeStamp
long secondsPastEpoch 0
int nanoSeconds 0
int nanoseconds 0
int userTag 0
alarm_t alarm
int severity 0

1621
documentation/Doxyfile Normal file
View File

File diff suppressed because it is too large Load Diff

11
documentation/RELEASE_NOTES.html Normal file
View File

@ -0,0 +1,11 @@
<h1>Release release/3.1 IN DEVELOPMENT</h1>
<p>The main changes since release 3.0.2 are:</p>
<ul>
<li>pvAccess API is changed.</li>
</ul>
<h2>pvAccess API is changed.</h2>
<p>Instead of data (PVStructure) appearing in connect callback (for example channelGetConnect)
it now is present in method called by whoever delivers the data.
See pvAccessJava.html for details.</p>
<h1>Release 3.0.4</h1>
<p>This was the starting point for RELEASE_NOTES</p>

9
documentation/TODO.html Normal file
View File

@ -0,0 +1,9 @@
<h1>TODO</h1>
<h2>pvAccessCPP.html</h2>
<p>This needs to be written.
For now it just refers to pvAccessJava.html</p>
<h2>RPCClient</h2>
<p>The C++ implementation only has method request.
The Java version has methods: destroy, waitConnect, request, sendRequest, and waitResponse.</p>
<h2>Matej to add info</h2>
<p>This markdown document is for Matej to edit.</p>

2
src/ca/caChannel.cpp
View File

@ -677,7 +677,7 @@ void copy_DBR_TIME(const void * dbr, unsigned count, PVStructure::shared_pointer
epics::pvData::int64 spe = data->stamp.secPastEpoch;
spe += 7305*86400;
ts->getLongField("secondsPastEpoch")->put(spe);
ts->getIntField("nanoSeconds")->put(data->stamp.nsec);
ts->getIntField("nanoseconds")->put(data->stamp.nsec);
copy_DBR<pT, sT, sF, aF>(&data->value, count, pvStructure);
}

2
src/server/serverContext.cpp
View File

@ -80,7 +80,7 @@ void ServerContextImpl::generateGUID()
ByteBuffer buffer(_guid.value, sizeof(_guid.value));
buffer.putLong(startupTime.getSecondsPastEpoch());
buffer.putInt(startupTime.getNanoSeconds());
buffer.putInt(startupTime.getNanoseconds());
}
void ServerContextImpl::initializeLogger()