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

Jump to bottom

Tolino Epos 2 support #521

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Tolino Epos 2 support #521

merged 2 commits into from
Oct 7, 2024

Conversation

hugleo
Copy link
Contributor

@hugleo hugleo commented Oct 6, 2024 •
edited by Frenzie
Loading

Tolino Epos 2

Device info:
Manufacturer: rakuten kobo inc.
Brand: rakutenkobo
Model: tolino
Device: ntx_6sl
Product: ntx_6sl
Hardware: e80k00
Platform: imx6

test.log

Lights: tolino/ntx

Also adds Tolino Epos 1 to EPD driver

This change is Reviewable

@hugleo
Tolino Epos 2 support
f36ddd7 
Tolino Epos 2

Device info:
Manufacturer: rakuten kobo inc.
Brand: rakutenkobo
Model: tolino
Device: ntx_6sl
Product: ntx_6sl
Hardware: e80k00
Platform: imx6

test.log

Lights: tolino/ntx


Also adds Tolino Epos 1 to EPD driver
pazos
pazos reviewed Oct 7, 2024
View reviewed changes
app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt Outdated
@@ -113,6 +113,7 @@ object DeviceInfo {
SONY_RP1,
TAGUS_GEA,
TOLINO,
TOLINO_EPOS1,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

pazos
pazos reviewed Oct 7, 2024
View reviewed changes
app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt Outdated
@@ -782,6 +791,7 @@ object DeviceInfo {
deviceMap[EinkDevice.SONY_RP1] = SONY_RP1
deviceMap[EinkDevice.TAGUS_GEA] = TAGUS_GEA
deviceMap[EinkDevice.TOLINO] = TOLINO
deviceMap[EinkDevice.TOLINO_EPOS1] = TOLINO_EPOS1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

pazos
pazos reviewed Oct 7, 2024
View reviewed changes
app/src/main/java/org/koreader/launcher/device/EPDFactory.kt Outdated
@@ -72,7 +72,8 @@ object EPDFactory {
DeviceInfo.EinkDevice.HANVON_960,
DeviceInfo.EinkDevice.ONYX_JDREAD,
DeviceInfo.EinkDevice.RIDI_PAPER_3,
DeviceInfo.EinkDevice.TOLINO -> {
DeviceInfo.EinkDevice.TOLINO,
DeviceInfo.EinkDevice.TOLINO_EPOS1 -> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

pazos
pazos requested changes Oct 7, 2024
View reviewed changes
Copy link
Member

@pazos pazos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why you added the Epos1 to EPD. It will still be asigned the first driver of the factory that matches, and I think we agree recently that was TOLINO. So it's a bit of noise.

@hugleo
Copy link
Contributor Author

hugleo commented Oct 7, 2024

Oh sorry,

I unfold strings here:

    TOLINO = BRAND.contentEquals(rakutenkobo) && MODEL.contentEquals("imx50_rdp")
        || MODEL.contentEquals(ntx_6sl) && 
        (DEVICE.contentEquals("tolino_vision2") || DEVICE.contentEquals(ntx_6sl))

My bad. I got confused for to many || or &&. You are right, is catched here: || MODEL.contentEquals(ntx_6sl).

@hugleo hugleo requested a review from pazos October 7, 2024 12:43
pazos
pazos approved these changes Oct 7, 2024
View reviewed changes
Copy link
Member

@pazos pazos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you very much ;)

@pazos pazos merged commit 6c749f8 into koreader:master Oct 7, 2024
3 checks passed
benoit-pierre added a commit to benoit-pierre/koreader that referenced this pull request Oct 12, 2024
@benoit-pierre
bump luajit-launcher
9504d2f 
- koreader/android-luajit-launcher#517
- koreader/android-luajit-launcher#521
- koreader/android-luajit-launcher#522
- koreader/android-luajit-launcher#523
- koreader/android-luajit-launcher#524
@benoit-pierre benoit-pierre mentioned this pull request Oct 12, 2024
Merged
Frenzie pushed a commit to koreader/koreader that referenced this pull request Oct 12, 2024
@benoit-pierre
bump luajit-launcher (#12630)
e9f83a8 
- koreader/android-luajit-launcher#517
- koreader/android-luajit-launcher#521
- koreader/android-luajit-launcher#522
- koreader/android-luajit-launcher#523
- koreader/android-luajit-launcher#524
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pazos pazos pazos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hugleo @pazos