From c327069f43d7986da33d01346a44786fe82dea83 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Mon, 14 Jan 2019 00:49:29 +0100
Subject: [PATCH] Set actual model names on PB devices (#4479)

* Set an actually useful model name for PocketBook devices
* Pickup yet another PB fb setup fix ;).
---
 base                                  |  2 +-
 frontend/device/kobo/device.lua       |  6 +++---
 frontend/device/pocketbook/device.lua | 16 ++++++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/base b/base
index fc019eff8..95da0edbb 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit fc019eff80e3d645335cd501c92ba751ee2f1f76
+Subproject commit 95da0edbba4ba03663d09d782d83d6edf5e95c19
diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua
index d4fdb8b02..97c377334 100644
--- a/frontend/device/kobo/device.lua
+++ b/frontend/device/kobo/device.lua
@@ -23,18 +23,18 @@ local Kobo = Generic:new{
     model = "Kobo",
     isKobo = yes,
     isTouchDevice = yes, -- all of them are
-    hasBGRFrameBuffer = yes, -- True when >16bpp
+    hasBGRFrameBuffer = yes, -- True when >16bpp (i.e., on current FW)
     hasOTAUpdates = yes,
 
     -- most Kobos have X/Y switched for the touch screen
     touch_switch_xy = true,
     -- most Kobos have also mirrored X coordinates
     touch_mirrored_x = true,
-    -- enforce protrait mode on Kobos:
+    -- enforce portrait mode on Kobos
     isAlwaysPortrait = yes,
     -- the internal storage mount point users can write to
     internal_storage_mount_point = "/mnt/onboard/",
-    -- currently only Aura One has coloured frontlight
+    -- currently only the Aura One and Forma have coloured frontlights
     hasNaturalLight = no,
 }
 
diff --git a/frontend/device/pocketbook/device.lua b/frontend/device/pocketbook/device.lua
index 6750b738c..dcce339df 100644
--- a/frontend/device/pocketbook/device.lua
+++ b/frontend/device/pocketbook/device.lua
@@ -157,6 +157,7 @@ end
 
 -- PocketBook InkPad
 local PocketBook840 = PocketBook:new{
+    model = "PBInkPad",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -166,6 +167,7 @@ local PocketBook840 = PocketBook:new{
 
 -- PocketBook Lux 4
 local PocketBook627 = PocketBook:new{
+    model = "PBLux4",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -173,8 +175,9 @@ local PocketBook627 = PocketBook:new{
     emu_events_dev = "/var/dev/shm/emu_events",
 }
 
--- PocketBook HD Touch
+-- PocketBook Touch HD
 local PocketBook631 = PocketBook:new{
+    model = "PBTouchHD",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -184,6 +187,7 @@ local PocketBook631 = PocketBook:new{
 
 -- PocketBook Touch HD Plus
 local PocketBook632 = PocketBook:new{
+    model = "PBTouchHDPlus",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -194,6 +198,7 @@ local PocketBook632 = PocketBook:new{
 
 -- PocketBook Lux 3
 local PocketBook626 = PocketBook:new{
+    model = "PBLux3",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -203,6 +208,7 @@ local PocketBook626 = PocketBook:new{
 
 -- PocketBook Basic Touch
 local PocketBook624 = PocketBook:new{
+    model = "PBBasicTouch",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = no,
@@ -212,6 +218,7 @@ local PocketBook624 = PocketBook:new{
 
 -- PocketBook Basic Touch 2
 local PocketBook625 = PocketBook:new{
+    model = "PBBasicTouch2",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = no,
@@ -221,6 +228,7 @@ local PocketBook625 = PocketBook:new{
 
 -- PocketBook Touch Lux
 local PocketBook623 = PocketBook:new{
+    model = "PBTouchLux",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -230,6 +238,7 @@ local PocketBook623 = PocketBook:new{
 
 -- PocketBook InkPad 3
 local PocketBook740 = PocketBook:new{
+    model = "PBInkPad3",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -238,8 +247,9 @@ local PocketBook740 = PocketBook:new{
     emu_events_dev = "/var/dev/shm/emu_events",
 }
 
--- PocketBook HD Touch
+-- PocketBook Sense
 local PocketBook630 = PocketBook:new{
+    model = "PBSense",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -249,6 +259,7 @@ local PocketBook630 = PocketBook:new{
 
 -- PocketBook Aqua 2
 local PocketBook641 = PocketBook:new{
+    model = "PBAqua2",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,
@@ -258,6 +269,7 @@ local PocketBook641 = PocketBook:new{
 
 -- PocketBook Color Lux
 local PocketBookColorLux = PocketBook:new{
+    model = "PBColorLux",
     isTouchDevice = yes,
     hasKeys = yes,
     hasFrontlight = yes,