From 467e65be3de2f7ba36232d78686cc65dab6002f7 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Wed, 4 May 2016 17:59:52 +0200 Subject: [PATCH 1/5] Don't crash on the Kobo Touch 2.0 I wouldn't go so far as to say "support", though, since I don't have the device, and the touch protocol might be wrong ;). re #2005 --- frontend/device/kobo/device.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua index 8f96561ef..ed327509a 100644 --- a/frontend/device/kobo/device.lua +++ b/frontend/device/kobo/device.lua @@ -80,6 +80,12 @@ local KoboAlyssum = Kobo:new{ display_dpi = 300, } +-- Kobo Touch 2.0: +local KoboPika = Kobo:new{ + model = "Kobo_pika", + touch_phoenix_protocol = true, +} + function Kobo:init() self.screen = require("ffi/framebuffer_mxcfb"):new{device = self, debug = dbg} self.powerd = require("device/kobo/powerd"):new{device = self} @@ -211,6 +217,9 @@ elseif codename == "pixie" then return KoboPixie elseif codename == "alyssum" then return KoboAlyssum +elseif codename == "pika" then + return KoboPika +else else error("unrecognized Kobo model "..codename) end From 9a7c46e8f5b119644548216d4c2e541c004d2c33 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Wed, 4 May 2016 23:01:40 +0200 Subject: [PATCH 2/5] Unbreak previous commit Weeeeee! --- frontend/device/kobo/device.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua index ed327509a..cd71859c6 100644 --- a/frontend/device/kobo/device.lua +++ b/frontend/device/kobo/device.lua @@ -219,7 +219,6 @@ elseif codename == "alyssum" then return KoboAlyssum elseif codename == "pika" then return KoboPika -else else error("unrecognized Kobo model "..codename) end From 103e4eaeb8e504cf96f3a3b8699ec6c4747885c5 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sat, 14 May 2016 23:26:21 +0200 Subject: [PATCH 3/5] Use the GloHD quirks on the Touch 2.0... re #2005 --- frontend/device/kobo/device.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua index cd71859c6..84504fe6d 100644 --- a/frontend/device/kobo/device.lua +++ b/frontend/device/kobo/device.lua @@ -84,6 +84,7 @@ local KoboAlyssum = Kobo:new{ local KoboPika = Kobo:new{ model = "Kobo_pika", touch_phoenix_protocol = true, + touch_alyssum_protocol = true, } function Kobo:init() From 892e3c0f1e5633d9fbc8626ff114d45bee101997 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sun, 15 May 2016 20:52:46 +0200 Subject: [PATCH 4/5] Kobo startup script tweak. When using KFMon, make the reboot on exit user-configurable. The user can now choose to try to restart Nickel directly, like with fmon. For now, we still do a full reboot by default. --- platform/kobo/koreader.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform/kobo/koreader.sh b/platform/kobo/koreader.sh index 9647f3dc8..601f58cc8 100755 --- a/platform/kobo/koreader.sh +++ b/platform/kobo/koreader.sh @@ -118,9 +118,14 @@ if [ "${FROM_NICKEL}" = "true" ] ; then # start kobo software because it was running before koreader ./nickel.sh & else - # If we were called from KFMon, just reboot, because there's always a (hopefully slim to nonexistent, now) chance Nickel will get its panties in a serious twist on restore for one reason or another... - # And at best, we'd still restart with broken suspend behavior anyway... - reboot + if grep -q 'reboot_on_exit=false' /mnt/onboard/.adds/kfmon/config/koreader.ini 2>/dev/null ; then + # The user wants to try to restart Nickel instead of rebooting! + ./nickel.sh & + else + # By default, if we were called from KFMon, just reboot, because there might be a chance Nickel will get its panties in a serious twist on restore for one reason or another... + # And at best, we'd still restart with slightly broken suspend behavior anyway... + reboot + fi fi else # if we were called from advboot then we must reboot to go to the menu From 7205e98a980240ab1c64402619d88737785341d2 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Mon, 16 May 2016 19:25:14 +0200 Subject: [PATCH 5/5] Bump base --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index edfd1239c..781a73940 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit edfd1239c685e930fd0918bab6eb80267555aead +Subproject commit 781a7394085fbf62d8f4fd6ef1398b71a48d9282