add nova3, fix note5

koreader · Jan 23, 2022 · 399ce8f · 399ce8f
1 parent 489d84a
commit 399ce8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt b/app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt
@@ -54,6 +54,7 @@ object DeviceInfo {
         ONYX_NOTE3,
         ONYX_NOTE5,
         ONYX_NOVA2,
+        ONYX_NOVA3,
         ONYX_NOVA3_COLOR,
         ONYX_NOVA_AIR,
         TOLINO
@@ -65,6 +66,7 @@ object DeviceInfo {
         ONYX_DARWIN7,
         ONYX_NOTE3,
         ONYX_NOVA2,
+        ONYX_NOVA3,
         ONYX_NOVA_AIR,
         ONYX_KON_TIKI2,
         TOLINO_EPOS
@@ -114,6 +116,7 @@ object DeviceInfo {
     private val ONYX_NOTE3: Boolean
     private val ONYX_NOTE5: Boolean
     private val ONYX_NOVA2: Boolean
+    private val ONYX_NOVA3: Boolean
     private val ONYX_NOVA3_COLOR: Boolean
     private val ONYX_NOVA_AIR: Boolean
     private val ONYX_POKE2: Boolean
@@ -233,7 +236,7 @@ object DeviceInfo {
             && DEVICE.contentEquals("note3"))
 
         // Onyx Note 5
-        ONYX_NOTE5 = (MANUFACTURER.contentEquals("onyx")
+        ONYX_NOTE5 = (BRAND.contentEquals("onyx")
             && PRODUCT.contentEquals("note5")
             && DEVICE.contentEquals("note5"))
 
@@ -242,6 +245,11 @@ object DeviceInfo {
             && PRODUCT.contentEquals("nova2")
             && DEVICE.contentEquals("nova2"))
 
+        // Onyx Nova 3
+        ONYX_NOVA3 = (MANUFACTURER.contentEquals("onyx")
+            && PRODUCT.contentEquals("nova3")
+            && DEVICE.contentEquals("nova3"))
+
         // Onyx Nova 3 Color
         ONYX_NOVA3_COLOR = MANUFACTURER.contentEquals("onyx")
             && MODEL.contentEquals("nova3color")

diff --git a/app/src/main/java/org/koreader/launcher/device/EPDFactory.kt b/app/src/main/java/org/koreader/launcher/device/EPDFactory.kt
@@ -61,6 +61,7 @@ object EPDFactory {
                 DeviceInfo.EinkDevice.ONYX_NOTE3,
                 DeviceInfo.EinkDevice.ONYX_NOTE5,
                 DeviceInfo.EinkDevice.ONYX_NOVA2,
+                DeviceInfo.EinkDevice.ONYX_NOVA3,
                 DeviceInfo.EinkDevice.ONYX_NOVA3_COLOR,
                 DeviceInfo.EinkDevice.ONYX_NOVA_AIR -> {
                     logController("Onyx/Qualcomm")

diff --git a/app/src/main/java/org/koreader/launcher/device/LightsFactory.kt b/app/src/main/java/org/koreader/launcher/device/LightsFactory.kt
@@ -17,6 +17,7 @@ object LightsFactory {
                 DeviceInfo.LightsDevice.ONYX_DARWIN7,
                 DeviceInfo.LightsDevice.ONYX_NOTE3,
                 DeviceInfo.LightsDevice.ONYX_NOVA2,
+                DeviceInfo.LightsDevice.ONYX_NOVA3,
                 DeviceInfo.LightsDevice.ONYX_NOVA_AIR -> {
                     logController("Onyx/Qualcomm")
                     OnyxWarmthController()