Changeset 548a60f in orbit for android

Timestamp:

08/23/13 19:18:59 (6 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

37edfa3

Parents:

8a0f920f

Message:

iOS Tutorial:

• Added smooth transition between pages
• Added Table of Contents

File:

• android/src/info/puzzlebox/orbit/AudioService.java (modified) (6 diffs)

android/src/info/puzzlebox/orbit/AudioService.java

@@ -17 +17 @@
          */
         AudioTrack track;
-        public int sampleRate = 44100;
+//      public int sampleRate = 44100;
+        public int sampleRate = 48000;
 
         short[] audioData = new short[6144];
@@ -112 +113 @@
         /**
          * Half periods in the audio code, in seconds.
-         */
+         * 
+         * Four periods exist in the wave
+         */
+//      private final double longHIGH = 0.000829649;
+//      private final double longLOW = 0.000797027;
+//      private final double shortHIGH = 0.000412649;
+//      private final double shortLOW = 0.000378351;
+        
         private final double longHIGH = 0.000829649;
         private final double longLOW = 0.000797027;
@@ -118 +126 @@
         private final double shortLOW = 0.000378351;
 
+        
         /**
          * Pre-calculated and stored half sine waves.
@@ -127 +136 @@
 
         /**
-         * Pre-assembled audio code bit array in wave form. 
+         * Pre-assembled audio code bit array in wave form.
+         * 
+         * waveBit is an array of two wave, each an array of numbers
+         * waveBit[0] is the first wave, waveBit[1] is the second wave
          */
         private final float[] waveBit[]= {concatFloat(waveShortHIGH,waveShortLOW),concatFloat(waveLongHIGH,waveLongLOW)};
@@ -208 +220 @@
 
                 float[] wave = halfSineGen('d',longLOW);
+                
+                // longHIGH-sampleTime*2 - float number used to tune the period of the wave
+                
                 float[] tempWave = concatFloat(halfSineGen('u',longHIGH-sampleTime*2),halfSineGen('d',shortLOW+sampleTime*2));
                 wave = concatFloat(wave,tempWave);
                 wave = concatFloat(wave,tempWave);
 
-
+                
+                // Takes out each bit 
                 for (int i=27; i>=0; i--) 
                         wave=concatFloat(wave,waveBit[((code >>> i) & 1)]);
@@ -344 +360 @@
         /**
          * Generate half sine signal.
+         * This is the smallest component of the wave.
          * @param dir: 'u' or 'd', means it's the upper half or lower half or sine wave. 
          * @param halfPeriod: half of the period of sine wave, in seconds