setFrequencies and setBaud (#105)

* setFrequencies and setBaud * built * example buttons * fix for window var * fix * fix * fix again * final fix!
publiclab · May 5, 2019 · 8ef7977 · 8ef7977
1 parent 3498536
commit 8ef7977
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 9 deletions.
diff --git a/dist/webjack.js b/dist/webjack.js
@@ -658,8 +658,13 @@ WebJack.Connection = Class.extend({
     }
 
     var args = ifUndef(args, WebJack.Profiles.SoftModem);
-    var AudioContext = window.AudioContext || window.webkitAudioContext;
-    var audioCtx = ifUndef(args.audioCtx, new AudioContext());
+
+    if (typeof args.audioCtx === 'undefined') {
+      AudioContext = ifUndef(AudioContext, webkitAudioContext);
+      var audioCtx = new AudioContext();
+    } else {
+      var audioCtx = args.audioCtx;
+    }
 
     var opts = connection.options = {
       sampleRate       : audioCtx.sampleRate,
@@ -778,7 +783,7 @@ WebJack.Connection = Class.extend({
 
     // Returns valid JSON object if possible, 
     // or <false> if not.
-    connection.validateJSON = function(data) {
+    connection.validateJSON = function validateJSON(data) {
       var object; 
       try {
         object = JSON.parse(data);
@@ -789,12 +794,23 @@ WebJack.Connection = Class.extend({
     }
 
     // Set the connection profile
-    connection.setProfile = function(profile) {
+    connection.setProfile = function setProfile(profile) {
       encoder.setProfile(profile);
       if (typeof decoder === 'object')
         decoder.setProfile(profile);
     }
 
+    connection.setBaud = function setBaud(baud) {
+      connection.options.baud = baud;
+      connection.setProfile(connection.options);
+    }
+
+    connection.setFrequencies = function setFrequencies(high, low) {
+      connection.options.freqHigh = high;
+      connection.options.freqLow = low;
+      connection.setProfile(connection.options);
+    }
+
   } 
 
 });
diff --git a/dist/webjack.min.js b/dist/webjack.min.js
diff --git a/examples/index.html b/examples/index.html
@@ -52,6 +52,11 @@ <h1>WebJack Demo</h1>
     </ul>
   </p>
 
+  <p>
+    <button class="btn-baud">Change baud</button>
+    <button class="btn-freq">Change frequencies</button>
+  </p>
+
   <script>
 
     var connection;
@@ -156,6 +161,15 @@ <h1>WebJack Demo</h1>
       connection.setProfile(profile);
     }
 
+    $('.btn-freq').click(function() {
+      var freqs = prompt('Enter low and high frequencies separated by a comma, like "1200,2400"').split(',');
+      if (freqs) connection.setBaud(freqs[0], freqs[1]);
+    });
+    $('.btn-baud').click(function() {
+      var baud = prompt('Enter a baud (speed) like 1225');
+      if (baud) connection.setBaud(baud);
+    });
+
   </script>
   <script src="fft/sketch.js"></script>
 

diff --git a/src/webjack.js b/src/webjack.js
@@ -12,8 +12,13 @@ WebJack.Connection = Class.extend({
     }
 
     var args = ifUndef(args, WebJack.Profiles.SoftModem);
-    var AudioContext = window.AudioContext || window.webkitAudioContext;
-    var audioCtx = ifUndef(args.audioCtx, new AudioContext());
+
+    if (typeof args.audioCtx === 'undefined') {
+      AudioContext = ifUndef(AudioContext, webkitAudioContext);
+      var audioCtx = new AudioContext();
+    } else {
+      var audioCtx = args.audioCtx;
+    }
 
     var opts = connection.options = {
       sampleRate       : audioCtx.sampleRate,
@@ -132,7 +137,7 @@ WebJack.Connection = Class.extend({
 
     // Returns valid JSON object if possible, 
     // or <false> if not.
-    connection.validateJSON = function(data) {
+    connection.validateJSON = function validateJSON(data) {
       var object; 
       try {
         object = JSON.parse(data);
@@ -143,12 +148,23 @@ WebJack.Connection = Class.extend({
     }
 
     // Set the connection profile
-    connection.setProfile = function(profile) {
+    connection.setProfile = function setProfile(profile) {
       encoder.setProfile(profile);
       if (typeof decoder === 'object')
         decoder.setProfile(profile);
     }
 
+    connection.setBaud = function setBaud(baud) {
+      connection.options.baud = baud;
+      connection.setProfile(connection.options);
+    }
+
+    connection.setFrequencies = function setFrequencies(high, low) {
+      connection.options.freqHigh = high;
+      connection.options.freqLow = low;
+      connection.setProfile(connection.options);
+    }
+
   } 
 
 });