From d2f533e5b7fb94259c3c0132b69d545428b4739f Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sun, 11 Oct 2020 23:08:24 +0200 Subject: [PATCH] A couple of hotfixes for 2020.10.1 (#6781) * PB Crash Screen: * We don't actually support the "tap to restart now" behavior, it's a plain sleep. * Remove CBB toggling leftovers missed in #6696 Fix #6780 --- frontend/device/kindle/device.lua | 9 --------- platform/pocketbook/koreader.app | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/frontend/device/kindle/device.lua b/frontend/device/kindle/device.lua index 8715911d0..b62f3da9c 100644 --- a/frontend/device/kindle/device.lua +++ b/frontend/device/kindle/device.lua @@ -412,9 +412,6 @@ function Kindle2:init() end function KindleDXG:init() - -- Blacklist the C BB before the first BB require... - self:blacklistCBB() - self.screen = require("ffi/framebuffer_einkfb"):new{device = self, debug = logger.dbg} self.powerd = require("device/kindle/powerd"):new{ device = self, @@ -431,9 +428,6 @@ function KindleDXG:init() end function Kindle3:init() - -- Blacklist the C BB before the first BB require... - self:blacklistCBB() - self.screen = require("ffi/framebuffer_einkfb"):new{device = self, debug = logger.dbg} self.powerd = require("device/kindle/powerd"):new{ device = self, @@ -451,9 +445,6 @@ function Kindle3:init() end function Kindle4:init() - -- Blacklist the C BB before the first BB require... - self:blacklistCBB() - self.screen = require("ffi/framebuffer_einkfb"):new{device = self, debug = logger.dbg} self.powerd = require("device/kindle/powerd"):new{ device = self, diff --git a/platform/pocketbook/koreader.app b/platform/pocketbook/koreader.app index d03b6f28a..ecc55d30b 100755 --- a/platform/pocketbook/koreader.app +++ b/platform/pocketbook/koreader.app @@ -133,8 +133,8 @@ while [ "${RETURN_VALUE}" -ne 0 ]; do # With a little notice at the top of the screen, on a big gray screen of death ;). "${KOREADER_DIR}/fbink" -q -b -c -B GRAY9 -m -y 1 "Don't Panic! (Crash n°${CRASH_COUNT} -> ${RETURN_VALUE})" if [ ${CRASH_COUNT} -eq 1 ]; then - # Warn that we're waiting on a tap to continue... - "${KOREADER_DIR}/fbink" -q -b -O -m -y 2 "Tap the screen to continue." + # Warn that we're sleeping for a bit... + "${KOREADER_DIR}/fbink" -q -b -O -m -y 2 "KOReader will restart in 15 sec." fi # U+1F4A3, the hard way, because we can't use \u or \U escape sequences... # shellcheck disable=SC2039