diff --git a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java index 10a15525c..0385e98b8 100644 --- a/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java +++ b/app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java @@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable; import android.location.Location; import android.location.LocationManager; +import android.media.AudioDeviceInfo; import android.media.AudioFormat; import android.media.AudioManager; import android.media.AudioTrack; @@ -140,6 +141,8 @@ public class WaveGeneratorActivity extends AppCompatActivity { Button btnAnalogMode; @BindView(R.id.digital_mode_btn) Button btnDigitalMode; + @BindView(R.id.use_phone_btn) + Button btnUsePhone; @BindView(R.id.pwm_btn_freq) Button pwmBtnFreq; @BindView(R.id.pwm_btn_duty) @@ -187,7 +190,9 @@ public class WaveGeneratorActivity extends AppCompatActivity { private RelativeLayout squareModeControls; private LineChart previewChart; private boolean isPlayingSound = false; + private boolean usePhone = false; private ProduceSoundTask produceSoundTask; + private GenerateWavesFromPhoneTask generateWavesFromPhoneTask; @SuppressLint("ClickableViewAccessibility") @Override @@ -334,6 +339,21 @@ public void onClick(View v) { } }); + btnUsePhone.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + usePhone = !usePhone; + if(usePhone) { + btnUsePhone.setText(R.string.text_use_pslab); + generateWavesFromPhoneTask = new GenerateWavesFromPhoneTask(WaveGeneratorActivity.this); + generateWavesFromPhoneTask.execute(); + } else { + btnUsePhone.setText(R.string.text_use_phone); + generateWavesFromPhoneTask.cancel(true); + } + } + }); + btnPwmSq1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -1282,6 +1302,42 @@ public void recordSensorData(RealmObject sensorData) { realm.commitTransaction(); } + /** + * Samples a wave into an AudioTrack instance. Useful for either playing sound or pushing the signal + * through the headphone jack. + * + */ + public void sampleWaveIntoAudioTrack(AudioTrack track, int sampleRateInHz, int bufferLength) { + assert(track != null); + + short[] buffer = new short[bufferLength]; + float angle = 0; + float samples[] = new float[bufferLength]; + double frequency; + + while(true) { + if (WaveGeneratorCommon.mode_selected == WaveConst.SQUARE) { + frequency = WaveGeneratorCommon.wave.get(waveBtnActive).get(WaveConst.FREQUENCY); + } else { + frequency = WaveGeneratorCommon.wave.get(WaveConst.SQR1).get(WaveConst.FREQUENCY); + } + float increment = (float) ((2 * Math.PI) * frequency / sampleRateInHz); + for (int i = 0; i < samples.length; i++) { + samples[i] = (float) Math.sin(angle); + if (WaveGeneratorCommon.mode_selected == WaveConst.PWM) { + samples[i] = (samples[i] >= 0.0) ? 1 : -1; + } else { + if (WaveGeneratorCommon.wave.get(waveBtnActive).get(WaveConst.WAVETYPE) == 2) { + samples[i] = (float) ((2 / Math.PI) * Math.asin(samples[i])); + } + } + buffer[i] = (short) (samples[i] * Short.MAX_VALUE); + angle += increment; + } + track.write(buffer, 0, buffer.length); + } + } + public enum WaveConst {WAVETYPE, WAVE1, WAVE2, SQR1, SQR2, SQR3, SQR4, FREQUENCY, PHASE, DUTY, SQUARE, PWM} public enum WaveData { @@ -1300,47 +1356,94 @@ public final int getValue() { private class ProduceSoundTask extends AsyncTask { - private AudioTrack track; + final int sampleRateInHz = 44100; + final int bufferLength = 1024; + private AudioTrack track = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRateInHz, AudioFormat.CHANNEL_CONFIGURATION_MONO, AudioFormat.ENCODING_PCM_16BIT, bufferLength, AudioTrack.MODE_STREAM); + private Thread thread = new Thread(new Runnable() { + @Override + public void run() { + track.play(); + sampleWaveIntoAudioTrack(track, sampleRateInHz, bufferLength); + } + }); @Override protected Void doInBackground(Void... voids) { - short[] buffer = new short[1024]; - track = new AudioTrack(AudioManager.STREAM_MUSIC, 44100, AudioFormat.CHANNEL_CONFIGURATION_MONO, AudioFormat.ENCODING_PCM_16BIT, buffer.length, AudioTrack.MODE_STREAM); - float angle = 0; - float samples[] = new float[1024]; - - track.play(); - double frequency; - while (isPlayingSound) { - if (WaveGeneratorCommon.mode_selected == WaveConst.SQUARE) { - frequency = WaveGeneratorCommon.wave.get(waveBtnActive).get(WaveConst.FREQUENCY); - } else { - frequency = WaveGeneratorCommon.wave.get(WaveConst.SQR1).get(WaveConst.FREQUENCY); + thread.start(); + while(isPlayingSound) {} /* loop until button is unselected */ + thread.interrupt(); + return null; + } + + @Override + protected void onCancelled() { + super.onCancelled(); + thread.interrupt(); + track.flush(); + track.stop(); + track.release(); + } + } + + private class GenerateWavesFromPhoneTask extends AsyncTask { + + WaveGeneratorActivity activity = null; + final int sampleRateInHz = 44100; + final int bufferLength = 1024; + private AudioTrack track = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRateInHz, AudioFormat.CHANNEL_CONFIGURATION_MONO, AudioFormat.ENCODING_PCM_16BIT, bufferLength, AudioTrack.MODE_STREAM); + private Thread thread = new Thread(new Runnable() { + @Override + public void run() { + track.play(); + sampleWaveIntoAudioTrack(track, sampleRateInHz, bufferLength); + } + }); + + public GenerateWavesFromPhoneTask(WaveGeneratorActivity activity) { + this.activity = activity; + } + + @Override + protected Void doInBackground(Void... voids) { + boolean wired = false; + AudioManager audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE); + AudioDeviceInfo[] audioDevices = audioManager.getDevices(AudioManager.GET_DEVICES_ALL); + for(AudioDeviceInfo deviceInfo : audioDevices){ + if(deviceInfo.getType()==AudioDeviceInfo.TYPE_WIRED_HEADPHONES + || deviceInfo.getType()==AudioDeviceInfo.TYPE_WIRED_HEADSET){ + wired = true; + break; } - float increment = (float) ((2 * Math.PI) * frequency / 44100); - for (int i = 0; i < samples.length; i++) { - samples[i] = (float) Math.sin(angle); - if (WaveGeneratorCommon.mode_selected == WaveConst.PWM) { - samples[i] = (samples[i] >= 0.0) ? 1 : -1; - } else { - if (WaveGeneratorCommon.wave.get(waveBtnActive).get(WaveConst.WAVETYPE) == 2) { - samples[i] = (float) ((2 / Math.PI) * Math.asin(samples[i])); - } + } + if(!wired) { + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + Toast.makeText(getApplicationContext(), R.string.text_not_wired,Toast.LENGTH_SHORT).show(); } - buffer[i] = (short) (samples[i] * Short.MAX_VALUE); - angle += increment; - } - track.write(buffer, 0, buffer.length); + }); + return null; } + thread.start(); + while(usePhone) {} /* loop until button is unselected */ + thread.interrupt(); return null; } @Override protected void onCancelled() { super.onCancelled(); + thread.interrupt(); track.flush(); track.stop(); track.release(); } + + @Override + protected void onPostExecute(Void aVoid) { + super.onPostExecute(aVoid); + activity.usePhone = false; + activity.btnUsePhone.setText(R.string.text_use_phone); + } } } diff --git a/app/src/main/res/layout/wave_generator_main_controls.xml b/app/src/main/res/layout/wave_generator_main_controls.xml index 87d38bd04..76cc99afd 100644 --- a/app/src/main/res/layout/wave_generator_main_controls.xml +++ b/app/src/main/res/layout/wave_generator_main_controls.xml @@ -51,4 +51,21 @@ android:textAllCaps="false" android:textColor="@color/white" android:textSize="@dimen/wave_gen_control_text_size" /> + +