Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dbHL Tone Audiometry requires valid values for "Sensitivity per frequency" and _retspl to work #1337

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

dbHL Tone Audiometry requires valid values for "Sensitivity per frequency" and _retspl to work #1337

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beb1a91
values for `_sensitivityPerFrequency`
rogelj Feb 11, 2020
90d5e3f
values for `_retspl`
rogelj Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions ResearchKit/ActiveTasks/ORKdBHLToneAudiometryAudioGenerator.m
View file
Open in desktop
Expand Up @@ -172,9 +172,19 @@ - (instancetype)initForHeadphones: (NSString *)headphones {
if (self) {
_lastNodeInput = 0;

_sensitivityPerFrequency = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:[NSString stringWithFormat:@"frequency_dBSPL_%@", [headphones uppercaseString]] ofType:@"plist"]];
// _sensitivityPerFrequency = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:[NSString stringWithFormat:@"frequency_dBSPL_%@", [headphones uppercaseString]] ofType:@"plist"]];
if ([[headphones uppercaseString] isEqualToString:@"AIRPODS"]) {
_sensitivityPerFrequency = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"frequency_dBSPL_AIRPODS" ofType:@"plist"]];
} else {
_sensitivityPerFrequency = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"frequency_dBSPL_EARPODS" ofType:@"plist"]];
}

_retspl = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:[NSString stringWithFormat:@"retspl_%@", [headphones uppercaseString]] ofType:@"plist"]];
// _retspl = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:[NSString stringWithFormat:@"retspl_%@", [headphones uppercaseString]] ofType:@"plist"]];
if ([[headphones uppercaseString] isEqualToString:@"AIRPODS"]) {
_retspl = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"retspl_AIRPODS" ofType:@"plist"]];
} else {
_retspl = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"retspl_EARPODS" ofType:@"plist"]];
}

if ([[headphones uppercaseString] isEqualToString:@"AIRPODS"]) {
_volumeCurve = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:[self class]] pathForResource:@"volume_curve_AIRPODS" ofType:@"plist"]];
Expand Down