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.

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

Unbreak FL widget on !NTX devices #4921

Merged
merged 5 commits into from Apr 15, 2019

Conversation

Projects
None yet
3 participants
@NiLuJe
Copy link
Member

commented Apr 14, 2019

Those caps are NTX only

Fix #4919

Regression since #4901

@houqp

houqp approved these changes Apr 14, 2019

Copy link
Member

left a comment

would it be better to add the following to device/generic/device.lua?

hasNaturalLightMixer = no,
hasNaturalLight = no, 

This way, those two methods are always safe to use anywhere in the code and UI code won't need to know the device model it is dealing with.

@NiLuJe

This comment has been minimized.

Copy link
Member Author

commented Apr 14, 2019

That's what I was wondering, too.

For reference, that device check was how it used to be, and what I broke in #4901

This isn't used in many places, IIRC, but making it safe to use without having to think about that sounds like a Good Plan regardless ;).

@Frenzie

This comment has been minimized.

Copy link
Member

commented Apr 14, 2019

@NiLuJe Kinda off-topic, but just a quick note may suffice. The frontlight keeps turning on after standby since your recent changes on my H2O.

Make hasNaturalLight* caps safe to call without a device check.
Make it clear that it's expecting the NTX implementation, though.

(i.e., the day Amazon implements warmth control,
it'll probably need another backend & cap).
@NiLuJe

This comment has been minimized.

Copy link
Member Author

commented Apr 14, 2019

@Frenzie : Huh, do you mean it stays on during standby? Or it starts getting turned off and then gets turned back on again?

@Frenzie

This comment has been minimized.

Copy link
Member

commented Apr 14, 2019

  1. Turn it off.
  2. Standby.
  3. Wake up.
  4. Light is on again.
@NiLuJe

This comment has been minimized.

Copy link
Member Author

commented Apr 14, 2019

@Frenzie : Oh, right, that makes sense. I'll take care of that ;).

NiLuJe added some commits Apr 15, 2019

@NiLuJe NiLuJe merged commit 33946aa into koreader:master Apr 15, 2019

1 check passed

ci/circleci Your tests passed on CircleCI!
Details

@Frenzie Frenzie added this to the 2019.05 milestone Apr 19, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.