Skip to content

add light controller for Rockchip3566 (Inkbook Focus Plus) #573

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

Open
matejbart wants to merge 8 commits into
base: master
Choose a base branch
from
Open

add light controller for Rockchip3566 (Inkbook Focus Plus) #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a53678a
add light controller support for Rockchip3566
matejbart Oct 18, 2025
9c12de7
fixes log messages
matejbart Oct 19, 2025
7711245
removes redundant curly braces
matejbart Oct 19, 2025
2b7a151
adds a log function for Rockchip3566Controller
matejbart Oct 21, 2025
05d7625
Merge remote-tracking branch 'koreader/master'
matejbart Oct 21, 2025
4967897
replaces hardcoded min value
matejbart Oct 24, 2025
9f0111b
improves logging function for Rockchip3566Controller
matejbart Oct 24, 2025
e954c08
improves reporting of ledA/B files
matejbart Oct 24, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ app/build
assets/libs
assets/module
jni/luajit/build
.DS_Store
2 changes: 2 additions & 0 deletions app/src/main/java/org/koreader/launcher/TestActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import org.koreader.launcher.device.lights.TolinoNtxController
import org.koreader.launcher.device.lights.TolinoNtxNoWarmthController
import org.koreader.launcher.device.lights.TolinoB300Controller
import org.koreader.launcher.device.lights.BoyueS62RootController
import org.koreader.launcher.device.lights.Rockchip3566Controller
import org.koreader.launcher.dialog.LightDialog
import org.koreader.launcher.dialog.ToolTip

Expand Down Expand Up @@ -82,6 +83,7 @@ class TestActivity: AppCompatActivity() {
lightsMap["Tolino Root"] = TolinoRootController()
lightsMap["Tolino Ntx"] = TolinoNtxController()
lightsMap["Tolino Ntx (no warmth)"] = TolinoNtxNoWarmthController()
lightsMap["Rockchip RK3566"] = Rockchip3566Controller()
lightsMap["Tolino B300"] = TolinoB300Controller()

// Device ID
Expand Down
5 changes: 3 additions & 2 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 @@ -18,6 +18,7 @@ object DeviceInfo {
private const val STR_NTX = "ntx_6sl"
private const val STR_ROCKCHIP = "rockchip"
private const val STR_TOLINO = "tolino"
const val DEVICE_RK3566_EINK = "rk3566_eink"

val MANUFACTURER: String
val BRAND: String
Expand Down Expand Up @@ -297,7 +298,7 @@ object DeviceInfo {
-> Id.INKBOOKFOCUS

// InkBook Focus Plus
DEVICE == "rk3566_eink" && MODEL == "focus plus"
DEVICE == DEVICE_RK3566_EINK && MODEL == "focus plus"
-> Id.INKBOOKFOCUS_PLUS

// InkPalm Plus
Expand Down Expand Up @@ -637,7 +638,7 @@ object DeviceInfo {
-> Id.TOLINO

// Xiaomi
MANUFACTURER == "xiaomi" && BRAND == "xiaomi" && MODEL == "xiaomi_reader" && DEVICE == "rk3566_eink" && HARDWARE == "rk30board"
MANUFACTURER == "xiaomi" && BRAND == "xiaomi" && MODEL == "xiaomi_reader" && DEVICE == DEVICE_RK3566_EINK && HARDWARE == "rk30board"
-> Id.XIAOMI_READER

// ???
Expand Down
14 changes: 13 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
@@ -1,6 +1,7 @@
package org.koreader.launcher.device

import android.util.Log
import org.koreader.launcher.BuildConfig
import org.koreader.launcher.device.lights.*
import java.util.*

Expand Down Expand Up @@ -106,6 +107,12 @@ object LightsFactory {
logController("TolinoRoot")
TolinoRootController()
}
DeviceInfo.Id.INKBOOKFOCUS_PLUS -> {
logController("Rockchip3566Controller") {
Rockchip3566Controller.reportApiAvailability()
}
Rockchip3566Controller()
}
DeviceInfo.Id.TOLINO_EPOS3,
DeviceInfo.Id.TOLINO_VISION6,
DeviceInfo.Id.TOLINO_SHINE4,
Expand All @@ -120,8 +127,13 @@ object LightsFactory {
}
}

private fun logController(name: String?) {
private fun logController(name: String, extendedLog: (() -> String)? = null) {
Log.i(TAG, String.format(Locale.US,
"Using %s driver", name))
if (BuildConfig.DEBUG) {
extendedLog?.invoke()?.let {
Log.i(TAG, it)
}
}
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/org/koreader/launcher/device/lights/OnyxC67Controller.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.koreader.launcher.device.lights
import android.app.Activity
import android.util.Log
import org.koreader.launcher.device.LightsInterface
import org.koreader.launcher.extensions.read
import org.koreader.launcher.extensions.readOrElse
import org.koreader.launcher.extensions.write
import java.io.File

Expand Down Expand Up @@ -36,7 +36,7 @@ class OnyxC67Controller : LightsInterface {
}

override fun getBrightness(activity: Activity): Int {
return File(BRIGHTNESS_FILE).read()
return File(BRIGHTNESS_FILE).readOrElse()
}

override fun getWarmth(activity: Activity): Int {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/koreader/launcher/device/lights/OnyxColorController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.koreader.launcher.device.lights
import android.app.Activity
import android.util.Log
import org.koreader.launcher.device.LightsInterface
import org.koreader.launcher.extensions.read
import org.koreader.launcher.extensions.readOrElse
import org.koreader.launcher.extensions.write
import java.io.File

Expand Down Expand Up @@ -43,7 +43,7 @@ class OnyxColorController : LightsInterface {
}

override fun getBrightness(activity: Activity): Int {
return File(ACTUAL_BRIGHTNESS_FILE).read()
return File(ACTUAL_BRIGHTNESS_FILE).readOrElse()
}

override fun getWarmth(activity: Activity): Int {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/koreader/launcher/device/lights/OnyxWarmthController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.koreader.launcher.device.lights
import android.app.Activity
import android.util.Log
import org.koreader.launcher.device.LightsInterface
import org.koreader.launcher.extensions.read
import org.koreader.launcher.extensions.readOrElse
import org.koreader.launcher.extensions.write
import java.io.File

Expand Down Expand Up @@ -34,11 +34,11 @@ class OnyxWarmthController : LightsInterface {
}

override fun getBrightness(activity: Activity): Int {
return File(WHITE_FILE).read()
return File(WHITE_FILE).readOrElse()
}

override fun getWarmth(activity: Activity): Int {
return File(WARMTH_FILE).read()
return File(WARMTH_FILE).readOrElse()
}

override fun setBrightness(activity: Activity, brightness: Int) {
Expand Down
Loading