From be14e3d9f028cf2ee1ba9fbdd2e755cde0183c9c Mon Sep 17 00:00:00 2001 From: Markismus Date: Tue, 29 Apr 2014 12:12:56 +0200 Subject: [PATCH 1/4] Return to Home screen for Kobo devices Mini, Touch and Aura Added is a case statement in koreader_kobo.sh to cat binary files to /dev/input/eventx. Added are three binary files. When the other two files are generated via mobileread forum users it is easy to expand the script for all models. --- Kobo2HomeScreen/KoboAuraTapHomeIcon.bin | Bin 0 -> 320 bytes Kobo2HomeScreen/KoboMiniTapHomeIcon.bin | Bin 0 -> 320 bytes Kobo2HomeScreen/KoboTouchHomeButton.bin | Bin 0 -> 32 bytes koreader_kobo.sh | 24 ++++++++++++++++++++++-- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 Kobo2HomeScreen/KoboAuraTapHomeIcon.bin create mode 100644 Kobo2HomeScreen/KoboMiniTapHomeIcon.bin create mode 100644 Kobo2HomeScreen/KoboTouchHomeButton.bin diff --git a/Kobo2HomeScreen/KoboAuraTapHomeIcon.bin b/Kobo2HomeScreen/KoboAuraTapHomeIcon.bin new file mode 100644 index 0000000000000000000000000000000000000000..04d7793c3072530c258fac7f9cf4e7b3dd935105 GIT binary patch literal 320 zcmY+;F$#k~6a>&&wKE40EImL(P)KPP(rL={@dT+Y1ski}z$5Gpaxwp(byxGj;xVI+ z&AR7hh!EojJu7bM5@z?Eu7Z2IMzQBFy1_4U?+;=?ALkEqg#JjI(4XlHNL>FbHh38S u|5fZy_oaFAxA#hytZ3fQRd7e2_R`1RxA?qwWG;K;^m~(7_joVtGsXsACohx$ literal 0 HcmV?d00001 diff --git a/Kobo2HomeScreen/KoboMiniTapHomeIcon.bin b/Kobo2HomeScreen/KoboMiniTapHomeIcon.bin new file mode 100644 index 0000000000000000000000000000000000000000..da61f0602ad3a012a823589ba6f93d1acf9e5a28 GIT binary patch literal 320 zcmZ4O;u0(+#m2zQz{sG@#K5o`$hQUa85mR0Rfb`Ga57Dm=)xQhOXJAlB4+*dkh<^{r2l*Ey0OCIb H@?ih~Y+*RD literal 0 HcmV?d00001 diff --git a/Kobo2HomeScreen/KoboTouchHomeButton.bin b/Kobo2HomeScreen/KoboTouchHomeButton.bin new file mode 100644 index 0000000000000000000000000000000000000000..544c4c8c05b8bb9ea033f1a71b445cb783a63d23 GIT binary patch literal 32 gcmaFL7Za=+%E7?MkOssI49|f4d|@UqAIN0@0BTwV8vp crash.log # continue with nickel -#cat .last_screen_content | /usr/local/Kobo/pickel showpic -#rm .last_screen_content killall -CONT nickel + +# return to home screen +cd /mnt/onboard/.kobo/koreader/Kobo2HomeScreen +case `/bin/kobo_config.sh * 2>/dev/null` in + dragon) #DEVICE=AURAHD + #no binary file available + ;; + phoenix) #DEVICE=AURA + cat ./KoboAuraTapHomeIcon.bin > /dev/input/event1 + cat ./KoboAuraTapHomeIcon.bin > /dev/input/event1 + ;; + kraken) #DEVICE=GLO + #no binary file available + ;; + pixie) #DEVICE=MINI + cat ./KoboMiniTapHomeIcon.bin > /dev/input/event1 + cat ./KoboMiniTapHomeIcon.bin > /dev/input/event1 + ;; + trilogy|*) #DEVICE=TOUCH + cat ./KoboTouchHomeButton.bin > /dev/input/event0 + ;; +esac \ No newline at end of file From dc8b1f365b7e9d429abe9e90f53440d567c8e183 Mon Sep 17 00:00:00 2001 From: Markismus Date: Fri, 2 May 2014 15:58:44 +0200 Subject: [PATCH 2/4] Changing directoryname for Kobo files As requested an all purpose kobo directory. --- {Kobo2HomeScreen => Kobo}/KoboAuraTapHomeIcon.bin | Bin {Kobo2HomeScreen => Kobo}/KoboMiniTapHomeIcon.bin | Bin {Kobo2HomeScreen => Kobo}/KoboTouchHomeButton.bin | Bin koreader_kobo.sh | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename {Kobo2HomeScreen => Kobo}/KoboAuraTapHomeIcon.bin (100%) rename {Kobo2HomeScreen => Kobo}/KoboMiniTapHomeIcon.bin (100%) rename {Kobo2HomeScreen => Kobo}/KoboTouchHomeButton.bin (100%) diff --git a/Kobo2HomeScreen/KoboAuraTapHomeIcon.bin b/Kobo/KoboAuraTapHomeIcon.bin similarity index 100% rename from Kobo2HomeScreen/KoboAuraTapHomeIcon.bin rename to Kobo/KoboAuraTapHomeIcon.bin diff --git a/Kobo2HomeScreen/KoboMiniTapHomeIcon.bin b/Kobo/KoboMiniTapHomeIcon.bin similarity index 100% rename from Kobo2HomeScreen/KoboMiniTapHomeIcon.bin rename to Kobo/KoboMiniTapHomeIcon.bin diff --git a/Kobo2HomeScreen/KoboTouchHomeButton.bin b/Kobo/KoboTouchHomeButton.bin similarity index 100% rename from Kobo2HomeScreen/KoboTouchHomeButton.bin rename to Kobo/KoboTouchHomeButton.bin diff --git a/koreader_kobo.sh b/koreader_kobo.sh index 263f4335b..84171f03f 100644 --- a/koreader_kobo.sh +++ b/koreader_kobo.sh @@ -23,7 +23,7 @@ killall -STOP nickel killall -CONT nickel # return to home screen -cd /mnt/onboard/.kobo/koreader/Kobo2HomeScreen +cd /mnt/onboard/.kobo/koreader/Kobo case `/bin/kobo_config.sh * 2>/dev/null` in dragon) #DEVICE=AURAHD #no binary file available From a153286f447b830aeceb05f3d40ae98e398f5f73 Mon Sep 17 00:00:00 2001 From: Markismus Date: Fri, 2 May 2014 16:06:18 +0200 Subject: [PATCH 3/4] Kobo Frontlight Tweaks Now the frontlight remains unchanged from Nickel to koreader and vice versa. Also ffi/kobolight.lua has been changed to allow for usage of the toggle button in the filemanager. --- frontend/ui/device/basepowerd.lua | 9 +++++++++ frontend/ui/device/kobopowerd.lua | 7 +++++++ reader.lua | 7 ++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/frontend/ui/device/basepowerd.lua b/frontend/ui/device/basepowerd.lua index 2ce343b24..af36cbdf6 100644 --- a/frontend/ui/device/basepowerd.lua +++ b/frontend/ui/device/basepowerd.lua @@ -20,6 +20,7 @@ end function BasePowerD:init() end function BasePowerD:toggleFrontlight() end function BasePowerD:setIntensityHW() end +function BasePowerD:setIntensitySW() end function BasePowerD:getCapacityHW() end function BasePowerD:isChargingHW() end function BasePowerD:suspendHW() end @@ -39,6 +40,14 @@ function BasePowerD:setIntensity(intensity) self:setIntensityHW() end +function BasePowerD:setIntensityWithoutHW(intensity) + intensity = intensity < self.fl_min and self.fl_min or intensity + intensity = intensity > self.fl_max and self.fl_max or intensity + self.flIntensity = intensity + self:setIntensitySW() +end + + function BasePowerD:getCapacity() if capacity_pulled_count == capacity_cached_count then capacity_pulled_count = 0 diff --git a/frontend/ui/device/kobopowerd.lua b/frontend/ui/device/kobopowerd.lua index fef464d17..5ed20dc9b 100644 --- a/frontend/ui/device/kobopowerd.lua +++ b/frontend/ui/device/kobopowerd.lua @@ -28,6 +28,13 @@ function KoboPowerD:setIntensityHW() end end +function KoboPowerD:setIntensitySW() + if self.fl ~= nil then + self.fl:restoreBrightness(self.flIntensity) + end +end + + function KoboPowerD:getCapacityHW() self.battCapacity = self:read_int_file(self.batt_capacity_file) return self.battCapacity diff --git a/reader.lua b/reader.lua index ba6d3c939..bca6fc3ee 100755 --- a/reader.lua +++ b/reader.lua @@ -1,8 +1,8 @@ #!./koreader-base require "defaults" -package.path = "./frontend/?.lua;./?.lua" -package.cpath = "?.so;/usr/lib/lua/?.so" +package.path = "?.lua;common/?.lua;frontend/?.lua" +package.cpath = "?.so;common/?.so;/usr/lib/lua/?.so" local DocSettings = require("docsettings") local _ = require("gettext") @@ -184,7 +184,8 @@ do if powerd and powerd.restore_settings then local intensity = G_reader_settings:readSetting("frontlight_intensity") intensity = intensity or powerd.flIntensity - powerd:setIntensity(intensity) + powerd:setIntensityWithoutHW(intensity) + -- powerd:setIntensity(intensity) end end From bd4b5a11ad5c8ca93abf17f8376c20c88109e5b7 Mon Sep 17 00:00:00 2001 From: Markismus Date: Fri, 2 May 2014 18:12:28 +0200 Subject: [PATCH 4/4] Added Kobo files to Makefile I can't test on my laptop. Would these changes be enough? --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 72e0b7e31..82108c8a1 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ koboupdate: all zip -9 -r \ ../koreader-kobo-$(MACHINE)-$(VERSION).zip \ KoboRoot.tgz koreader koreader.png README_kobo.txt \ - -x "koreader/resources/fonts/*" "koreader/resources/icons/src/*" "koreader/spec/*" + -x "koreader/resources/fonts/*" "koreader/resources/icons/src/*" "koreader/spec/*" "koreader/Kobo/*" pot: $(XGETTEXT_BIN) reader.lua `find frontend -iname "*.lua"` \