Merge pull request #22 from CrazyDude1994/release-1.2

Release 1.2

.gitignore

@@ -7,7 +7,6 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
-/.idea
 .DS_Store
 /build
 /captures

app/build.gradle

@@ -22,8 +22,8 @@ android {
         applicationId "crazydude.com.telemetry"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 10
-        versionName "1.1"
+        versionCode 11
+        versionName "1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/crazydude/com/telemetry/manager/PreferenceManager.kt

@@ -41,4 +41,16 @@ class PreferenceManager(context: Context) {
     fun setYoutubeShown() {
         sharedPreferences.edit().putBoolean("youtube_shown", true).apply()
     }
+
+    fun getBatteryUnits(): String {
+        return sharedPreferences.getString("battery_units", "mAh") ?: "mAh"
+    }
+
+    fun usePitotTube(): Boolean {
+        return sharedPreferences.getBoolean("use_pitot_tube", false)
+    }
+
+    fun showArtificialHorizonView(): Boolean {
+        return sharedPreferences.getBoolean("show_artificial_horizon", true)
+    }
 }

app/src/main/java/crazydude/com/telemetry/protocol/BluetoothDataPoller.kt

@@ -30,10 +30,13 @@ class BluetoothDataPoller(
                     })
                 }
                 protocol = FrSkySportProtocol(dataDecoder)
+                val buffer = ByteArray(1024)
                 while (!thread.isInterrupted && bluetoothSocket.isConnected) {
-                    val data = bluetoothSocket.inputStream.read()
-                    outputStream?.write(data)
-                    protocol.process(data)
+                    val size = bluetoothSocket.inputStream.read(buffer)
+                    outputStream?.write(buffer, 0, size)
+                    for (i in 0 until size) {
+                        protocol.process(buffer[i].toInt())
+                    }
                 }
             } catch (e: IOException) {
                 try {

app/src/main/java/crazydude/com/telemetry/protocol/DataDecoder.kt

@@ -150,6 +150,9 @@ class DataDecoder(private val listener: Listener) : FrSkySportProtocol.Companion
                 listener.onPitchData(value)
 //                Log.d(TAG, "Decoded pitch $value")
             }
+            FrSkySportProtocol.ASPEED -> {
+                listener.onAirSpeed(data.data * 1.852f)
+            }
             else -> {}
         }
     }
@@ -180,5 +183,6 @@ class DataDecoder(private val listener: Listener) : FrSkySportProtocol.Companion
             firstFlightMode: FlyMode,
             secondFlightMode: FlyMode?
         )
+        fun onAirSpeed(speed: Float)
     }
 }

app/src/main/java/crazydude/com/telemetry/protocol/FrskySportProtocol.kt

@@ -43,6 +43,7 @@ class FrSkySportProtocol(var dataListener: DataListener) {
         const val GPS_STATE_SENSOR = 0x0410
         const val PITCH_SENSOR = 0x0430
         const val ROLL_SENSOR = 0x0440
+        const val AIRSPEED_SENSOR = 0x0A00
 
         const val FUEL = 0
         const val GPS = 1
@@ -60,6 +61,7 @@ class FrSkySportProtocol(var dataListener: DataListener) {
         const val ROLL = 13
         const val PITCH = 14
         const val GALT = 15
+        const val ASPEED = 16
 
         interface DataListener {
             fun onNewData(data: TelemetryData)
@@ -68,7 +70,7 @@ class FrSkySportProtocol(var dataListener: DataListener) {
         @Retention(AnnotationRetention.SOURCE)
         @IntDef(
             FUEL, GPS, VBAT, CELL_VOLTAGE, CURRENT, HEADING, RSSI, FLYMODE, GPS_STATE, VSPEED, ALTITUDE, GSPEED,
-            DISTANCE, ROLL, PITCH, GALT
+            DISTANCE, ROLL, PITCH, GALT, ASPEED
         )
         annotation class TelemetryType
 
@@ -258,6 +260,11 @@ class FrSkySportProtocol(var dataListener: DataListener) {
                             )
                         )
                     }
+                    AIRSPEED_SENSOR -> {
+                        dataListener.onNewData(
+                            TelemetryData(ASPEED, rawData)
+                        )
+                    }
                     else -> {
                         //Log.d(TAG, "Unknown packet" + buffer.contentToString())
                     }

app/src/main/java/crazydude/com/telemetry/protocol/LogPlayer.kt

@@ -161,6 +161,10 @@ class LogPlayer(val originalListener: DataDecoder.Listener) : DataDecoder.Listen
         originalListener.onRollData(rollAngle)
     }
 
+    override fun onAirSpeed(speed: Float) {
+        originalListener.onAirSpeed(speed)
+    }
+
     override fun onPitchData(pitchAngle: Float) {
         originalListener.onPitchData(pitchAngle)
     }

app/src/main/java/crazydude/com/telemetry/service/DataService.kt

@@ -194,6 +194,12 @@ class DataService : Service(), DataDecoder.Listener {
         })
     }
 
