Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-16 06:12:56 +00:00
Code Issues Projects Releases Wiki Activity
8e1bb9bafc
koreader/spec/unit/device_spec.lua

304 lines
11 KiB
Lua
Raw Normal View History

kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
describe("device module", function()
Travis: run luacheck on unit tests (#3059) * Travis: run luacheck on unit tests
2017-08-08 20:35:40 +00:00
-- luacheck: push ignore
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
local mock_fb, mock_input
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
local iopen = io.open
local osgetenv = os.getenv
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
local ffi, C
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
setup(function()
mock_fb = {
new = function()
return {
Geom: nil guard a few rect methods (#7664) We've managed to trip a few of those on dimen fields post-init but pre-paintTo in a few weird coner-cases, a point at which dimen is often nil. ConfigDialog: Deal with that very thing in update() Fix #7656
2021-05-13 11:05:05 +00:00
getRawSize = function() return {w = 600, h = 800} end,
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
getWidth = function() return 600 end,
getDPI = function() return 72 end,
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
setViewport = function() end,
getRotationMode = function() return 0 end,
getScreenMode = function() return "portrait" end,
setRotationMode = function() end,
GestureDetector: Full refactor for almost-sane(TM) MT gesture handling (#9463) Should hopefully make two-contact gestures *much* more reliable, among other things. See the PR for all the details ;).
2022-09-04 00:38:27 +00:00
scaleByDPI = function(this, dp) return math.ceil(dp * this:getDPI() / 160) end,
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
}
end
}
require("commonrequire")
Move kobo auto-suspension logic out of UIManager (#2933)
2017-06-23 17:04:11 +00:00
package.unloadAll()
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
ffi = require("ffi")
C = ffi.C
require("ffi/linux_input_h")
rename runtimectl to document/canvascontext
2019-02-18 16:01:00 +00:00
require("document/canvascontext"):init(require("device"))
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
end)
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
before_each(function()
package.loaded['ffi/framebuffer_mxcfb'] = mock_fb
mock_input = require('device/input')
stub(mock_input, "open")
stub(os, "getenv")
stub(os, "execute")
end)
after_each(function()
mock_input.open:revert()
os.getenv:revert()
os.execute:revert()
os.getenv = osgetenv
io.open = iopen
end)
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
describe("kobo", function()
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
local TimeVal
chore: move kobo specific code into kobo/device.lua
2016-09-12 04:41:56 +00:00
local NickelConf
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
setup(function()
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
TimeVal = require("ui/timeval")
chore: move kobo specific code into kobo/device.lua
2016-09-12 04:41:56 +00:00
NickelConf = require("device/kobo/nickel_conf")
end)
before_each(function()
stub(NickelConf.frontLightLevel, "get")
NickelConf.frontLightLevel.get.returns(0)
stub(NickelConf.frontLightState, "get")
end)
after_each(function()
NickelConf.frontLightLevel.get:revert()
NickelConf.frontLightState.get:revert()
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
end)
it("should initialize properly on Kobo dahlia", function()
os.getenv.returns("dahlia")
local kobo_dev = require("device/kobo/device")
kobo_dev:init()
assert.is.same("Kobo_dahlia", kobo_dev.model)
end)
it("should setup eventAdjustHooks properly for input in trilogy", function()
os.getenv.invokes(function(key)
if key == "PRODUCT" then
return "trilogy"
else
Another round of Kobo Fixes (#3939) * Trim unneeded stuff from startup script I was somehow convinced I'd already done that... While we're there, explain why we need to siphon those specific vars * Fix a stray eth0 -> $INTERFACE * Be very very sure we have INTERFACE set in our env re #3936 * Make getFirmwareVersion less fragile on Kobo Not that we actually use it right now, but, still. :D * Use the same syntax as the PRODUCT check * Actually implement getProductId Instead of a stray c/p ^^ * Properly identify the Rev2/Mark7 variants of existing devices Namely, the H2O² and Aura SE Not that the H2O²r2 support is still broken, this just allows us to implement it cleanyl without breaking handling of the original H2O² re #3925 * Tweak sleeps a bit around Kobo WiFi modules... See if that jog things up (re #3936) * Try harder not to suspend with WiFi on on Kobos Because otherwise, things go boom. (re #3936)
2018-05-10 10:26:07 +00:00
return osgetenv(key)
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
end
end)
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
package.loaded['device/kobo/device'] = nil
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
local kobo_dev = require("device/kobo/device")
kobo_dev:init()
local Screen = kobo_dev.screen
assert.is.same("Kobo_trilogy", kobo_dev.model)
assert.truthy(kobo_dev:needsTouchScreenProbe())
G_reader_settings:saveSetting("kobo_touch_switch_xy", true)
kobo_dev:touchScreenProbe()
local x, y = Screen:getWidth()-5, 10
-- mirror x, then switch_xy
local ev_x = {
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
type = C.EV_ABS,
code = C.ABS_X,
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
value = y,
The great Input/GestureDetector/TimeVal spring cleanup (a.k.a., a saner main loop) (#7415) * ReaderDictionary: Port delay computations to TimeVal * ReaderHighlight: Port delay computations to TimeVal * ReaderView: Port delay computations to TimeVal * Android: Reset gesture detection state on APP_CMD_TERM_WINDOW. This prevents potentially being stuck in bogus gesture states when switching apps. * GestureDetector: * Port delay computations to TimeVal * Fixed delay computations to handle time warps (large and negative deltas). * Simplified timed callback handling to invalidate timers much earlier, preventing accumulating useless timers that no longer have any chance of ever detecting a gesture. * Fixed state clearing to handle the actual effective slots, instead of hard-coding slot 0 & slot 1. * Simplified timed callback handling in general, and added support for a timerfd backend for better performance and accuracy. * The improved timed callback handling allows us to detect and honor (as much as possible) the three possible clock sources usable by Linux evdev events. The only case where synthetic timestamps are used (and that only to handle timed callbacks) is limited to non-timerfd platforms where input events use a clock source that is *NOT* MONOTONIC. AFAICT, that's pretty much... PocketBook, and that's it? * Input: * Use the <linux/input.h> FFI module instead of re-declaring every constant * Fixed (verbose) debug logging of input events to actually translate said constants properly. * Completely reset gesture detection state on suspend. This should prevent bogus gesture detection on resume. * Refactored the waitEvent loop to make it easier to comprehend (hopefully) and much more efficient. Of specific note, it no longer does a crazy select spam every 100µs, instead computing and relying on sane timeouts, as afforded by switching the UI event/input loop to the MONOTONIC time base, and the refactored timed callbacks in GestureDetector. * reMarkable: Stopped enforcing synthetic timestamps on input events, as it should no longer be necessary. * TimeVal: * Refactored and simplified, especially as far as metamethods are concerned (based on <bsd/sys/time.h>). * Added a host of new methods to query the various POSIX clock sources, and made :now default to MONOTONIC. * Removed the debug guard in __sub, as time going backwards can be a perfectly normal occurrence. * New methods: * Clock sources: :realtime, :monotonic, :monotonic_coarse, :realtime_coarse, :boottime * Utility: :tonumber, :tousecs, :tomsecs, :fromnumber, :isPositive, :isZero * UIManager: * Ported event loop & scheduling to TimeVal, and switched to the MONOTONIC time base. This ensures reliable and consistent scheduling, as time is ensured never to go backwards. * Added a :getTime() method, that returns a cached TimeVal:now(), updated at the top of every UI frame. It's used throughout the codebase to cadge a syscall in circumstances where we are guaranteed that a syscall would return a mostly identical value, because very few time has passed. The only code left that does live syscalls does it because it's actually necessary for accuracy, and the only code left that does that in a REALTIME time base is code that *actually* deals with calendar time (e.g., Statistics). * DictQuickLookup: Port delay computations to TimeVal * FootNoteWidget: Port delay computations to TimeVal * HTMLBoxWidget: Port delay computations to TimeVal * Notification: Port delay computations to TimeVal * TextBoxWidget: Port delay computations to TimeVal * AutoSuspend: Port to TimeVal * AutoTurn: * Fix it so that settings are actually honored. * Port to TimeVal * BackgroundRunner: Port to TimeVal * Calibre: Port benchmarking code to TimeVal * BookInfoManager: Removed unnecessary yield in the metadata extraction subprocess now that subprocesses get scheduled properly. * All in all, these changes reduced the CPU cost of a single tap by a factor of ten (!), and got rid of an insane amount of weird poll/wakeup cycles that must have been hell on CPU schedulers and batteries..
2021-03-30 00:57:59 +00:00
time = TimeVal:realtime(),
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
}
local ev_y = {
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
type = C.EV_ABS,
code = C.ABS_Y,
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
value = Screen:getWidth()-x,
The great Input/GestureDetector/TimeVal spring cleanup (a.k.a., a saner main loop) (#7415) * ReaderDictionary: Port delay computations to TimeVal * ReaderHighlight: Port delay computations to TimeVal * ReaderView: Port delay computations to TimeVal * Android: Reset gesture detection state on APP_CMD_TERM_WINDOW. This prevents potentially being stuck in bogus gesture states when switching apps. * GestureDetector: * Port delay computations to TimeVal * Fixed delay computations to handle time warps (large and negative deltas). * Simplified timed callback handling to invalidate timers much earlier, preventing accumulating useless timers that no longer have any chance of ever detecting a gesture. * Fixed state clearing to handle the actual effective slots, instead of hard-coding slot 0 & slot 1. * Simplified timed callback handling in general, and added support for a timerfd backend for better performance and accuracy. * The improved timed callback handling allows us to detect and honor (as much as possible) the three possible clock sources usable by Linux evdev events. The only case where synthetic timestamps are used (and that only to handle timed callbacks) is limited to non-timerfd platforms where input events use a clock source that is *NOT* MONOTONIC. AFAICT, that's pretty much... PocketBook, and that's it? * Input: * Use the <linux/input.h> FFI module instead of re-declaring every constant * Fixed (verbose) debug logging of input events to actually translate said constants properly. * Completely reset gesture detection state on suspend. This should prevent bogus gesture detection on resume. * Refactored the waitEvent loop to make it easier to comprehend (hopefully) and much more efficient. Of specific note, it no longer does a crazy select spam every 100µs, instead computing and relying on sane timeouts, as afforded by switching the UI event/input loop to the MONOTONIC time base, and the refactored timed callbacks in GestureDetector. * reMarkable: Stopped enforcing synthetic timestamps on input events, as it should no longer be necessary. * TimeVal: * Refactored and simplified, especially as far as metamethods are concerned (based on <bsd/sys/time.h>). * Added a host of new methods to query the various POSIX clock sources, and made :now default to MONOTONIC. * Removed the debug guard in __sub, as time going backwards can be a perfectly normal occurrence. * New methods: * Clock sources: :realtime, :monotonic, :monotonic_coarse, :realtime_coarse, :boottime * Utility: :tonumber, :tousecs, :tomsecs, :fromnumber, :isPositive, :isZero * UIManager: * Ported event loop & scheduling to TimeVal, and switched to the MONOTONIC time base. This ensures reliable and consistent scheduling, as time is ensured never to go backwards. * Added a :getTime() method, that returns a cached TimeVal:now(), updated at the top of every UI frame. It's used throughout the codebase to cadge a syscall in circumstances where we are guaranteed that a syscall would return a mostly identical value, because very few time has passed. The only code left that does live syscalls does it because it's actually necessary for accuracy, and the only code left that does that in a REALTIME time base is code that *actually* deals with calendar time (e.g., Statistics). * DictQuickLookup: Port delay computations to TimeVal * FootNoteWidget: Port delay computations to TimeVal * HTMLBoxWidget: Port delay computations to TimeVal * Notification: Port delay computations to TimeVal * TextBoxWidget: Port delay computations to TimeVal * AutoSuspend: Port to TimeVal * AutoTurn: * Fix it so that settings are actually honored. * Port to TimeVal * BackgroundRunner: Port to TimeVal * Calibre: Port benchmarking code to TimeVal * BookInfoManager: Removed unnecessary yield in the metadata extraction subprocess now that subprocesses get scheduled properly. * All in all, these changes reduced the CPU cost of a single tap by a factor of ten (!), and got rid of an insane amount of weird poll/wakeup cycles that must have been hell on CPU schedulers and batteries..
2021-03-30 00:57:59 +00:00
time = TimeVal:realtime(),
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
}
kobo_dev.input:eventAdjustHook(ev_x)
kobo_dev.input:eventAdjustHook(ev_y)
assert.is.same(x, ev_y.value)
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
assert.is.same(C.ABS_X, ev_y.code)
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
assert.is.same(y, ev_x.value)
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
assert.is.same(C.ABS_Y, ev_x.code)
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
-- reset eventAdjustHook
kobo_dev.input.eventAdjustHook = function() end
end)
it("should setup eventAdjustHooks properly for trilogy with non-epoch ev time", function()
Devices: get rid of touch_probe_ev_epoch_time On devices where the event time is the uptime (time since boot), we don't need to trash it and use TimeVal:now() and lose precision. We can still use these times for relative delays and durations computations, which is mostly all we use them for. We just need a real clock time in GestureDetector for two timers (long-press and double tap), where we do the event time type detection on the first event, on all devices.
2020-10-18 13:57:42 +00:00
-- This has no more value since #6798 as ev time can now stay
-- non-epoch. Adjustments are made on first event handled, and
-- have only effects when handling long-press (so, the long-press
-- for dict lookup tests with test this).
-- We just check here it still works with non-epoch ev time, as previous test
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
os.getenv.invokes(function(key)
if key == "PRODUCT" then
return "trilogy"
else
Another round of Kobo Fixes (#3939) * Trim unneeded stuff from startup script I was somehow convinced I'd already done that... While we're there, explain why we need to siphon those specific vars * Fix a stray eth0 -> $INTERFACE * Be very very sure we have INTERFACE set in our env re #3936 * Make getFirmwareVersion less fragile on Kobo Not that we actually use it right now, but, still. :D * Use the same syntax as the PRODUCT check * Actually implement getProductId Instead of a stray c/p ^^ * Properly identify the Rev2/Mark7 variants of existing devices Namely, the H2O² and Aura SE Not that the H2O²r2 support is still broken, this just allows us to implement it cleanyl without breaking handling of the original H2O² re #3925 * Tweak sleeps a bit around Kobo WiFi modules... See if that jog things up (re #3936) * Try harder not to suspend with WiFi on on Kobos Because otherwise, things go boom. (re #3936)
2018-05-10 10:26:07 +00:00
return osgetenv(key)
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
end
end)
A few Kobo input tweaks (#4450) * Fix the Touch input probe on Trilogy devices that depend on the touch_probe_ev_epoch_time quirk (fix #630) * Expose a "Pageturn button inversion" feature in the Navigation menu (for all devices with keys) (fix #4446) * Allow ignoring the accelerometer on the Forma (Screen > Ignore accelerometer rotation events; also available from the Gesture Manager) (fix #4451) * Fix SleepCover handling on the Forma (fix #4457) * Make isWifiOn a tiny bit more accurate (check the actual WiFi module instead of sdio_wifi_pwr) * Move all flash related Screen options to the eInk submenu
2019-01-08 01:59:47 +00:00
package.loaded['device/kobo/device'] = nil
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
local kobo_dev = require("device/kobo/device")
kobo_dev:init()
local Screen = kobo_dev.screen
assert.is.same("Kobo_trilogy", kobo_dev.model)
A few Kobo input tweaks (#4450) * Fix the Touch input probe on Trilogy devices that depend on the touch_probe_ev_epoch_time quirk (fix #630) * Expose a "Pageturn button inversion" feature in the Navigation menu (for all devices with keys) (fix #4446) * Allow ignoring the accelerometer on the Forma (Screen > Ignore accelerometer rotation events; also available from the Gesture Manager) (fix #4451) * Fix SleepCover handling on the Forma (fix #4457) * Make isWifiOn a tiny bit more accurate (check the actual WiFi module instead of sdio_wifi_pwr) * Move all flash related Screen options to the eInk submenu
2019-01-08 01:59:47 +00:00
assert.truthy(kobo_dev:needsTouchScreenProbe())
kobo_dev:touchScreenProbe()
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
local x, y = Screen:getWidth()-5, 10
local ev_x = {
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
type = C.EV_ABS,
code = C.ABS_X,
Devices: get rid of touch_probe_ev_epoch_time On devices where the event time is the uptime (time since boot), we don't need to trash it and use TimeVal:now() and lose precision. We can still use these times for relative delays and durations computations, which is mostly all we use them for. We just need a real clock time in GestureDetector for two timers (long-press and double tap), where we do the event time type detection on the first event, on all devices.
2020-10-18 13:57:42 +00:00
value = y,
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
time = {sec = 1000}
}
local ev_y = {
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
type = C.EV_ABS,
code = C.ABS_Y,
Devices: get rid of touch_probe_ev_epoch_time On devices where the event time is the uptime (time since boot), we don't need to trash it and use TimeVal:now() and lose precision. We can still use these times for relative delays and durations computations, which is mostly all we use them for. We just need a real clock time in GestureDetector for two timers (long-press and double tap), where we do the event time type detection on the first event, on all devices.
2020-10-18 13:57:42 +00:00
value = Screen:getWidth()-x,
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
time = {sec = 1000}
}
kobo_dev.input:eventAdjustHook(ev_x)
kobo_dev.input:eventAdjustHook(ev_y)
Devices: get rid of touch_probe_ev_epoch_time On devices where the event time is the uptime (time since boot), we don't need to trash it and use TimeVal:now() and lose precision. We can still use these times for relative delays and durations computations, which is mostly all we use them for. We just need a real clock time in GestureDetector for two timers (long-press and double tap), where we do the event time type detection on the first event, on all devices.
2020-10-18 13:57:42 +00:00
assert.is.same(x, ev_y.value)
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
assert.is.same(C.ABS_X, ev_y.code)
Devices: get rid of touch_probe_ev_epoch_time On devices where the event time is the uptime (time since boot), we don't need to trash it and use TimeVal:now() and lose precision. We can still use these times for relative delays and durations computations, which is mostly all we use them for. We just need a real clock time in GestureDetector for two timers (long-press and double tap), where we do the event time type detection on the first event, on all devices.
2020-10-18 13:57:42 +00:00
assert.is.same(y, ev_x.value)
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
assert.is.same(C.ABS_Y, ev_x.code)
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
A few Kobo input tweaks (#4450) * Fix the Touch input probe on Trilogy devices that depend on the touch_probe_ev_epoch_time quirk (fix #630) * Expose a "Pageturn button inversion" feature in the Navigation menu (for all devices with keys) (fix #4446) * Allow ignoring the accelerometer on the Forma (Screen > Ignore accelerometer rotation events; also available from the Gesture Manager) (fix #4451) * Fix SleepCover handling on the Forma (fix #4457) * Make isWifiOn a tiny bit more accurate (check the actual WiFi module instead of sdio_wifi_pwr) * Move all flash related Screen options to the eInk submenu
2019-01-08 01:59:47 +00:00
-- reset eventAdjustHook
automatically adjust ev time for kobo touch
2016-05-24 05:38:08 +00:00
kobo_dev.input.eventAdjustHook = function() end
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
end)
test: flush book settings before suspend
2016-05-02 08:35:06 +00:00
it("should flush book settings before suspend", function()
local sample_pdf = "spec/front/unit/data/tall.pdf"
local ReaderUI = require("apps/reader/readerui")
local Device = require("device")
NickelConf.frontLightLevel.get.returns(1)
NickelConf.frontLightState.get.returns(0)
local UIManager = require("ui/uimanager")
stub(Device, "suspend")
stub(Device.powerd, "beforeSuspend")
stub(Device, "isKobo")
Device.isKobo.returns(true)
UIManager:init()
ReaderUI:doShowReader(sample_pdf)
local readerui = ReaderUI._getRunningInstance()
stub(readerui, "onFlushSettings")
UIManager.event_handlers["PowerPress"]()
UIManager.event_handlers["PowerRelease"]()
assert.stub(readerui.onFlushSettings).was_called()
Device.suspend:revert()
Device.powerd.beforeSuspend:revert()
Device.isKobo:revert()
fix unit test of readerlink and readerpaging and have more confidence with the unit testing framework. Now `make testfront` won't retry on failure and testing files are ordered in each run so that it's possible to reproduce testing failure. And this patch also fix flush settings not working before suspend issue: at some point the `FlushSettings` event is sent to `UIManager` instead of `ReaderUI`, but `UIManager` only delegated events to active widgets and `ReaderUI` is actually not an active widgets thus will miss the event. This patch also add a verbose debug mode with "-v" as a switch to turn on this mode. With verbose mode on, event handling will be logged.
2016-08-12 06:05:18 +00:00
readerui.onFlushSettings:revert()
test: flush book settings before suspend
2016-05-02 08:35:06 +00:00
readerui:onClose()
end)
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
end)
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
describe("kindle", function()
fix broken unit tests on Travis CI 1. It turns out that `device_id` is not defined in unit test environment which makes the `assert(self.kosync_device_id)` fail and somehow makes `luajit` segmentation fault. 2. In the device spec, stubbing `io.open` will make subsquent `require` all return boolean value and segmentation fault `luajit`. This patch is a minimum viable change that makes CI work on both my local box and Travis.
2016-08-11 09:12:55 +00:00
it("should initialize voyage without error", function()
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
io.open = function(filename, mode)
if filename == "/proc/usid" then
return {
Fix Kindle model detection in some corner-cases (#5125) * Fix Kindle model detection in some corner-cases We were (currently) unaffected because we don't support the K1. Still, this should be slightly more robust.
2019-07-19 21:16:25 +00:00
read = function() return "B013XX" end,
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
close = function() end
}
else
return iopen(filename, mode)
end
end
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
local kindle_dev = require('device/kindle/device')
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
assert.is.same(kindle_dev.model, "KindleVoyage")
kindle_dev:init()
assert.is.same(kindle_dev.input.event_map[104], "LPgBack")
assert.is.same(kindle_dev.input.event_map[109], "LPgFwd")
assert.is.same(kindle_dev.powerd.fl_min, 0)
[Kindle] More accurate on/off FL detection/toggle (#5989) * Kindle FL shenanigans Either fix #5986, or break a whole crapload of weird corner-cases. Possibly the insane AutoFrontLight checks. * Make fl step 0 usable on devices where 0 doesn't turn the light off. By fudging an extra step on our own side. * Also, add some debug logging around wmctrl to try to figure out what's happening there...
2020-03-26 03:56:34 +00:00
-- NOTE: fl_max + 1 since #5989
assert.is.same(kindle_dev.powerd.fl_max, 25)
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
end)
it("should toggle frontlight", function()
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
io.open = function(filename, mode)
if filename == "/proc/usid" then
return {
Fix Kindle model detection in some corner-cases (#5125) * Fix Kindle model detection in some corner-cases We were (currently) unaffected because we don't support the K1. Still, this should be slightly more robust.
2019-07-19 21:16:25 +00:00
read = function() return "B013XX" end,
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
close = function() end
}
elseif filename == "/sys/class/backlight/max77696-bl/brightness" then
return {
Cleanup eye-gouging madness around io.read calls (#7149) * Don't reinvent the wheel when reading a one-line int or string from sysfs * Simplify a whole other bunch of read calls
2021-01-16 03:41:46 +00:00
read = function() return 12 end,
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
close = function() end
}
else
return iopen(filename, mode)
end
end
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
local kindle_dev = require("device/kindle/device")
kindle_dev:init()
assert.is.same(kindle_dev.powerd.fl_intensity, 12)
kindle_dev.powerd:setIntensity(5)
assert.is.same(kindle_dev.powerd.fl_intensity, 5)
kindle_dev.powerd:toggleFrontlight()
assert.stub(os.execute).was_called_with(
OTA: Handle tar checkpointing visual feedback w/ an FBInk daemon (#7588) Instead of forking it on every checkpoint. Won't change much in the grand scheme of things, but FIFOs are fun.
2021-04-24 23:15:38 +00:00
"printf '%s' 0 > /sys/class/backlight/max77696-bl/brightness")
A few Kindle fixes (#4394) * Implement isWifiOn on Kindle (fix #4380) * Ensure frontlight intensity is properly restored on resume on Kindle. (fix #Fix #4392) Only actually matters when the frontlight is *off*.
2018-12-10 21:10:35 +00:00
-- Here be shenanigans: we don't override powerd's fl_intensity when we turn the light off,
-- so that we can properly turn it back on at the previous intensity ;)
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
assert.is.same(kindle_dev.powerd.fl_intensity, 5)
A few Kindle fixes (#4394) * Implement isWifiOn on Kindle (fix #4380) * Ensure frontlight intensity is properly restored on resume on Kindle. (fix #Fix #4392) Only actually matters when the frontlight is *off*.
2018-12-10 21:10:35 +00:00
-- But if we were to cat /sys/class/backlight/max77696-bl/brightness, it should now be 0.
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
kindle_dev.powerd:toggleFrontlight()
A few Kindle fixes (#4394) * Implement isWifiOn on Kindle (fix #4380) * Ensure frontlight intensity is properly restored on resume on Kindle. (fix #Fix #4392) Only actually matters when the frontlight is *off*.
2018-12-10 21:10:35 +00:00
assert.is.same(kindle_dev.powerd.fl_intensity, 5)
-- And /sys/class/backlight/max77696-bl/brightness is now !0
-- (exact value is HW-dependent, each model has a different curve, we let lipc do the work for us).
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
end)
it("oasis should interpret orientation event", function()
Move kobo auto-suspension logic out of UIManager (#2933)
2017-06-23 17:04:11 +00:00
package.unload('device/kindle/device')
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
io.open = function(filename, mode)
if filename == "/proc/usid" then
return {
read = function()
Fix Kindle model detection in some corner-cases (#5125) * Fix Kindle model detection in some corner-cases We were (currently) unaffected because we don't support the K1. Still, this should be slightly more robust.
2019-07-19 21:16:25 +00:00
return "G0B0GCXXX"
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
end,
close = function() end
}
else
return iopen(filename, mode)
end
end
mock_ffi_input = require('ffi/input')
stub(mock_ffi_input, "waitForEvent")
The great Input/GestureDetector/TimeVal spring cleanup (a.k.a., a saner main loop) (#7415) * ReaderDictionary: Port delay computations to TimeVal * ReaderHighlight: Port delay computations to TimeVal * ReaderView: Port delay computations to TimeVal * Android: Reset gesture detection state on APP_CMD_TERM_WINDOW. This prevents potentially being stuck in bogus gesture states when switching apps. * GestureDetector: * Port delay computations to TimeVal * Fixed delay computations to handle time warps (large and negative deltas). * Simplified timed callback handling to invalidate timers much earlier, preventing accumulating useless timers that no longer have any chance of ever detecting a gesture. * Fixed state clearing to handle the actual effective slots, instead of hard-coding slot 0 & slot 1. * Simplified timed callback handling in general, and added support for a timerfd backend for better performance and accuracy. * The improved timed callback handling allows us to detect and honor (as much as possible) the three possible clock sources usable by Linux evdev events. The only case where synthetic timestamps are used (and that only to handle timed callbacks) is limited to non-timerfd platforms where input events use a clock source that is *NOT* MONOTONIC. AFAICT, that's pretty much... PocketBook, and that's it? * Input: * Use the <linux/input.h> FFI module instead of re-declaring every constant * Fixed (verbose) debug logging of input events to actually translate said constants properly. * Completely reset gesture detection state on suspend. This should prevent bogus gesture detection on resume. * Refactored the waitEvent loop to make it easier to comprehend (hopefully) and much more efficient. Of specific note, it no longer does a crazy select spam every 100µs, instead computing and relying on sane timeouts, as afforded by switching the UI event/input loop to the MONOTONIC time base, and the refactored timed callbacks in GestureDetector. * reMarkable: Stopped enforcing synthetic timestamps on input events, as it should no longer be necessary. * TimeVal: * Refactored and simplified, especially as far as metamethods are concerned (based on <bsd/sys/time.h>). * Added a host of new methods to query the various POSIX clock sources, and made :now default to MONOTONIC. * Removed the debug guard in __sub, as time going backwards can be a perfectly normal occurrence. * New methods: * Clock sources: :realtime, :monotonic, :monotonic_coarse, :realtime_coarse, :boottime * Utility: :tonumber, :tousecs, :tomsecs, :fromnumber, :isPositive, :isZero * UIManager: * Ported event loop & scheduling to TimeVal, and switched to the MONOTONIC time base. This ensures reliable and consistent scheduling, as time is ensured never to go backwards. * Added a :getTime() method, that returns a cached TimeVal:now(), updated at the top of every UI frame. It's used throughout the codebase to cadge a syscall in circumstances where we are guaranteed that a syscall would return a mostly identical value, because very few time has passed. The only code left that does live syscalls does it because it's actually necessary for accuracy, and the only code left that does that in a REALTIME time base is code that *actually* deals with calendar time (e.g., Statistics). * DictQuickLookup: Port delay computations to TimeVal * FootNoteWidget: Port delay computations to TimeVal * HTMLBoxWidget: Port delay computations to TimeVal * Notification: Port delay computations to TimeVal * TextBoxWidget: Port delay computations to TimeVal * AutoSuspend: Port to TimeVal * AutoTurn: * Fix it so that settings are actually honored. * Port to TimeVal * BackgroundRunner: Port to TimeVal * Calibre: Port benchmarking code to TimeVal * BookInfoManager: Removed unnecessary yield in the metadata extraction subprocess now that subprocesses get scheduled properly. * All in all, these changes reduced the CPU cost of a single tap by a factor of ten (!), and got rid of an insane amount of weird poll/wakeup cycles that must have been hell on CPU schedulers and batteries..
2021-03-30 00:57:59 +00:00
mock_ffi_input.waitForEvent.returns(true, {
Input: Process input events in batches (#7483) Requires https://github.com/koreader/koreader-base/pull/1344 & https://github.com/koreader/koreader-base/pull/1346 (fix #7485) Assorted input fixes: * Actually handle errors in the "there's a callback timer" input polling loop. * Don't break timerfd when the clock probe was inconclusive. Not directly related, but noticed because of duplicate onInputEvent handlers: * HookContainer: Fix deregistration to actually deregister properly. "Regression" extant since its inception in #2933 (!). * Made sure the three plugins (basically the trio of AutoThingies ;p) that were using HookContainer actually unschedule their task on teardown.
2021-04-02 23:48:35 +00:00
{
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
type = C.EV_ABS,
Input: Process input events in batches (#7483) Requires https://github.com/koreader/koreader-base/pull/1344 & https://github.com/koreader/koreader-base/pull/1346 (fix #7485) Assorted input fixes: * Actually handle errors in the "there's a callback timer" input polling loop. * Don't break timerfd when the clock probe was inconclusive. Not directly related, but noticed because of duplicate onInputEvent handlers: * HookContainer: Fix deregistration to actually deregister properly. "Regression" extant since its inception in #2933 (!). * Made sure the three plugins (basically the trio of AutoThingies ;p) that were using HookContainer actually unschedule their task on teardown.
2021-04-02 23:48:35 +00:00
time = {
usec = 450565,
sec = 1471081881
},
Input: Minor cleanups (#7542) * TimeVal: Log the results of the COARSE probes in debug logs * GestureDetector: Print details of failed clock probes in debug logs * GestureDetector: Skip the BOOTTIME probe when CLOCK_BOOTTIME is unsupported. * Input: Decode ABS_DISTANCE events in debug logs * Get rid of duplicated <linux/input.h> constants, use the FFI module everywhere (re #7536) * Kobo: Get rid of the `touch_alyssum_protocol` quirk. Replace it by setting `main_finger_slot` to `1`, like on the H2O.
2021-04-13 15:53:15 +00:00
code = 24, -- C.ABS_PRESSURE -> ABS_OASIS_ORIENTATION
Input: Process input events in batches (#7483) Requires https://github.com/koreader/koreader-base/pull/1344 & https://github.com/koreader/koreader-base/pull/1346 (fix #7485) Assorted input fixes: * Actually handle errors in the "there's a callback timer" input polling loop. * Don't break timerfd when the clock probe was inconclusive. Not directly related, but noticed because of duplicate onInputEvent handlers: * HookContainer: Fix deregistration to actually deregister properly. "Regression" extant since its inception in #2933 (!). * Made sure the three plugins (basically the trio of AutoThingies ;p) that were using HookContainer actually unschedule their task on teardown.
2021-04-02 23:48:35 +00:00
value = 16
}
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
})
local UIManager = require("ui/uimanager")
stub(UIManager, "onRotation")
local kindle_dev = require('device/kindle/device')
assert.is.same("KindleOasis", kindle_dev.model)
kindle_dev:init()
Allow locking the gyro to the current screen mode (#6347) * Allow locking the gyro to the current screen mode (i.e., orientation). * Tweak the "sticky rota" option to work both ways * More rotation constant usage instead of magic numbers
2020-07-09 17:11:44 +00:00
kindle_dev:lockGSensor(true)
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
kindle_dev.input:waitEvent()
assert.stub(UIManager.onRotation).was_called()
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
fix #2219 The ABS_PRESSURE ABS code is also detected on some KOBO devices if ABS_PRESSURE events are feeded to handle orientation those devices will have a unresponsive screen as described in #2219. This patch registers an event adjustment handler for Kindle Oasis to adjust the ABS_PRESSURE code to ABS_OASIS_ORIENTATION code so that it won't affect event handling on other devices.
2016-08-13 10:47:38 +00:00
mock_ffi_input.waitForEvent:revert()
UIManager.onRotation:revert()
test: add kindle init and fl tests
2016-04-26 07:16:27 +00:00
end)
end)
Travis: run luacheck on unit tests (#3059) * Travis: run luacheck on unit tests
2017-08-08 20:35:40 +00:00
-- luacheck: pop
kobo: fix screen probe for touch
2016-04-03 04:52:30 +00:00
end)
Reference in New Issue Copy Permalink