Closes #143, Add more epics variables to the edc.
2 unresolved threads
Adds in 3 new epics variables to the edc. If selected in the edc ini file they are always available.
- prefix UPTIME_SECONDS
- prefix DATA_RATE_KB_PER_S
- prefix GPS
Their data is also exported in the json debug dump as the following fields:
- Uptime
- DataRateKbPerSec
- Gpstime
Merge request reports
Activity
1210 return static_cast< int >( daqData - dataStart ); 1211 } 1212 1213 // ************************************************************************** 1214 void 1215 edcuWriteData( int daqBlockNum, 1216 unsigned long cycle_gps_time, 1217 int dcuId, 1218 int daqreset ) 1219 // ************************************************************************** 1220 { 1221 char* daqData; 1222 int buf_size; 1223 int ii; 1224 1225 edcuLoadSpecial( num_chans_index, daqd_edcu1.num_chans ); 1362 1460 edcuInitialize( daqsharedmemname, "-" ); 1363 1461 edcuCreateChanList( daqd_edcu1, daqFile, &daqFileCrc, internal_channels ); 1364 1462 std::cout << "The edc dcuid = " << daqd_edcu1.dcuid << "\n"; 1365 int datarate = daqd_edcu1.num_chans * 64 / 1000; 1463 1464 { 1465 std::vector< char > tmp_buffer( daqd_edcu1.num_chans * 1466 sizeof( double ) ); 1467 daqd_edcu1.data_rate = 1468 ( copyDaqData( tmp_buffer.data( ) ) / 1024 ) * 16; changed this line in version 2 of the diff
mentioned in commit 045543a5
Please register or sign in to reply