+    override fun onAirSpeed(speed: Float) {
+        runOnMainThread(Runnable {
+            dataListener?.onAirSpeed(speed)
+        })
+    }
+
     override fun onRSSIData(rssi: Int) {
         runOnMainThread(Runnable {
             dataListener?.onRSSIData(rssi)

app/src/main/java/crazydude/com/telemetry/ui/HorizonView.kt

@@ -0,0 +1,94 @@
+package crazydude.com.telemetry.ui
+
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.view.View
+
+class HorizonView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr) {
+
+    private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
+    private var roll: Float = 0f
+    private var pitch: Float = 0f
+    private var size: Float = 0f
+    private var center: Float = 0f
+
+    private val leftLinePath = Path()
+    private val rightLinePath = Path()
+    private val circlePath = Path()
+
+    private val planeLinePaint = Paint(Paint.ANTI_ALIAS_FLAG)
+        .apply {
+            strokeWidth = 5f
+            style = Paint.Style.STROKE
+        }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+
+        size = w.toFloat()
+        center = size / 2
+
+        leftLinePath.apply {
+            moveTo(center - 100f, center)
+            lineTo(center - 20f, center)
+            lineTo(center - 20f, center + 10f)
+        }
+        rightLinePath.apply {
+            moveTo(center + 100f, center)
+            lineTo(center + 20f, center)
+            lineTo(center + 20f, center + 10f)
+        }
+        circlePath.apply {
+            addCircle(center, center, center, Path.Direction.CW)
+        }
+    }
+
+    override fun onDraw(canvas: Canvas?) {
+        super.onDraw(canvas)
+
+        canvas?.let {
+            it.save()
+            it.clipPath(circlePath, Region.Op.INTERSECT)
+            it.rotate(-roll, center, center)
+            paint.color = Color.parseColor("#5BCBD3")
+            it.drawRect(0f, 0f, size, center - pitch * 5, paint)
+            paint.color = Color.parseColor("#D38700")
+            it.drawRect(0f, center - pitch * 5, size, size, paint)
+            paint.strokeWidth = 4f
+            paint.color = Color.BLACK
+            for (i in 1..18) {
+                val lineLength = if (i.rem(2) == 0) 50 else 25
+                it.drawLine(
+                    center - lineLength,
+                    (center - pitch * 5) + i * 25,
+                    center + lineLength,
+                    (center - pitch * 5) + i * 25,
+                    paint
+                )
+                it.drawLine(
+                    center - lineLength,
+                    (center - pitch * 5) - i * 25,
+                    center + lineLength,
+                    (center - pitch * 5) - i * 25,
+                    paint
+                )
+            }
+            it.restore()
+            it.drawPath(leftLinePath, planeLinePaint)
+            it.drawPath(rightLinePath, planeLinePaint)
+        }
+    }
+
+    fun setRoll(roll: Float) {
+        this.roll = roll
+        invalidate()
+    }
+
+    fun setPitch(pitch: Float) {
+        this.pitch = pitch
+        invalidate()
+    }
+}