Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
toolbox
Commits
0475f522
Commit
0475f522
authored
Nov 21, 2017
by
Markus Mueller-Trapet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduce number of digits in display
bugfix for waitbar when loop is exited prematurely
parent
c53070e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
applications/Measurement/LoudspeakerTools/ita_loudspeakertools_maxSPL.m
...easurement/LoudspeakerTools/ita_loudspeakertools_maxSPL.m
+7
-4
No files found.
applications/Measurement/LoudspeakerTools/ita_loudspeakertools_maxSPL.m
View file @
0475f522
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment