Merge pull request #2030 from NiLuJe/master

Assorted tweaks

base

@@ -1 +1 @@
-Subproject commit edfd1239c685e930fd0918bab6eb80267555aead
+Subproject commit 781a7394085fbf62d8f4fd6ef1398b71a48d9282

frontend/device/kobo/device.lua

@@ -80,6 +80,13 @@ local KoboAlyssum = Kobo:new{
     display_dpi = 300,
 }
 
+-- Kobo Touch 2.0:
+local KoboPika = Kobo:new{
+    model = "Kobo_pika",
+    touch_phoenix_protocol = true,
+    touch_alyssum_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 +218,8 @@ elseif codename == "pixie" then
     return KoboPixie
 elseif codename == "alyssum" then
     return KoboAlyssum
+elseif codename == "pika" then
+    return KoboPika
 else
     error("unrecognized Kobo model "..codename)
 end

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