feat(device.lua): add custom options for tolino by hasezoey · Pull Request #9503 · koreader/koreader

hasezoey · 2022-09-10T15:20:54Z

This PR adds a device/tolino directory with device.lua and event_map.lua and for now only detects and uses custom event_map configuration for model E70K00, uses android as base and fallback if model is not detected

fixes #9175

requires koreader/android-luajit-launcher#381 (this is why this PR is a DRAFT)

This change is

NiLuJe · 2022-09-10T15:41:33Z

I'd possibly reduce and clarify the mapping by just loading the android table in... a table; and just overriding the few fields you need in there, and return that.

It'll make the file smaller, and the intent much clearer ;).

hasezoey · 2022-09-10T15:45:05Z

I'd possibly reduce and clarify the mapping by just loading the android table in... a table; and just overriding the few fields you need in there, and return that.

It'll make the file smaller, and the intent much clearer ;).

i am still quite new to lua (and java for that matter), so i dont quite know to consolidate what to where
if you mean putting the changed buttons into device/android/device_map, then it is not really possible without overwriting the existing mappings for these values (values used are 21 and 22)

NiLuJe · 2022-09-10T15:47:16Z

I simply meant that your new event map should essentially be something to the effect of

local keymap = require("blah/blah/android/event_map")
keymap.ChangedKeyCode = "New_Event"

return keymap

(Obviously, fix the path first, I don't remember 'em by rote ;p).

… modify changed values

hasezoey · 2022-09-10T17:38:50Z

I simply meant that your new event map should essentially be something to the effect of

fixed with b7df2ee

this is because there is not actual indication of full name, only hardwaretype

hasezoey · 2022-09-10T17:41:48Z

in cf207b2 i changed the name from TolinoVision5 (including property model) to rather be based on ro.product.hardwareType (or Build.HARDWARE) because there is no actual indication in android itself that it is a Vision 5

hasezoey · 2022-09-10T18:19:18Z

with c7bf69c i added property frontlight_settings for TolinoE70K00 because those leds exists and i could figure out what is what (thanks to the base tolino app), but i think it will not have any effect because those files are not writeable

for context that is what the following values are at 25% color temp (what the tolino app reports as 25 in logcat):

$ cat /sys/class/backlight/lm3630a_led/brightness
15
$ cat /sys/class/backlight/lm3630a_leda/brightness
133
$ cat /sys/class/backlight/lm3630a_ledb/brightness
87

also assuming it is RGB because of

$ cat /sys/class/backlight/lm3630a_led/max_brightness
255

