merge from 4.2.0

This commit is contained in:
2020-04-07 15:14:27 +02:00
parent ab9fed45fb
commit 9f3ad4e2f4
11 changed files with 119 additions and 125 deletions

View File

@ -1393,17 +1393,12 @@ void Module::setDynamicRange(int n) {
// changes in dr
if (n != prev_val) {
// update speed for usability
switch (n) {
case 32:
if (n == 32) {
LOG(logINFO) << "Setting Clock to Quarter Speed to cope with Dynamic Range of 32";
setClockDivider(RUN_CLOCK, 2);
break;
case 16:
LOG(logINFO) << "Setting Clock to Full Speed to cope with Dynamic Range of " << n;
} else if (prev_val == 32) {
LOG(logINFO) << "Setting Clock to Full Speed for Dynamic Range of " << n;
setClockDivider(RUN_CLOCK, 0);
break;
default:
break;
}
updateRateCorrection();
}