Tolino Epos 1: warmth lights support (#513)

koreader · Sep 30, 2024 · 5b9ec23 · 5b9ec23
1 parent 3284042
commit 5b9ec23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt b/app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt
@@ -163,7 +163,7 @@ object DeviceInfo {
         ONYX_TAB_ULTRA_C,
         RIDI_PAPER_3,
         TAGUS_GEA,
-        TOLINO_EPOS,
+        TOLINO_EPOS1,
         TOLINO_PAGE2,
         TOLINO_SHINE3,
         TOLINO_VISION4,
@@ -272,7 +272,7 @@ object DeviceInfo {
     private val SONY_CP1: Boolean
     private val SONY_RP1: Boolean
     private val TAGUS_GEA: Boolean
-    private val TOLINO_EPOS: Boolean
+    private val TOLINO_EPOS1: Boolean
     private val TOLINO_EPOS3: Boolean
     private val TOLINO_PAGE2: Boolean
     private val TOLINO_SHINE3: Boolean
@@ -640,14 +640,11 @@ object DeviceInfo {
             || MODEL.contentEquals(STR_TOLINO) && (DEVICE.contentEquals("tolino_vision2")
             || DEVICE.contentEquals(STR_NTX))
 
-        // Tolino Epos 2 also have warmth lights
-        TOLINO_EPOS = BRAND.contentEquals(STR_KOBO)
+        // Tolino Epos 1
+        TOLINO_EPOS1 = BRAND.contentEquals(STR_KOBO)
             && MODEL.contentEquals(STR_TOLINO)
             && DEVICE.contentEquals(STR_NTX)
-            && !HARDWARE.contentEquals("e60k00")
-            && !HARDWARE.contentEquals("e60q50")
-            && !HARDWARE.contentEquals("e60qv0")
-            && !HARDWARE.contentEquals("e70k00")
+            && HARDWARE.contentEquals("e70q20")
 
         // Tolino Epos 3
         TOLINO_EPOS3 = BRAND.contentEquals(STR_KOBO)
@@ -842,7 +839,7 @@ object DeviceInfo {
         lightsMap[LightsDevice.ONYX_TAB_ULTRA_C] = ONYX_TAB_ULTRA_C
         lightsMap[LightsDevice.RIDI_PAPER_3] = RIDI_PAPER_3
         lightsMap[LightsDevice.TAGUS_GEA] = TAGUS_GEA
-        lightsMap[LightsDevice.TOLINO_EPOS] = TOLINO_EPOS
+        lightsMap[LightsDevice.TOLINO_EPOS1] = TOLINO_EPOS1
         lightsMap[LightsDevice.TOLINO_PAGE2] = TOLINO_PAGE2
         lightsMap[LightsDevice.TOLINO_SHINE3] = TOLINO_SHINE3
         lightsMap[LightsDevice.TOLINO_VISION4] = TOLINO_VISION4

diff --git a/app/src/main/java/org/koreader/launcher/device/LightsFactory.kt b/app/src/main/java/org/koreader/launcher/device/LightsFactory.kt
@@ -9,15 +9,15 @@ object LightsFactory {
     val lightsController: LightsInterface
         get() {
             return when (DeviceInfo.LIGHTS) {
-                DeviceInfo.LightsDevice.NOOK_GL4,
-                DeviceInfo.LightsDevice.TOLINO_EPOS -> {
+                DeviceInfo.LightsDevice.NOOK_GL4 -> {
                     logController("TolinoRoot")
                     TolinoRootController()
                 }
                 DeviceInfo.LightsDevice.CREMA_0710C,
                 DeviceInfo.LightsDevice.CREMA_CARTA_G,
                 DeviceInfo.LightsDevice.MEEBOOK_P6,
                 DeviceInfo.LightsDevice.RIDI_PAPER_3,
+                DeviceInfo.LightsDevice.TOLINO_EPOS1,
                 DeviceInfo.LightsDevice.TOLINO_SHINE3,
                 DeviceInfo.LightsDevice.TOLINO_VISION4,
                 DeviceInfo.LightsDevice.TOLINO_VISION5 -> {