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

Onyx Tab Ultra Color support #431

Merged
merged 6 commits into from
Dec 22, 2023
Merged

Onyx Tab Ultra Color support #431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0672431
Onyx Tab Ultra Color support
hugleo Aug 6, 2023
3571f60
Remove not working ultrac light support
hugleo Nov 8, 2023
18ddb04
Merge branch 'koreader:master' into hugleo-patch-3
hugleo Nov 8, 2023
892c30b
Fix order
hugleo Nov 8, 2023
fc61c6e
Delete app/src/main/java/org/koreader/launcher/device/epd/EPDFactory.kt
hugleo Nov 8, 2023
09456e7
remove lighs for real
hugleo Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion 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 @@ -84,6 +84,7 @@ object DeviceInfo {
ONYX_POKE4LITE,
ONYX_POKE_PRO,
ONYX_TAB_ULTRA,
ONYX_TAB_ULTRA_C,
RIDI_PAPER_3,
SONY_CP1,
SONY_RP1,
Expand Down Expand Up @@ -125,6 +126,7 @@ object DeviceInfo {
ONYX_POKE4LITE,
ONYX_POKE_PRO,
ONYX_TAB_ULTRA,
ONYX_TAB_ULTRA_C,
RIDI_PAPER_3,
TAGUS_GEA,
TOLINO_EPOS,
Expand Down Expand Up @@ -209,6 +211,7 @@ object DeviceInfo {
private val ONYX_POKE4LITE: Boolean
private val ONYX_POKE_PRO: Boolean
private val ONYX_TAB_ULTRA: Boolean
private val ONYX_TAB_ULTRA_C: Boolean
private val RIDI_PAPER_3: Boolean
private val SONY_CP1: Boolean
private val SONY_RP1: Boolean
Expand Down Expand Up @@ -474,6 +477,10 @@ object DeviceInfo {
ONYX_TAB_ULTRA = MANUFACTURER.contentEquals("onyx")
&& MODEL.contentEquals("tabultra")

// Onyx Tab Ultra C
ONYX_TAB_ULTRA_C = MANUFACTURER.contentEquals("onyx")
&& MODEL.contentEquals("tabultrac")

// Ridi Paper 3
RIDI_PAPER_3 = BRAND.contentEquals("ridi")
&& MODEL.contentEquals("ridipaper")
Expand Down Expand Up @@ -591,6 +598,7 @@ object DeviceInfo {
deviceMap[EinkDevice.ONYX_POKE4LITE] = ONYX_POKE4LITE
deviceMap[EinkDevice.ONYX_POKE_PRO] = ONYX_POKE_PRO
deviceMap[EinkDevice.ONYX_TAB_ULTRA] = ONYX_TAB_ULTRA
deviceMap[EinkDevice.ONYX_TAB_ULTRA_C] = ONYX_TAB_ULTRA_C
deviceMap[EinkDevice.RIDI_PAPER_3] = RIDI_PAPER_3
deviceMap[EinkDevice.SONY_CP1] = SONY_CP1
deviceMap[EinkDevice.SONY_RP1] = SONY_RP1
Expand Down Expand Up @@ -640,6 +648,7 @@ object DeviceInfo {
lightsMap[LightsDevice.ONYX_POKE4LITE] = ONYX_POKE4LITE
lightsMap[LightsDevice.ONYX_POKE_PRO] = ONYX_POKE_PRO
lightsMap[LightsDevice.ONYX_TAB_ULTRA] = ONYX_TAB_ULTRA
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
Expand Down Expand Up @@ -686,7 +695,8 @@ object DeviceInfo {
HAS_COLOR_SCREEN = when (EINK) {
EinkDevice.NONE,
EinkDevice.ONYX_NOVA3_COLOR,
EinkDevice.ONYX_NOVA_AIR_C -> true
EinkDevice.ONYX_NOVA_AIR_C,
EinkDevice.ONYX_TAB_ULTRA_C -> true
else -> false
}
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/koreader/launcher/device/EPDFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ object EPDFactory {
DeviceInfo.EinkDevice.ONYX_POKE4,
DeviceInfo.EinkDevice.ONYX_POKE4LITE,
DeviceInfo.EinkDevice.ONYX_POKE_PRO,
DeviceInfo.EinkDevice.ONYX_TAB_ULTRA -> {
DeviceInfo.EinkDevice.ONYX_TAB_ULTRA,
DeviceInfo.EinkDevice.ONYX_TAB_ULTRA_C -> {
logController("Onyx/Qualcomm")
OnyxEPDController()
}
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -48,7 +48,8 @@ object LightsFactory {
DeviceInfo.LightsDevice.ONYX_PAGE,
DeviceInfo.LightsDevice.ONYX_POKE4,
DeviceInfo.LightsDevice.ONYX_POKE4LITE,
DeviceInfo.LightsDevice.ONYX_TAB_ULTRA -> {
DeviceInfo.LightsDevice.ONYX_TAB_ULTRA,
DeviceInfo.LightsDevice.ONYX_TAB_ULTRA_C -> {
logController("Onyx/Sdk")
OnyxSdkLightsController()
}
Expand Down