and that the color in a color picker looks similar enough to the color displayed on device (for quick reference #85570f is the hex color)

For Reference a Color Picker with the values put in

NiLuJe · 2022-09-10T20:43:07Z

The lights stuff is indeed going to be useless without root, but, for curiosity's sake, take a look at how this is handled on Kobo, because that's the same controller (although I'm pretty sure we use the kernel's tables for those instead of setting each led individually).

hasezoey · 2022-09-11T08:34:41Z

The lights stuff is indeed going to be useless without root, but, for curiosity's sake, take a look at how this is handled on Kobo, because that's the same controller (although I'm pretty sure we use the kernel's tables for those instead of setting each led individually).

from what i can tell in Onxy*Controller.kt files in /sys/class/backlight/(white/warm) are used to set the warmth, which dont exist in tolino
and in device/kobo/device.lua frontlight_settings are also set with leds(sysfs), which in the tolino are not writeable
and device/kobo/powerd.lua uses the nickel_conf, which has a path of /mnt/onboard/.kobo/Kobo/Kobo eReader.conf, but does not exist in tolino
and from what i can tell, kobo does not use ntx_io to set any light stuff, though that thing exists in tolino, but i dont know what to poke to try if light would work

hasezoey · 2022-09-11T14:55:35Z

Update to my previous search for setting the warmth on Tolino, ref: koreader/android-luajit-launcher#351 (comment)

TL;DR: it is possible with /dev/ntx_io id 248 (scale 0-10)

pazos

Please:

Do not touch frontend/device.lua
Do not add frontend/device/tolino files

The only change I see is in a couple of key remaps. If you want to do that just do it in frontend/android/device.lua.

Something along the lines of:

-- generic android event map
local android_event_map = require("device/android/event_map")

-- my tolino does that
if condition then
    android_event_map[21] = "LPgBack"
    android_event_map[22] = "LPgFwd"
end

self.input.event_map = android.event_map

please use android.product to check your condition.

pazos · 2022-09-11T15:32:30Z

+-- Tolino Vision 5, hardware model "E70K00"
+local TolinoE70K00 = TolinoDevice:new{
+    model = "Tolino_E70K00",
+    hasEinkScreen = yes,


I'm afraid this doesn't work that way.

Here you're saying: hey I'm a eink screen. Let me refresh myself, but you didn't specify the driver kind, the type of waveforms you support....

With that option alone you won't get proper refreshes. Only a handful of messages on the log buffer saying that FakeEPDController issued some updates.

pazos · 2022-09-11T15:33:56Z

+local TolinoE70K00 = TolinoDevice:new{
+    model = "Tolino_E70K00",
+    hasEinkScreen = yes,
+    frontlight_settings = {


even if that works, the proper abstraction is in android-luajit-launcher, for both epd and lights driver. Please do that there so you won't break other widgets (ie: the native frontlight widget doesn't understand your code here)

even if that works, the proper abstraction is in android-luajit-launcher

i basically copied it from device/kobo/device for future reference

hasezoey · 2022-09-11T15:46:21Z

please use android.product to check your condition.

i dont know if this would be correct, because that would report ntx_6sl,which would also match for Tolino Shine 3 but having a different hardwareType (Vision5 is E70K00 where as Shine3 is e60k00) - i dont know if the other models use the same mapping

pazos · 2022-09-11T15:52:13Z

please use android.product to check your condition.

i dont know if this would be correct, because that would report ntx_6sl,which would also match for Tolino Shine 3 but having a different hardwareType (Vision5 is E70K00 where as Shine3 is e60k00) - i dont know if the other models use the same mapping

They're using the same mapping.

IMHO this PR can be replaced with a simple user keymapping, as already covered in the wiki.

https://github.com/koreader/koreader/wiki/Android-tips-and-tricks#example-2-add-support-for-the-custom-keys-used-on-the-tolino-epos-2

If you want to workaround this without the need for user specific keymappings then please add an IS_TOLINO in android-luajit-launcher's DeviceInfo that includes current TOLINO definition and your own TOLINO_VISION5 (in case your vision isn't recognized already as a TOLINO) and just do a generic check here.

hasezoey · 2022-09-11T17:25:53Z

If you want to workaround this without the need for user specific keymappings then please add an IS_TOLINO in android-luajit-launcher's DeviceInfo that includes current TOLINO definition and your own TOLINO_VISION5 (in case your vision isn't recognized already as a TOLINO) and just do a generic check here.

from what i can tell all tolinos have android.prop.model as tolino, i am just unsure to add it for all tolinos not knowing if they use the same buttons and events

also thanks for linking me to the wiki, i kinda forgot github has this because other projects either dont have it or are just template or are way too outdated

hasezoey · 2022-09-11T17:32:13Z

@pazos is #9509 better? when yes, i will close this PR

hasezoey · 2022-09-14T14:55:27Z

closing in favor of #9509 and koreader/android-luajit-launcher#382

hasezoey added 2 commits September 10, 2022 17:20

feat(device.lua): add custom options for tolino

e99f928

style(tolino/device.lua): remove commented-out code

3c5d42d

NiLuJe reviewed Sep 10, 2022

View reviewed changes

Comment thread frontend/device/tolino/device.lua Outdated

hasezoey added 2 commits September 10, 2022 19:28

style(tolino/device.lua): switch around words

6e46acd

refactor(tolino/event_map): refactor to use android eventmap and only…

b7df2ee

… modify changed values

fix(tolino/device): change name from vision5 to "TolinoE70K00"

cf207b2

this is because there is not actual indication of full name, only hardwaretype

feat(tolino/device): add "frontlight_settings" to "TolinoE70K00"

c7bf69c

pazos requested changes Sep 11, 2022

View reviewed changes

pazos reviewed Sep 11, 2022

View reviewed changes

hasezoey mentioned this pull request Sep 11, 2022

LightController for Tolinos without/with different warmth koreader/android-luajit-launcher#351

Closed

hasezoey mentioned this pull request Sep 11, 2022

feat(device/android/device): add custom mapping for tolino buttons #9509

Merged

hasezoey closed this Sep 14, 2022

hasezoey deleted the addTolinoButtons branch September 14, 2022 14:55

Uh oh!

Uh oh!

Conversation

hasezoey commented Sep 10, 2022 • edited by Frenzie Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NiLuJe commented Sep 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

hasezoey commented Sep 10, 2022

Uh oh!

NiLuJe commented Sep 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hasezoey commented Sep 10, 2022

Uh oh!

hasezoey commented Sep 10, 2022

Uh oh!

hasezoey commented Sep 10, 2022

Uh oh!

NiLuJe commented Sep 10, 2022

Uh oh!

hasezoey commented Sep 11, 2022

Uh oh!

hasezoey commented Sep 11, 2022

Uh oh!

pazos left a comment

Choose a reason for hiding this comment

Uh oh!

pazos Sep 11, 2022

Choose a reason for hiding this comment

Uh oh!

pazos Sep 11, 2022

Choose a reason for hiding this comment

Uh oh!

hasezoey Sep 11, 2022

Choose a reason for hiding this comment

Uh oh!

hasezoey commented Sep 11, 2022

Uh oh!

pazos commented Sep 11, 2022

Uh oh!

hasezoey commented Sep 11, 2022

Uh oh!

hasezoey commented Sep 11, 2022

Uh oh!

hasezoey commented Sep 14, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hasezoey commented Sep 10, 2022 •

edited by Frenzie

Loading

NiLuJe commented Sep 10, 2022 •

edited

Loading

NiLuJe commented Sep 10, 2022 •

edited

Loading