speaker-calibration 2.2.199 → 2.2.201

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speaker-calibration",
-  "version": "2.2.199",
+  "version": "2.2.201",
   "description": "Speaker calibration library for auditory testing",
   "main": "dist/main.js",
   "directories": {

package/src/peer-connection/speaker.js

@@ -205,7 +205,8 @@ class Speaker extends AudioPeer {
             params.calibrateSound1000HzMaxSD_dB,
             params._calibrateSoundBurstMaxSD_dB,
             params.calibrateSoundSamplingDesiredBits,
-            params.language
+            params.language,
+            params.loudspeakerModelName,
           );
           speaker.#removeUIElems();
           resolve(speaker.result);
@@ -709,7 +710,10 @@ class Speaker extends AudioPeer {
         params.calibrateSoundBurstNormalizeBy1000HzGainBool,
         params.calibrateSoundBurstScalarDB,
         params.calibrateSound1000HzMaxSD_dB,
-        params._calibrateSoundBurstMaxSD_dB
+        params._calibrateSoundBurstMaxSD_dB,
+        params.calibrateSoundSamplingDesiredBits,
+        params.language,
+        params.loudspeakerModelName,
       );
       this.#removeUIElems();
       resolve(result);

package/src/tasks/combination/combination.js

@@ -315,9 +315,9 @@ class Combination extends AudioCalibrator {
     const samplingParamText =  phrases.RC_SamplingHzBits[this.language].replace('111', this.sourceSamplingRate).replace('222',this.sinkSamplingRate).replace('333', this.calibrateSoundSamplingDesiredBits);
     const reportParameters = `<br> ${samplingParamText}`;
     if (this.flags) {
-      flags = `<br> autoGainControl: ${this.flags.autoGainControl} 
-      <br>echoCancellation: ${this.flags.echoCancellation}
-      <br>noiseSuppression: ${this.flags.noiseSuppression}`;
+      flags = `<br> autoGainControl: ${this.flags.autoGainControl}; 
+      echoCancellation: ${this.flags.echoCancellation};
+      noiseSuppression: ${this.flags.noiseSuppression}`;
     }
     if (this.SDofFilteredRange['mls']) {
       MLSsd = `<br> Recorded MLS power SD: ${this.SDofFilteredRange['mls']} dB`;
@@ -328,15 +328,15 @@ class Combination extends AudioCalibrator {
     if (this.SDofFilteredRange['component']) {
       componentSD = `<br> ${this.transducerType} correction SD: ${this.SDofFilteredRange['component']} dB`;
     }
-    const template = `<div style="display: flex; justify-content: flex-start; margin-top:0.8rem;"><div style="width: 800px; height: 20px; border: 2px solid #000; border-radius: 10px;"><div style="width: ${this.percent_complete}%; height: 100%; background-color: #00aaff; border-radius: 8px;"></div></div></div>`;
+    const template = `<div style="display: flex; justify-content: flex-start; margin-top: 0.4rem;"><div style="width: 100%; height: 20px; border: 2px solid #000; border-radius: 10px;"><div style="width: ${this.percent_complete}%; height: 100%; background-color: #00aaff; border-radius: 8px;"></div></div></div>`;
     return `
         ${reportWebAudioNames}
-        ${reportParameters}
-        <br>${status}
+        ${reportParameters} 
         ${MLSsd}
         ${systemSD}
         ${componentSD}
         ${flags}
+        <br>${status}
         ${template }`;
   };
 
@@ -612,7 +612,7 @@ class Combination extends AudioCalibrator {
             } else {
               console.log('SD: ' + result['sd'] + ', greater than _calibrateSoundBurstMaxSD_dB: ' + this._calibrateSoundBurstMaxSD_dB);
               this.recordingChecks['warnings'].push(`Redo all Hz recording because SD ${result['sd']} dB> ${this._calibrateSoundBurstMaxSD_dB} dB`);
-              this.status = this.generateTemplate(`Redoing all Hz recording because SD ${result['sd']} dB> ${this._calibrateSoundBurstMaxSD_dB} dB`.toString()).toString();
+              this.status = this.generateTemplate(`All Hz: Re-recording at ${this.inDB} dB because SD ${result['sd']} > ${this._calibrateSoundBurstMaxSD_dB} dB`.toString()).toString();
               this.emit('update', {
                 message: this.status,
               });
@@ -2194,8 +2194,8 @@ class Combination extends AudioCalibrator {
   #playCalibrationAudioVolume = async () => {
     if (this.numCalibratingRoundsCompleted==1) {
       this.recordingChecks['warnings'].push(`Redo 1000 Hz, ${this.inDB} dB, recording because SD ${(this.recordingChecks['volume'][this.inDB]['sd'])} dB> ${this.calibrateSound1000HzMaxSD_dB} dB`);
-      const currentStatus =  `Redoing 1000 Hz recording because SD 
-      ${this.recordingChecks['volume'][this.inDB]['sd']} dB> 
+      const currentStatus =  `1000 Hz: Re-recording at ${this.inDB} dB because SD 
+      ${this.recordingChecks['volume'][this.inDB]['sd']} > 
       ${this.calibrateSound1000HzMaxSD_dB} dB`.toString();
       this.status = this.generateTemplate(currentStatus).toString();
       this.emit('update', {
@@ -2220,9 +2220,12 @@ class Combination extends AudioCalibrator {
   #sendToServerForProcessing = async lCalib => {
     console.log('Sending data to server');
     const total_dur = this.calibrateSound1000HzPreSec + this.calibrateSound1000HzSec + this.calibrateSound1000HzPostSec;
-    this.addTimeStamp(`Record ${total_dur.toFixed(1)} s of 1000 Hz at ${this.inDB} dB. 
-    (${this.calibrateSound1000HzPreSec.toFixed(1)} s pre + ${this.calibrateSound1000HzSec.toFixed(1)}
-       s used + ${this.calibrateSound1000HzPostSec.toFixed(1)} s post) ”`);
+    this.addTimeStamp("Record " + total_dur.toFixed(1) + " s of 1000 Hz at " + this.inDB + 
+      " dB. (" + this.calibrateSound1000HzPreSec.toFixed(1) + 
+      " s pre + " + this.calibrateSound1000HzSec.toFixed(1) + 
+      " s used + " + this.calibrateSound1000HzPostSec.toFixed(1) + 
+      " s post)"
+    );
     let left = this.calibrateSound1000HzPreSec;
     let right = this.calibrateSound1000HzPreSec + this.calibrateSound1000HzSec;
     if (this.isCalibrating) return null;
@@ -2607,7 +2610,7 @@ class Combination extends AudioCalibrator {
           if (result['sd'] > this._calibrateSoundBurstMaxSD_dB && this.numSuccessfulCaptured == 0) {
             console.log('filtered recording sd too high');
             this.recordingChecks['warnings'].push(`Redo all Hz recording because SD ${result['sd']} dB> ${this._calibrateSoundBurstMaxSD_dB} dB`);
-            this.status = this.generateTemplate(`Redoing all Hz recording because SD ${result['sd']} dB> ${this._calibrateSoundBurstMaxSD_dB} dB`.toString()).toString();
+            this.status = this.generateTemplate(`All Hz: Re-recording  at ${this.inDB} dB because SD ${result['sd']} > ${this._calibrateSoundBurstMaxSD_dB} dB`.toString()).toString();
             this.emit('update', {
               message: this.status,
             });
@@ -2705,8 +2708,11 @@ class Combination extends AudioCalibrator {
     _calibrateSoundBurstMaxSD_dB = 4,
     calibrateSoundSamplingDesiredBits = 24,
     language,
+    loudspeakerModelName='',
 
   ) => {
+    this.micModelName = micModelName,
+    this.loudspeakerModelName = loudspeakerModelName;
     this.language = language;
     this.TAPER_SECS = _calibrateSoundTaperSec;
     this.calibrateSoundLimit = calibrateSoundLimit;
@@ -2738,9 +2744,9 @@ class Combination extends AudioCalibrator {
     this.webAudioDeviceNames = webAudioDeviceNames;
     this.calibrateSoundSamplingDesiredBits = calibrateSoundSamplingDesiredBits;
     if (isSmartPhone) this.webAudioDeviceNames.microphone = this.deviceInfo.microphoneFromAPI;
-    this.webAudioDeviceNames.microphoneText = this.webAudioDeviceNames.microphoneText
-      .replace('xxx', this.webAudioDeviceNames.microphone)
-      .replace('XXX', this.webAudioDeviceNames.microphone);
+    // this.webAudioDeviceNames.microphoneText = this.webAudioDeviceNames.microphoneText
+    //   .replace('xxx', this.webAudioDeviceNames.microphone)
+    //   .replace('XXX', this.webAudioDeviceNames.microphone);
     //feed calibration goal here
     this._calibrateSoundCheck = _calibrateSoundCheck;
     this.calibrateSound1000HzMaxSD_dB = calibrateSound1000HzMaxSD_dB;