From a249bf295f3ff9f1ac56bee90bc246584c6d8c37 Mon Sep 17 00:00:00 2001
From: Stephen White <pi1541contact@gmail.com>
Date: Sun, 30 Sep 2018 22:42:56 +1000
Subject: [PATCH] Fixed the button mapping issue so that they can be 1 indexed
 when specifying in options.txt

---
 src/options.cpp | 10 +++++-----
 src/options.h   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/options.cpp b/src/options.cpp
index f0671eb..0d32241 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -149,11 +149,11 @@ Options::Options(void)
 	, i2cLcdModel(LCD_UNKNOWN)
 	, scrollHighlightRate(0.125f)
 	, keyboardBrowseLCDScreen(0)
-        , buttonEnter(0)
-        , buttonUp(1)
-        , buttonDown(2)
-        , buttonBack(3)
-        , buttonInsert(4)
+        , buttonEnter(1)
+        , buttonUp(2)
+        , buttonDown(3)
+        , buttonBack(4)
+        , buttonInsert(5)
 
 {
 	autoMountImageName[0] = 0;
diff --git a/src/options.h b/src/options.h
index bfe6806..8b1972a 100644
--- a/src/options.h
+++ b/src/options.h
@@ -89,11 +89,11 @@ public:
 
 	inline float ScrollHighlightRate() const { return scrollHighlightRate; }
 
-	inline unsigned int GetButtonEnter() const { return buttonEnter; }
-	inline unsigned int GetButtonUp() const { return buttonUp; }
-	inline unsigned int GetButtonDown() const { return buttonDown; }
-	inline unsigned int GetButtonBack() const { return buttonBack; }
-	inline unsigned int GetButtonInsert() const { return buttonInsert; }
+	inline unsigned int GetButtonEnter() const { return buttonEnter - 1; }
+	inline unsigned int GetButtonUp() const { return buttonUp - 1; }
+	inline unsigned int GetButtonDown() const { return buttonDown - 1; }
+	inline unsigned int GetButtonBack() const { return buttonBack - 1; }
+	inline unsigned int GetButtonInsert() const { return buttonInsert - 1; }
 
 	// Page up and down will jump a different amount based on the maximum number rows displayed.
 	// Perhaps we should use some keyboard modifier to the the other screen?