speaker-calibration 2.1.0 → 2.1.2

package/package.json

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

package/src/server/PythonServerAPI.js

@@ -112,6 +112,44 @@ class PythonServerAPI {
 
     return res.data[task];
   };
+
+  getVolumeCalibrationParameters = async ({inDBValues, outDBSPLValues}) => {
+    const task = 'volume-parameters';
+    let res = null;
+
+    const data = JSON.stringify({
+      task,
+      inDBValues,
+      outDBSPLValues,
+    });
+
+    await axios({
+      method: 'post',
+      baseURL: PythonServerAPI.PYTHON_SERVER_URL, //server
+      url: `/task/${task}`,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      data,
+    })
+      .then(response => {
+        res = response;
+      })
+      .catch(error => {
+        throw error;
+      });
+
+    // console.log(res.data[task]);
+    //below is an example of res.data[task]
+    //{
+    //  R: 16.56981076554259,
+    //  T: -47.79799120884434,
+    //  W: 61.0485247483732,
+    //  backgroundDBSPL: 43.88233142069752,
+    //  gainDBSPL: -128.24742161208985
+    //}
+    return res.data[task];
+  };
 }
 
 export default PythonServerAPI;

package/src/tasks/volume/volume.js

@@ -1,5 +1,5 @@
 import AudioCalibrator from '../audioCalibrator';
-
+import axios from 'axios';
 import {sleep} from '../../utils';
 
 /**
@@ -26,6 +26,7 @@ class Volume extends AudioCalibrator {
 
   /** @private */
   soundGainDBSPL = null;
+  outDBSPL = null;
 
   handleIncomingData = data => {
     console.log('Received data: ', data);
@@ -121,8 +122,9 @@ class Volume extends AudioCalibrator {
         payload: this.#getTruncatedSignal(),
       })
       .then(res => {
-        if (this.soundGainDBSPL === null) {
-          this.soundGainDBSPL = res;
+        if (this.outDBSPL === null) {
+          this.outDBSPL = res['outDbSPL'];
+          this.soundGainDBSPL = res['soundGainDbSPL'];
         }
       })
       .catch(err => {
@@ -133,10 +135,17 @@ class Volume extends AudioCalibrator {
   startCalibration = async (stream, gainValues) => {
     const trialIterations = gainValues.length;
     const soundGainDBSPLValues = [];
+    const inDBValues = [];
+    let inDB = 0;
+    const outDBSPLValues = [];
+
     // run the calibration at different gain values provided by the user
     for (let i = 0; i < trialIterations; i++) {
+      //convert gain to DB and add to inDB
+      inDB = Math.log10(gainValues[i]) * 20;
+      inDBValues.push(inDB);
+
       do {
-        // console.log('Processing gain value: ', gainValues[i]);
         // eslint-disable-next-line no-await-in-loop
         await this.volumeCalibrationSteps(
           stream,
@@ -145,12 +154,30 @@ class Volume extends AudioCalibrator {
           this.#sendToServerForProcessing,
           gainValues[i]
         );
-      } while (this.soundGainDBSPL === null);
+      } while (this.outDBSPL === null);
+      outDBSPLValues.push(this.outDBSPL);
       soundGainDBSPLValues.push(this.soundGainDBSPL);
+      this.outDBSPL = null;
       this.soundGainDBSPL = null;
     }
-    // return this.soundGainDBSPL;
-    return soundGainDBSPLValues;
+
+    // get the volume calibration parameters from the server
+    const parameters = await this.pyServerAPI
+      .getVolumeCalibrationParameters({inDBValues: inDBValues, outDBSPLValues: outDBSPLValues})
+      .then(res => {
+        // console.log(res);
+        return res;
+      });
+    // console.log('Parameters: ', parameters);
+    // return soundGainDBSPLValues;
+    const result = {
+      parameters: parameters,
+      inDBValues: inDBValues,
+      outDBSPLValues: outDBSPLValues,
+      soundGainDBSPLValues: soundGainDBSPLValues,
+    };
+    // console.log('Result: ', result);
+    return result;
   };
 }