Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 43 additions & 0 deletions app/src/main/java/org/koreader/launcher/device/DeviceInfo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ object DeviceInfo {
BOYUE_T103D,
CREMA,
CREMA_0650L,
CREMA_0660L,
CREMA_0710C,
CREMA_CARTA_G,
ENERGY,
Expand All @@ -61,6 +62,7 @@ object DeviceInfo {
HYREAD_GAZE_NOTE,
HYREAD_GAZE_NOTE_CC,
HYREAD_MINI6,
IFLYTEK_R3,
INKBOOK,
INKBOOKFOCUS,
INKBOOKFOCUS_PLUS,
Expand All @@ -76,8 +78,11 @@ object DeviceInfo {
NABUK,
NOOK,
NOOK_GL4,
NOOK_GLPLUS,
OBOOK_P10D,
OBOOK_P78D,
ONYX_C67,
ONYX_DARWIN5,
ONYX_DARWIN7,
ONYX_DARWIN9,
ONYX_EDISON,
Expand All @@ -87,6 +92,7 @@ object DeviceInfo {
ONYX_GO_COLOR7,
ONYX_GO6,
ONYX_GO7,
ONYX_GO7GEN2,
ONYX_JDREAD,
ONYX_KON_TIKI2,
ONYX_LEAF,
Expand All @@ -107,6 +113,7 @@ object DeviceInfo {
ONYX_NOTE_AIR_4C,
ONYX_NOTE_MAX,
ONYX_NOTE_PRO,
ONYX_NOTE_S,
ONYX_NOTE_X2,
ONYX_NOVA,
ONYX_NOVA2,
Expand All @@ -123,6 +130,7 @@ object DeviceInfo {
ONYX_POKE3,
ONYX_POKE4,
ONYX_POKE5,
ONYX_POKE5S,
ONYX_POKE6,
ONYX_POKE4LITE,
ONYX_POKE_PRO,
Expand Down Expand Up @@ -252,6 +260,10 @@ object DeviceInfo {
CREMA && PRODUCT == "keplerb"
-> Id.CREMA_0650L

// Crema Soundup
CREMA && PRODUCT == "sound2"
-> Id.CREMA_0660L

// Crema Grande
CREMA && MODEL == "crema-0710c"
-> Id.CREMA_0710C
Expand Down Expand Up @@ -288,6 +300,10 @@ object DeviceInfo {
MANUFACTURER == "hyread" && MODEL == "k06nu"
-> Id.HYREAD_MINI6

// Iflytek ebook r3
MANUFACTURER == "iflytek" && MODEL == "iflytek ebook r3"
-> Id.IFLYTEK_R3

// Artatech Inkbook Prime/Prime HD.
MANUFACTURER == "artatech" && BRAND == "inkbook" && MODEL.startsWith("prime")
-> Id.INKBOOK
Expand Down Expand Up @@ -345,12 +361,20 @@ object DeviceInfo {
&& (MODEL == "bnrv1000" || MODEL == "bnrv1100" || MODEL == "bnrv1300")
-> Id.NOOK_GL4

// Nook Glowlight plus 7.8" (2019)
MANUFACTURER == "barnesandnoble" && MODEL == "bnrv700" && PRODUCT == "ntx_6sl"
-> Id.NOOK_GLPLUS

// Nook (catch them all fallback for all other models)
(MANUFACTURER == "barnesandnoble" || MANUFACTURER == "freescale")
&& (MODEL == "bnrv510" || MODEL == "bnrv520" || MODEL == "bnrv700"
|| MODEL == "evk_mx6sl" || MODEL.startsWith("ereader"))
-> Id.NOOK

// OBOOK P10D
MANUFACTURER == STR_ROCKCHIP && MODEL == "p10d"
-> Id.OBOOK_P10D

// OBOOK P78D
MANUFACTURER == STR_ROCKCHIP && PRODUCT == "rk3566_78d" && MODEL == "p78d"
-> Id.OBOOK_P78D
Expand All @@ -361,6 +385,11 @@ object DeviceInfo {
&& DEVICE.startsWith("c67")
-> Id.ONYX_C67

// ONYX DARWIN 5
MANUFACTURER == "onyx"
&& BRAND == "maccentre" || MODEL == "mc_c68pctm"
-> Id.ONYX_DARWIN5

// ONYX DARWIN 7
MANUFACTURER == "onyx"
&& (PRODUCT == "mc_darwin7" || PRODUCT == "darwin7")
Expand Down Expand Up @@ -393,6 +422,10 @@ object DeviceInfo {
BRAND == "onyx" && MODEL == "gocolor7"
-> Id.ONYX_GO_COLOR7

// Onyx Boox Go Color 7 Gen II
BRAND == "onyx" && MODEL == "gocolor7_2"
-> Id.ONYX_GO7GEN2

// Onyx Boox Go 6
BRAND == "onyx" && MODEL == "go6"
-> Id.ONYX_GO6
Expand Down Expand Up @@ -483,6 +516,10 @@ object DeviceInfo {
MANUFACTURER == "onyx" && PRODUCT == "notepro" && DEVICE == "notepro"
-> Id.ONYX_NOTE_PRO

// Onyx Note S
MANUFACTURER == "onyx" && MODEL == "notes"
-> Id.ONYX_NOTE_S

// Onyx Note X2
MANUFACTURER == "onyx" && MODEL == "notex2"
-> Id.ONYX_NOTE_X2
Expand Down Expand Up @@ -551,6 +588,10 @@ object DeviceInfo {
BRAND == "onyx" && MODEL == "poke5p"
-> Id.ONYX_POKE5

// Onyx Poke 5s
BRAND == "onyx" && MODEL == "poke5s"
-> Id.ONYX_POKE5S

// Onyx Poke 6
BRAND == "onyx" && MODEL == "poke6"
-> Id.ONYX_POKE6
Expand Down Expand Up @@ -669,10 +710,12 @@ object DeviceInfo {

HAS_COLOR_SCREEN = when (ID) {
Id.HYREAD_GAZE_NOTE_CC,
Id.IFLYTEK_R3,
Id.MEEBOOK_M6C,
Id.MOOINKPLUS2C,
Id.NONE,
Id.ONYX_GO_COLOR7,
Id.ONYX_GO7GEN2,
Id.ONYX_NOVA3_COLOR,
Id.ONYX_NOVA_AIR_C,
Id.ONYX_NOTE_AIR_3C,
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/org/koreader/launcher/device/EPDFactory.kt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ object EPDFactory {
DeviceInfo.Id.JDREAD,
DeviceInfo.Id.LINFINY_ENOTE,
DeviceInfo.Id.NOOK,
DeviceInfo.Id.NOOK_GLPLUS,
DeviceInfo.Id.SONY_CP1,
DeviceInfo.Id.SONY_RP1,
-> {
Expand All @@ -76,6 +77,7 @@ object EPDFactory {
}

DeviceInfo.Id.CREMA,
DeviceInfo.Id.CREMA_0660L,
DeviceInfo.Id.CREMA_CARTA_G,
DeviceInfo.Id.HANVON_960,
DeviceInfo.Id.ONYX_JDREAD,
Expand All @@ -92,11 +94,13 @@ object EPDFactory {
TolinoEPDController()
}

DeviceInfo.Id.ONYX_DARWIN5,
DeviceInfo.Id.ONYX_DARWIN9,
DeviceInfo.Id.ONYX_EDISON,
DeviceInfo.Id.ONYX_GALILEO2,
DeviceInfo.Id.ONYX_GO_103,
DeviceInfo.Id.ONYX_GO6,
DeviceInfo.Id.ONYX_GO7GEN2,
DeviceInfo.Id.ONYX_KON_TIKI2,
DeviceInfo.Id.ONYX_LEAF,
DeviceInfo.Id.ONYX_LEAF2,
Expand All @@ -114,6 +118,7 @@ object EPDFactory {
DeviceInfo.Id.ONYX_NOTE_AIR_4C,
DeviceInfo.Id.ONYX_NOTE_MAX,
DeviceInfo.Id.ONYX_NOTE_PRO,
DeviceInfo.Id.ONYX_NOTE_S,
DeviceInfo.Id.ONYX_NOTE_X2,
DeviceInfo.Id.ONYX_NOVA,
DeviceInfo.Id.ONYX_NOVA2,
Expand All @@ -130,6 +135,7 @@ object EPDFactory {
DeviceInfo.Id.ONYX_POKE3,
DeviceInfo.Id.ONYX_POKE4,
DeviceInfo.Id.ONYX_POKE5,
DeviceInfo.Id.ONYX_POKE5S,
DeviceInfo.Id.ONYX_POKE6,
DeviceInfo.Id.ONYX_POKE4LITE,
DeviceInfo.Id.ONYX_POKE_PRO,
Expand All @@ -153,12 +159,14 @@ object EPDFactory {

DeviceInfo.Id.HYREAD_GAZE_NOTE_CC,
DeviceInfo.Id.HYREAD_MINI6,
DeviceInfo.Id.IFLYTEK_R3,
DeviceInfo.Id.INKBOOKFOCUS_PLUS,
DeviceInfo.Id.INKPALM_PLUS,
DeviceInfo.Id.MEEBOOK_M6,
DeviceInfo.Id.MEEBOOK_M6C,
DeviceInfo.Id.MEEBOOK_M7,
DeviceInfo.Id.MOAAN_MIX7,
DeviceInfo.Id.OBOOK_P10D,
DeviceInfo.Id.OBOOK_P78D,
DeviceInfo.Id.PUBU_PUBOOK,
DeviceInfo.Id.XIAOMI_READER,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ object LightsFactory {
DeviceInfo.Id.ONYX_GO_COLOR7,
DeviceInfo.Id.ONYX_GO6,
DeviceInfo.Id.ONYX_GO7,
DeviceInfo.Id.ONYX_GO7GEN2,
DeviceInfo.Id.ONYX_NOTE_AIR_3C,
DeviceInfo.Id.ONYX_NOTE_AIR_4C,
DeviceInfo.Id.ONYX_NOVA_AIR,
DeviceInfo.Id.ONYX_PAGE,
DeviceInfo.Id.ONYX_PALMA,
DeviceInfo.Id.ONYX_PALMA2,
DeviceInfo.Id.ONYX_POKE5,
DeviceInfo.Id.ONYX_POKE5S,
DeviceInfo.Id.ONYX_POKE6,
DeviceInfo.Id.ONYX_TAB_ULTRA_C,
DeviceInfo.Id.ONYX_TAB_ULTRA_C_PRO,
Expand Down Expand Up @@ -64,6 +66,7 @@ object LightsFactory {
logController("Onyx/Qualcomm")
OnyxWarmthController()
}
DeviceInfo.Id.ONYX_DARWIN5,
DeviceInfo.Id.ONYX_DARWIN9,
DeviceInfo.Id.ONYX_LEAF2,
DeviceInfo.Id.ONYX_LIVINGSTONE3,
Expand All @@ -85,6 +88,7 @@ object LightsFactory {
DeviceInfo.Id.CREMA_0710C,
DeviceInfo.Id.CREMA_CARTA_G,
DeviceInfo.Id.MEEBOOK_P6,
DeviceInfo.Id.NOOK_GLPLUS,
DeviceInfo.Id.RIDI_PAPER_3,
DeviceInfo.Id.TOLINO_EPOS1,
DeviceInfo.Id.TOLINO_SHINE3,
Expand All @@ -94,6 +98,7 @@ object LightsFactory {
logController("TolinoNTX")
TolinoNtxController()
}
DeviceInfo.Id.CREMA_0660L,
DeviceInfo.Id.HISENSE_TOUCH_LITE,
DeviceInfo.Id.TOLINO_PAGE2,
-> {
Expand Down