Merge branch 'developer' into g2rxr

This commit is contained in:
2022-06-09 13:48:54 +02:00
3 changed files with 5 additions and 1 deletions

View File

@ -83,6 +83,7 @@ This document describes the differences between v7.0.0 and v6.x.x
- rxr mem size changed (fifo header size from 8 to 16) due to sls rxr header = 112.. 112+ 16=128 (reduces packet losss especially for g2)
-udp_srcip and udp_Srcip2: can set to auto (for virtual or 1g data networks)
- set dataset name for all hdf5 files to "data" only
- number of storage cells is not updated in teh receiver. done. and also allowing it to be modified in running status
2. Resolved Issues
==================

View File

@ -1777,6 +1777,9 @@ int Module::getNumberOfAdditionalStorageCells() const {
void Module::setNumberOfAdditionalStorageCells(int value) {
sendToDetector(F_SET_NUM_ADDITIONAL_STORAGE_CELLS, value, nullptr);
if (shm()->useReceiverFlag) {
sendToReceiver(F_SET_RECEIVER_NUM_ADD_STORAGE_CELLS, value, nullptr);
}
}
int Module::getStorageCellStart() const {

View File

@ -583,7 +583,7 @@ int ClientInterface::set_num_add_storage_cells(Interface &socket) {
throw RuntimeError("Invalid number of additional storage cells " +
std::to_string(value));
}
verifyIdle(socket);
// allowing this to be done even when receiver not idle
LOG(logDEBUG1) << "Setting num additional storage cells to " << value;
impl()->setNumberOfAdditionalStorageCells(value);
return socket.Send(OK);