Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tolino Epos 1 warmth lights support #513

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Tolino Epos 1 warmth lights support #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
691ffb3
Tolino Epos 1 warmth lights support
hugleo Sep 27, 2024
1936292
less is better
hugleo Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/koreader/launcher/device/LightsFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {
Expand Down