speaker-calibration 2.1.2 → 2.1.3

package/package.json

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

package/src/tasks/volume/volume.js

@@ -27,6 +27,12 @@ class Volume extends AudioCalibrator {
   /** @private */
   soundGainDBSPL = null;
   outDBSPL = null;
+  power = null;
+  power1000 = null;
+  RMS = null;
+  THD = null;
+  outDBSPL1000 = null;
+  soundGainDBSPL1000 = null;
 
   handleIncomingData = data => {
     console.log('Received data: ', data);
@@ -125,6 +131,12 @@ class Volume extends AudioCalibrator {
         if (this.outDBSPL === null) {
           this.outDBSPL = res['outDbSPL'];
           this.soundGainDBSPL = res['soundGainDbSPL'];
+          this.outDBSPL1000 = res['outDbSPL1000'];
+          this.power = res['power']
+          this.power1000 = res['power1000']
+          this.THD = res['thd']
+          this.RMS = res['rms']
+          this.soundGainDBSPL1000 = res['soundGainDbSPL1000'];
         }
       })
       .catch(err => {
@@ -135,9 +147,15 @@ class Volume extends AudioCalibrator {
   startCalibration = async (stream, gainValues) => {
     const trialIterations = gainValues.length;
     const soundGainDBSPLValues = [];
+    const soundGainDBSPL1000Values = [];
+    const power1000Values = [];
+    const powerValues = [];
+    const rmsValues = [];
+    const thdValues = [];
     const inDBValues = [];
     let inDB = 0;
     const outDBSPLValues = [];
+    const outDBSPL1000Values = [];
 
     // run the calibration at different gain values provided by the user
     for (let i = 0; i < trialIterations; i++) {
@@ -155,28 +173,44 @@ class Volume extends AudioCalibrator {
           gainValues[i]
         );
       } while (this.outDBSPL === null);
+      outDBSPL1000Values.push(this.outDBSPL1000);
+      power1000Values.push(this.power1000);
+      powerValues.push(this.power);
+      rmsValues.push(this.RMS);
+      thdValues.push(this.THD);
       outDBSPLValues.push(this.outDBSPL);
       soundGainDBSPLValues.push(this.soundGainDBSPL);
+      soundGainDBSPL1000Values.push(this.soundGainDBSPL1000);
+
       this.outDBSPL = null;
       this.soundGainDBSPL = null;
+      this.power1000 = null;
+      this.power = null;
+      this.outDBSPL1000 = null;
+      this.RMS = null;
+      this.THD = null;
+      this.soundGainDBSPL1000=null;
     }
 
     // get the volume calibration parameters from the server
     const parameters = await this.pyServerAPI
-      .getVolumeCalibrationParameters({inDBValues: inDBValues, outDBSPLValues: outDBSPLValues})
+      .getVolumeCalibrationParameters({inDBValues: inDBValues, outDBSPLValues: outDBSPL1000Values})
       .then(res => {
-        // console.log(res);
         return res;
       });
-    // console.log('Parameters: ', parameters);
-    // return soundGainDBSPLValues;
     const result = {
       parameters: parameters,
       inDBValues: inDBValues,
       outDBSPLValues: outDBSPLValues,
       soundGainDBSPLValues: soundGainDBSPLValues,
+      powerValues: powerValues,
+      power1000Values: power1000Values,
+      outDBSPL1000Values: outDBSPL1000Values,
+      rmsValues: rmsValues,
+      thdValues: thdValues,
+      soundGainDBSPL1000Values: soundGainDBSPL1000Values
     };
-    // console.log('Result: ', result);
+
     return result;
   };
 }