Die Migration der Bereiche "Docker Registry" und "Artifiacts" ist fast abgeschlossen. Die letzten Daten werden im Laufe des heutigen Abend (05.08.2021) noch vollständig hochgeladen. Das Anlegen neuer Images und Artifacts funktioniert bereits wieder.

Commit 0475f522 authored by Markus Mueller-Trapet's avatar Markus Mueller-Trapet
Browse files

reduce number of digits in display

bugfix for waitbar when loop is exited prematurely
parent c53070e2
......@@ -158,19 +158,19 @@ for freqIdx = 1:numel(excitationFreq)
% the next frequency
voltageFirstDistortionLimit = outputVoltage;
end
ita_verbose_info([num2str(sArgs.distortionLimit(distIdx)*100) '% ' sArgs.signalReference ' reached, exact value: ' num2str(signalReferenceValue*100) '%'],0);
ita_verbose_info([num2str(sArgs.distortionLimit(distIdx)*100) '% ' sArgs.signalReference ' reached, exact value: ' num2str(signalReferenceValue*100,'%0.2f') '%'],0);
outputVoltage = outputVoltage * gain;
break;
elseif aboveTol
% went above limit -> decrement and show info
ita_verbose_info([num2str(sArgs.distortionLimit(distIdx)*100) '% ' sArgs.signalReference ' too high, exact value: ' num2str(signalReferenceValue*100) '%'],0);
ita_verbose_info([num2str(sArgs.distortionLimit(distIdx)*100) '% ' sArgs.signalReference ' too high, exact value: ' num2str(signalReferenceValue*100,'%0.2f') '%'],0);
% factor to avoid getting stuck
outputVoltage = outputVoltage / (0.8*gain);
elseif belowTol
% keep increasing
outputVoltage = outputVoltage * gain;
ita_verbose_info([num2str(sArgs.distortionLimit(distIdx)*100) '% ' sArgs.signalReference ' not reached, exact value: ' num2str(signalReferenceValue*100) '%'],0);
ita_verbose_info([num2str(sArgs.distortionLimit(distIdx)*100) '% ' sArgs.signalReference ' not reached, exact value: ' num2str(signalReferenceValue*100,'%0.2f') '%'],0);
end
......@@ -179,7 +179,7 @@ for freqIdx = 1:numel(excitationFreq)
outputVoltage = outputVoltageRange(2);
lastMeasurement = true;
else
ita_verbose_info(['maximum output voltage reached: ' num2str(min(outputVoltage,outputVoltageRange(2)))],0); % show some info
ita_verbose_info(['maximum output voltage reached: ' num2str(min(outputVoltage,outputVoltageRange(2)),'%0.2f')],0); % show some info
% write remaining distortion limit values in case we
% reached the maximum voltage at a lower distortion
......@@ -210,6 +210,9 @@ for freqIdx = 1:numel(excitationFreq)
end
if breakFlag
breakFlag = false;
for iter = distIdx+1:numel(sArgs.distortionLimit)
wb.inc();
end
break;
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment