speaker-calibration 2.2.180 → 2.2.182

package/package.json

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

package/src/peer-connection/speaker.js

@@ -191,6 +191,7 @@ class Speaker extends AudioPeer {
             params.calibrateSound1000HzPostSec,
             params.calibrateSoundBackgroundSecs,
             params.calibrateSoundSmoothOctaves,
+            params.calibrateSoundSmoothMinBandwidthHz,
             params.calibrateSoundPowerBinDesiredSec,
             params.calibrateSoundPowerDbSDToleratedDb,
             params.calibrateSoundTaperSec,
@@ -388,7 +389,7 @@ await fetch(url, options)
         const proceedButton = document.createElement('button');
         proceedButton.setAttribute('id', 'calibrationProceedButton');
         proceedButton.setAttribute('class', 'btn btn-success');
-        proceedButton.innerHTML = 'Proceed';
+        proceedButton.innerHTML = phrases.T_PROCEED[this.language];
         proceedButton.onclick = () => {
           // open the link in a new tab
           window.open(this.uri, '_blank');
@@ -692,6 +693,7 @@ await fetch(url, options)
         params.calibrateSound1000HzPostSec,
         params.calibrateSoundBackgroundSecs,
         params.calibrateSoundSmoothOctaves,
+        params.calibrateSoundSmoothMinBandwidthHz,
         params.calibrateSoundPowerBinDesiredSec,
         params.calibrateSoundPowerDbSDToleratedDb,
         params.calibrateSoundTaperSec,

package/src/server/PythonServerAPI.js

@@ -426,6 +426,7 @@ class PythonServerAPI {
     mlsAmplitude,
     irLength,
     calibrateSoundSmoothOctaves,
+    calibrateSoundSmoothMinBandwidthHz,
     calibrateSoundBurstFilteredExtraDb,
     calibrateSoundIIRPhase
   }) => {
@@ -447,6 +448,7 @@ class PythonServerAPI {
       mlsAmplitude,
       irLength,
       calibrateSoundSmoothOctaves,
+      calibrateSoundSmoothMinBandwidthHz,
       calibrateSoundBurstFilteredExtraDb,
       calibrateSoundIIRPhase
     });
@@ -583,6 +585,7 @@ class PythonServerAPI {
     mlsAmplitude,
     irLength,
     calibrateSoundSmoothOctaves,
+    calibrateSoundSmoothMinBandwidthHz,
     calibrateSoundBurstFilteredExtraDb,
     calibrateSoundIIRPhase
   }) => {
@@ -603,6 +606,7 @@ class PythonServerAPI {
           mlsAmplitude,
           irLength,
           calibrateSoundSmoothOctaves,
+          calibrateSoundSmoothMinBandwidthHz,
           calibrateSoundBurstFilteredExtraDb,
           calibrateSoundIIRPhase
         });

package/src/tasks/combination/combination.js

@@ -461,6 +461,7 @@ class Combination extends AudioCalibrator {
         mlsAmplitude: Math.pow(10, this.power_dB / 20),
         irLength,
         calibrateSoundSmoothOctaves: this._calibrateSoundSmoothOctaves,
+        calibrateSoundSmoothMinBandwidthHz: this._calibrateSoundSmoothMinBandwidthHz,
         calibrateSoundBurstFilteredExtraDb: this._calibrateSoundBurstFilteredExtraDb,
         calibrateSoundIIRPhase: this.calibrateSoundIIRPhase
       })
@@ -2452,7 +2453,11 @@ class Combination extends AudioCalibrator {
     const querySnapshot = await getDocs(q);
     // if exists return the linear field of the first document
     if (querySnapshot.size > 0) {
-      return querySnapshot.docs[0].data().linear;
+      return {
+        ir: querySnapshot.docs[0].data().linear,
+        createDate: querySnapshot.docs[0].data().createDate,
+        jsonFileName: querySnapshot.docs[0].data().jsonFileName
+      };
     }
     return null;
   };
@@ -2676,6 +2681,7 @@ class Combination extends AudioCalibrator {
     calibrateSound1000HzPostSec = 0.5,
     _calibrateSoundBackgroundSecs = 0,
     _calibrateSoundSmoothOctaves = 0.33,
+    _calibrateSoundSmoothMinBandwidthHz = 200,
     _calibrateSoundPowerBinDesiredSec = 0.2,
     _calibrateSoundPowerDbSDToleratedDb = 1,
     _calibrateSoundTaperSec = 0.01,
@@ -2693,7 +2699,7 @@ class Combination extends AudioCalibrator {
     userIDs,
     restartButton,
     reminder,
-    calibrateSoundLimit,
+    calibrateSoundLimit
   ) => {
     this.TAPER_SECS = _calibrateSoundTaperSec;
     this.calibrateSoundLimit = calibrateSoundLimit;
@@ -2715,6 +2721,7 @@ class Combination extends AudioCalibrator {
     this.desired_sampling_rate = _calibrateSoundHz;
     this._calibrateSoundBackgroundSecs = _calibrateSoundBackgroundSecs;
     this._calibrateSoundSmoothOctaves = _calibrateSoundSmoothOctaves;
+    this._calibrateSoundSmoothMinBandwidthHz = _calibrateSoundSmoothMinBandwidthHz;
     this._calibrateSoundPowerBinDesiredSec = _calibrateSoundPowerBinDesiredSec;
     this._calibrateSoundBurstUses1000HzGainBool = _calibrateSoundBurstUses1000HzGainBool;
     this._calibrateSoundPowerDbSDToleratedDb = _calibrateSoundPowerDbSDToleratedDb;
@@ -2736,8 +2743,8 @@ class Combination extends AudioCalibrator {
         ? 'minidsp'
         : this.deviceInfo.OEM.toLowerCase().split(' ').join('')
       : micManufacturer.toLowerCase().split(' ').join('');
-    // const ID = "712-5669";
-    // const OEM = "minidsp";
+    // const ID = "A2484";
+    // const OEM = "apple";
     const micInfo = {
       micModelName: isSmartPhone ? micModelName : microphoneName,
       OEM: isSmartPhone
@@ -2780,9 +2787,14 @@ class Combination extends AudioCalibrator {
     if (componentIR == null) {
       //mode 'ir'
       //global variable this.componentIR must be set
-      this.componentIR = await this.readFrqGainFromFirestore(ID, OEM, true).then(data => {
-        return data;
+      await this.readFrqGainFromFirestore(ID, OEM, true).then(data => {
+        if (data !== null) {
+          this.componentIR = data.ir;
+          micInfo['parentTimestamp'] = data.createDate ? data.createDate : new Date();
+          micInfo['parentFilenameJSON'] = data.jsonFileName ? data.jsonFileName : '';
+        }
       });
+      
       // await this.readFrqGain(ID, OEM).then(data => {
       //   return data;
       // });