Android:

- Enable higher resolution mode for PWM - Change the value range of the seek bar for more resolution on hi-res screen
GlueMotor · Nov 20, 2016 · 06cb664 · 06cb664
1 parent 8938364
commit 06cb664
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/Android/app/src/main/java/com/gluemotor/android/GlueMotorCore.java b/Android/app/src/main/java/com/gluemotor/android/GlueMotorCore.java
@@ -16,8 +16,8 @@
 import android.util.Log;
 
 public class GlueMotorCore {
-    public boolean mLPwmPolarityNegative = false;
-    public boolean mRPwmPolarityNegative = false;
+    public volatile boolean mServo0PwmPolarityNegative = false;
+    public volatile boolean mServo1PwmPolarityNegative = false;
 
     private static final short sSupportedServoCount = 2;
     private static final short sMinValue = -32767;
@@ -75,37 +75,60 @@ public void run() {
 
                     short lMinValue = sMinValue;
                     short lMaxValue = sMaxValue;
-                    if (mLPwmPolarityNegative) {
+                    if (mServo0PwmPolarityNegative) {
                         lMinValue = sMaxValue;
                         lMaxValue = sMinValue;
                     }
                     short rMinValue = sMinValue;
                     short rMaxValue = sMaxValue;
-                    if (mRPwmPolarityNegative) {
+                    if (mServo1PwmPolarityNegative) {
                         rMinValue = sMaxValue;
                         rMaxValue = sMinValue;
                     }
 
-                    int widthL = Math.round(pulseWidth[0] * 44100.0f);
-                    int widthR = Math.round(pulseWidth[1] * 44100.0f);
+                    //
+                    // Thank you for reading my dirty source code. You are now reaching the GlueMotor's core part.
+                    // Rest of the code are pretty obvious, but the next block is only the part that may be considered as "invention",
+                    // that I have came up with when I was thinking about how to improve the PWM resolution, and here is how I have solved!
+                    // Just in case if you feel something from this idea and want to poke me: email:support@gluemotor.com, twitter:@gluemotor
+                    //
+                    double widthLd = (double) pulseWidth[0] * 44100.0;
+                    double widthRd = (double) pulseWidth[1] * 44100.0;
+                    int widthL = (int) Math.floor(widthLd);
+                    int widthR = (int) Math.floor(widthRd);
+                    short fallEdgeL = (short) ((double) lMinValue + ((double) lMaxValue - (double) lMinValue) * (widthLd - (double) widthL));
+                    short fallEdgeR = (short) ((double) rMinValue + ((double) rMaxValue - (double) rMinValue) * (widthRd - (double) widthR));
 
                     if (widthL > sAudioBufferSize)
                         widthL = sAudioBufferSize;
                     if (widthR > sAudioBufferSize)
                         widthR = sAudioBufferSize;
+
                     int i;
+                    // L channel
                     for (i = 0; i < widthL; i++) {
                         audioBuffer[0 + i * 2] = lMaxValue;
                     }
+                    if (i < sAudioBufferSize) {
+                        audioBuffer[0 + i * 2] = fallEdgeL;
+                        i++;
+                    }
                     for (; i < sAudioBufferSize; i++) {
                         audioBuffer[0 + i * 2] = lMinValue;
                     }
+
+                    // R channel
                     for (i = 0; i < widthR; i++) {
                         audioBuffer[1 + i * 2] = rMaxValue;
                     }
+                    if (i < sAudioBufferSize) {
+                        audioBuffer[1 + i * 2] = fallEdgeR;
+                        i++;
+                    }
                     for (; i < sAudioBufferSize; i++) {
                         audioBuffer[1 + i * 2] = rMinValue;
                     }
+
                     track.write(audioBuffer, 0, sAudioBufferSize * 2);
                     if (track.getPlayState() != AudioTrack.PLAYSTATE_PLAYING) {
                         track.play();

diff --git a/Android/app/src/main/java/com/gluemotor/android/gluemotorsample/MainActivity.java b/Android/app/src/main/java/com/gluemotor/android/gluemotorsample/MainActivity.java
@@ -68,7 +68,7 @@ else if (sw == mServo1Switch) {
         SeekBar.OnSeekBarChangeListener seekBarChangedListener = new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                float pulseWidth = (1000 + progress) * 0.000001f;
+                float pulseWidth = (10000 + progress) * 0.0000001f;
                 if (seekBar == mServo0SeekBar) {
                     mServo0PulseWidth = pulseWidth;
                     updatePulseWidth();

diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml
@@ -19,8 +19,8 @@
         android:id="@+id/seekBar1"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:max="1000"
-        android:progress="500" />
+        android:max="10000"
+        android:progress="5000" />
 
     <TextView
         android:text="Servo 1: OFF"
@@ -41,8 +41,8 @@
         android:id="@+id/seekBar0"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:progress="500"
-        android:max="1000" />
+        android:progress="5000"
+        android:max="10000" />
 
     <TextView
         android:text="Servo 0: OFF"