speaker-calibration 2.1.28 → 2.1.30

package/src/tasks/combination/combination.js

@@ -129,6 +129,9 @@ class Combination extends AudioCalibrator {
   /**@private */
   componentIR = null;
 
+  /**@private */
+  oldComponentIR = null;
+
   /**@private */
   systemIR = null;
 
@@ -144,7 +147,7 @@ class Combination extends AudioCalibrator {
     if (this.percent_complete > 100) {
       this.percent_complete = 100;
     }
-    const template = `<div style="display: flex; justify-content: center;"><div style="width: 200px; 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: center;"><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>`;
     return template;
   };
 
@@ -708,10 +711,49 @@ class Combination extends AudioCalibrator {
       let recs = this.getAllRecordedSignals();
       let unconv_rec = recs[0];
       let conv_rec = conv_recs[0];
-      let results = await this.pyServerAPI
+      if (this._calibrateSoundCheck != 'system'){
+        let knownGain = this.oldComponentIR.Gain;
+        let knownFreq = this.oldComponentIR.Freq;
+        let sampleRate = this.sourceSamplingRate || 96000;
+        let unconv_results = await this.pyServerAPI.getSubtractedPSDWithRetry(unconv_rec,knownGain,knownFreq,sampleRate).then(res => {
+          this.incrementStatusBar();
+          this.status =
+            `All Hz Calibration: done computing the PSD graphs...`.toString() +
+            this.generateTemplate().toString();
+          this.emit('update', {message: this.status});
+          return res;
+        })
+        .catch(err => {
+          console.error(err);
+        });
+
+        let conv_results = await this.pyServerAPI.getSubtractedPSDWithRetry(conv_rec,knownGain,knownFreq,sampleRate).then(res => {
+          this.incrementStatusBar();
+          this.status =
+            `All Hz Calibration: done computing the PSD graphs...`.toString() +
+            this.generateTemplate().toString();
+          this.emit('update', {message: this.status});
+          return res;
+        })
+        .catch(err => {
+          console.error(err);
+        });
+        iir_ir_and_plots = {
+          systemIIR: this.systemInvertedImpulseResponse,
+          componentIIR: this.componentInvertedImpulseResponse,
+          x_unconv: unconv_results['x'],
+          y_unconv: unconv_results['y'],
+          x_conv: conv_results['x'],
+          y_conv: conv_results['y'],
+          componentIR: this.componentIR,
+          systemIR: this.systemIR,
+        };
+      }else{
+        let results = await this.pyServerAPI
         .getPSDWithRetry({
           unconv_rec,
           conv_rec,
+          sampleRate: this.sourceSamplingRate || 96000
         })
         .then(res => {
           this.incrementStatusBar();
@@ -724,16 +766,18 @@ class Combination extends AudioCalibrator {
         .catch(err => {
           console.error(err);
         });
-      iir_ir_and_plots = {
-        systemIIR: this.systemInvertedImpulseResponse,
-        componentIIR: this.componentInvertedImpulseResponse,
-        x_unconv: results['x_unconv'],
-        y_unconv: results['y_unconv'],
-        x_conv: results['x_conv'],
-        y_conv: results['y_conv'],
-        componentIR: this.componentIR,
-        systemIR: this.systemIR,
-      };
+        iir_ir_and_plots = {
+          systemIIR: this.systemInvertedImpulseResponse,
+          componentIIR: this.componentInvertedImpulseResponse,
+          x_unconv: results['x_unconv'],
+          y_unconv: results['y_unconv'],
+          x_conv: results['x_conv'],
+          y_conv: results['y_conv'],
+          componentIR: this.componentIR,
+          systemIR: this.systemIR,
+        };
+      }
+
       if (this.#download) {
         this.downloadSingleUnfilteredRecording();
         this.downloadSingleFilteredRecording();
@@ -1054,8 +1098,8 @@ class Combination extends AudioCalibrator {
   };
 
   writeGainat1000Hz = async (speakerID, gain) => {
-    const data = {Gain1000: gain};
-    await set(ref(database, `Microphone/${speakerID}`), data);
+    const data = {Gain: gain};
+    await set(ref(database, `Microphone/${speakerID}/Gain1000`), gain);
   };
 
   convertToDB = gain => {
@@ -1091,7 +1135,7 @@ class Combination extends AudioCalibrator {
 
   writeIsSmartPhone = async (speakerID, isSmartPhone) => {
     const data = {isSmartPhone: isSmartPhone};
-    await set(ref(database, `Microphone/${speakerID}`), data);
+    await set(ref(database, `Microphone/${speakerID}/isSmartPhone`), isSmartPhone);
   };
 
   // Example of how to use the writeFrqGain and readFrqGain functions
@@ -1105,13 +1149,12 @@ class Combination extends AudioCalibrator {
     gainValues,
     lCalib = 104.92978421490648,
     componentIR = null,
-    microphoneName = 'MiniDSPUMIK_1',
-    _calibrateSoundCheck = 'system',
+    microphoneName = 'MiniDSP-UMIK1-711-4754-vertical',
+    _calibrateSoundCheck = 'goal', //GOAL PASSed in by default
     isSmartPhone = false
   ) => {
     //feed calibration goal here
     this._calibrateSoundCheck = _calibrateSoundCheck;
-
     //check if a componentIR was given to the system, if it isn't check for the microphone. using dummy data here bc we need to
     //check the db based on the microphone currently connected
 
@@ -1141,6 +1184,8 @@ class Combination extends AudioCalibrator {
       await this.writeIsSmartPhone(microphoneName, isSmartPhone);
     }
 
+    this.oldComponentIR = this.componentIR;
+
     //TODO:
     //if *1000 is in, lcalib is that value and componentGainDBSPL is that value converted to dB
     //this value (lcalib) is 1000 hz offset so it must be added to every gain