fix infrared encoding

flipperdevices · Aug 14, 2024 · cdc350c · cdc350c
1 parent 3647b1c
commit cdc350c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 41 deletions.
diff --git a/...ared/src/main/kotlin/com/flipperdevices/infrared/editor/encoding/InfraredRemoteEncoder.kt b/...ared/src/main/kotlin/com/flipperdevices/infrared/editor/encoding/InfraredRemoteEncoder.kt
@@ -0,0 +1,31 @@
+package com.flipperdevices.infrared.editor.encoding
+
+import com.flipperdevices.infrared.editor.model.InfraredRemote
+
+/**
+ * To encode [InfraredRemote] we write its objects into list, in specified order.
+ *  Then converting all objects inside list into byte arrays so we have lists of byte arrays.
+ *  Then we flatten it to have single byte array.
+ */
+object InfraredRemoteEncoder {
+    fun encode(remote: InfraredRemote): ByteArray {
+        val bytesList = when (remote) {
+            is InfraredRemote.Parsed -> listOf(
+                remote.type,
+                remote.protocol,
+                remote.address,
+                remote.command
+            )
+
+            is InfraredRemote.Raw -> listOf(
+                remote.frequency,
+                remote.dutyCycle,
+                remote.data
+            )
+        }
+        return bytesList
+            .map(String::toByteArray)
+            .flatMap(ByteArray::asList)
+            .toByteArray()
+    }
+}
diff --git a/...infrared/src/main/kotlin/com/flipperdevices/infrared/editor/util/InfraredRemoteEncoder.kt b/...infrared/src/main/kotlin/com/flipperdevices/infrared/editor/util/InfraredRemoteEncoder.kt
diff --git a/...lin/com/flipperdevices/ifrmvp/generator/config/device/api/DefaultDeviceConfigGenerator.kt b/...lin/com/flipperdevices/ifrmvp/generator/config/device/api/DefaultDeviceConfigGenerator.kt
@@ -5,7 +5,7 @@ import com.flipperdevices.ifrmvp.generator.config.device.api.DeviceKeyNamesProvi
 import com.flipperdevices.ifrmvp.model.IfrKeyIdentifier
 import com.flipperdevices.infrared.editor.encoding.ByteArrayEncoder
 import com.flipperdevices.infrared.editor.encoding.JvmEncoder
-import com.flipperdevices.infrared.editor.util.InfraredRemoteEncoder
+import com.flipperdevices.infrared.editor.encoding.InfraredRemoteEncoder
 import java.io.File
 
 class DefaultDeviceConfigGenerator(private val keyNamesProvider: DeviceKeyNamesProvider) : DeviceConfigGenerator {

diff --git a/...tor/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/presentation/FillerController.kt b/...tor/sql/src/main/kotlin/com/flipperdevices/ifrmvp/parser/presentation/FillerController.kt
@@ -10,16 +10,14 @@ import com.flipperdevices.ifrmvp.backend.db.signal.table.InfraredFileToSignalTab
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalKeyTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.SignalTable
 import com.flipperdevices.ifrmvp.backend.db.signal.table.UiPresetTable
-import com.flipperdevices.ifrmvp.backend.model.SignalModel
 import com.flipperdevices.ifrmvp.model.IfrKeyIdentifier
 import com.flipperdevices.ifrmvp.parser.util.ParserPathResolver
 import com.flipperdevices.infrared.editor.encoding.ByteArrayEncoder
 import com.flipperdevices.infrared.editor.encoding.JvmEncoder
 import com.flipperdevices.infrared.editor.model.InfraredRemote
-import com.flipperdevices.infrared.editor.util.InfraredRemoteEncoder
+import com.flipperdevices.infrared.editor.encoding.InfraredRemoteEncoder
 import com.flipperdevices.infrared.editor.viewmodel.InfraredKeyParser
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.JoinType
 import org.jetbrains.exposed.sql.andWhere