Merge pull request #244 from blchinezu/dev

Up version: 0.0.6-17-62.1
blchinezu · Feb 13, 2018 · 1cbb3f0 · 1cbb3f0
2 parents 32ec150 + 90cbbea
commit 1cbb3f0
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 3 deletions.
diff --git a/builds/360/360/latest.zip b/builds/360/360/latest.zip
diff --git a/builds/515/pro4/latest.zip b/builds/515/pro4/latest.zip
diff --git a/builds/515/pro5/latest.zip b/builds/515/pro5/latest.zip
diff --git a/builds/602/pro2/latest.zip b/builds/602/pro2/latest.zip
diff --git a/builds/626/pro4/latest.zip b/builds/626/pro4/latest.zip
diff --git a/builds/626/pro5/latest.zip b/builds/626/pro5/latest.zip
diff --git a/builds/631/pro5/latest.zip b/builds/631/pro5/latest.zip
diff --git a/builds/current.version b/builds/current.version
@@ -1 +1 @@
-0.0.6-17-62
+0.0.6-17-62.1
diff --git a/cr3gui/src/cr3pocketbook.h b/cr3gui/src/cr3pocketbook.h
@@ -78,8 +78,8 @@ enum CRPbCommands {
 
 #define PB_CR3_CACHE_SIZE (0x100000 * 64)
 
-#define CR_PB_VERSION "0.0.6-17-62"
-#define CR_PB_BUILD_DATE "2018-02-12"
+#define CR_PB_VERSION "0.0.6-17-62.1"
+#define CR_PB_BUILD_DATE "2018-02-13"
 
 #define PB_ROTATE_MODE_360 0
 #define PB_ROTATE_MODE_180 1

diff --git a/cr3gui/src/sdk_compatibility.h b/cr3gui/src/sdk_compatibility.h
@@ -0,0 +1,47 @@
+#ifndef SDK_COMPATIBILITY_H_INCLUDED
+#define SDK_COMPATIBILITY_H_INCLUDED
+
+// FW 5.17 changed some defines
+#if defined(POCKETBOOK_PRO_FW5) && !defined(KEY_POWER)
+
+    #define KEY_POWER IV_KEY_POWER
+    #define KEY_DELETE IV_KEY_DELETE
+    #define KEY_OK IV_KEY_OK
+    #define KEY_UP IV_KEY_UP
+    #define KEY_DOWN IV_KEY_DOWN
+    #define KEY_LEFT IV_KEY_LEFT
+    #define KEY_RIGHT IV_KEY_RIGHT
+    #define KEY_MINUS IV_KEY_MINUS
+    #define KEY_PLUS IV_KEY_PLUS
+    #define KEY_MENU IV_KEY_MENU
+    #define KEY_PREV IV_KEY_PREV
+    #define KEY_NEXT IV_KEY_NEXT
+    #define KEY_HOME IV_KEY_HOME
+    #define KEY_BACK IV_KEY_BACK
+    #define KEY_PREV2 IV_KEY_PREV2
+    #define KEY_NEXT2 IV_KEY_NEXT2
+    #define KEY_MUSIC IV_KEY_MUSIC
+    #define KEY_COVEROPEN IV_KEY_COVEROPEN
+    #define KEY_COVERCLOSE IV_KEY_COVERCLOSE
+    #define KEY_ZOOMOUT IV_KEY_ZOOMOUT
+    #define KEY_ZOOMIN IV_KEY_ZOOMIN
+    #define KEY_MENU_POWER IV_KEY_MENU_POWER
+
+    #define KEY_SHIFT IV_KEY_SHIFT
+    #define KEY_LANGUAGECHANGE IV_KEY_LANGUAGECHANGE
+    #define KEY_KEYBOARDCLOSE IV_KEY_KEYBOARDCLOSE
+
+    #define KEY_0 IV_KEY_0
+    #define KEY_1 IV_KEY_1
+    #define KEY_2 IV_KEY_2
+    #define KEY_3 IV_KEY_3
+    #define KEY_4 IV_KEY_4
+    #define KEY_5 IV_KEY_5
+    #define KEY_6 IV_KEY_6
+    #define KEY_7 IV_KEY_7
+    #define KEY_8 IV_KEY_8
+    #define KEY_9 IV_KEY_9
+
+#endif
+
+#endif
diff --git a/cr3gui/src/viewdlg.h b/cr3gui/src/viewdlg.h
@@ -15,6 +15,7 @@
 #include <crgui.h>
 //#ifdef WITH_DICT
 #include "dictdlg.h"
+#include "sdk_compatibility.h"
 //#endif
 
 

diff --git a/make.sh b/make.sh
@@ -145,6 +145,7 @@ if [ "$1" = "" -o "$1" = "pro4" ]; then
         -D ENABLE_PB_DB_STATE=1 \
         -D BACKGROUND_CACHE_FILE_CREATION=1 \
         -D POCKETBOOK_PRO=1 \
+        -D CR3_JPEG=1 \
         ..
     make