From b3a20b8b6fad0a04b93fb8e4fde65f9a930307f3 Mon Sep 17 00:00:00 2001
From: claudiol <claudiol@users.sourceforge.net>
Date: Fri, 2 Apr 2021 17:15:54 -0400
Subject: [PATCH] Changed contrast settings for 39gs/40gs. Increased DEBOUNCE
 for Thumb mode exception handlers. Fixed typo in help for FNTFORM Font module
 added in wrong place.

---
 firmware/include/target_39gs.h     | 2 +-
 firmware/include/target_40gs.h     | 3 +--
 firmware/sys/target_50g/keyboard.c | 2 +-
 newrpl-fw.pro                      | 2 +-
 newrpl/rpl-objects/lib-78.nrpl     | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/firmware/include/target_39gs.h b/firmware/include/target_39gs.h
index 7e10801..847ac73 100644
--- a/firmware/include/target_39gs.h
+++ b/firmware/include/target_39gs.h
@@ -21,7 +21,7 @@
 
 // CONFIGURATION OPTIONS
 
-#define CONFIG_USE_LCD_ALTERNATIVE_SETTINGS {0x45ED, 0x45F1, 0x46E4, 0x46E6, 0x46E9, 0x45F9, 0x46EB, 0x46EE, 0x45FF, 0x46F8, 0x46FC, 0x47F0, 0x47F3, 0x47F8, 0x47FB, 0x47FF}
+#define CONFIG_USE_LCD_ALTERNATIVE_SETTINGS {0x46f1,0x46f3,0x46f5,0x46f7,0x46f9,0x46fb,0x46fd,0x47f0,0x47f1,0x47f3,0x47f5,0x47f7,0x47f9,0x47fb,0x47fd,0x47ff}
 
 
 //#define CONFIG_LIGHT_MATH_TABLES  1
diff --git a/firmware/include/target_40gs.h b/firmware/include/target_40gs.h
index ff628c6..1025783 100644
--- a/firmware/include/target_40gs.h
+++ b/firmware/include/target_40gs.h
@@ -21,8 +21,7 @@
 
 // CONFIGURATION OPTIONS
 
-#define CONFIG_USE_LCD_ALTERNATIVE_SETTINGS {0x45ED, 0x45F1, 0x46E4, 0x46E6, 0x46E9, 0x45F9, 0x46EB, 0x46EE, 0x45FF, 0x46F8, 0x46FC, 0x47F0, 0x47F3, 0x47F8, 0x47FB, 0x47FF}
-
+#define CONFIG_USE_LCD_ALTERNATIVE_SETTINGS {0x46f1,0x46f3,0x46f5,0x46f7,0x46f9,0x46fb,0x46fd,0x47f0,0x47f1,0x47f3,0x47f5,0x47f7,0x47f9,0x47fb,0x47fd,0x47ff}
 
 //#define CONFIG_LIGHT_MATH_TABLES  1
 
diff --git a/firmware/sys/target_50g/keyboard.c b/firmware/sys/target_50g/keyboard.c
index 702b91d..560dba6 100644
--- a/firmware/sys/target_50g/keyboard.c
+++ b/firmware/sys/target_50g/keyboard.c
@@ -13,7 +13,7 @@ extern void __tmr_eventreschedule();
 
 extern void __keyb_update();
 
-#define DEBOUNCE  16    // 10 SEEMS TO BE ADEQUATE EVEN AT 75 MHz
+#define DEBOUNCE  48    // 10 SEEMS TO BE ADEQUATE EVEN AT 75 MHz
 
 // KEYBOARD, LOW LEVEL GLOBAL VARIABLES
 extern unsigned short int __keyb_buffer[KEYB_BUFFER];
diff --git a/newrpl-fw.pro b/newrpl-fw.pro
index 62ebc62..e191943 100644
--- a/newrpl-fw.pro
+++ b/newrpl-fw.pro
@@ -30,7 +30,6 @@ DEFINES += TARGET_50G NDEBUG "NEWRPL_BUILDNUM=$$system(git rev-list --count HEAD
 
 
 SOURCES +=\
-    firmware/sys/Font18.c \
     firmware/sys/target_50g/preamble.c \
     firmware/sys/target_50g/boot.c \
     firmware/sys/target_50g/battery.c \
@@ -88,6 +87,7 @@ SOURCES +=\
     firmware/sys/Font8C.c \
     firmware/sys/Font8D.c \
     firmware/sys/Font10A.c \
+    firmware/sys/Font18.c \
     firmware/sys/Font24.c \
     firmware/sys/target_50g/sddriver.c \
     firmware/sys/fsystem/fatconvert.c \
diff --git a/newrpl/rpl-objects/lib-78.nrpl b/newrpl/rpl-objects/lib-78.nrpl
index 3556630..791541c 100644
--- a/newrpl/rpl-objects/lib-78.nrpl
+++ b/newrpl/rpl-objects/lib-78.nrpl
@@ -80,7 +80,7 @@ for menus
 for menus
 N → "
 
-→FNTFORM
+FNTFORM
 "Current font name
 for forms
  → N"