revert support of 3-pin keypad alarm configuration, but keep streamlined codeINSTRUMENT_6_4_38b

2 files changed, 2 insertions, 4 deletions

diff --git a/globals.h b/globals.h
index 9b1f2ab..f673591 100644
--- a/globals.h
+++ b/globals.h
@@ -432,7 +432,7 @@ typedef struct {
 
 	short telnet_session_timeout;	/* 56 - timeout in seconds */
 
-	char older_keypad_3_alarm_pins;	/* 58 */
+	char unusedx;			/* 58 */
 	short spare2;			/* 59 */
 	char ChanKey_route;		/* 61 */
 	char on_off_used;		/* 62 */
diff --git a/menus.c b/menus.c
index fa433f7..59691ee 100644
--- a/menus.c
+++ b/menus.c
@@ -2873,9 +2873,7 @@ static void Read_Keypad(int *button_port_val, int *upper_encoder_val, int *lower
 	Over_Temp_Alarm = !(*upper_encoder_val & Over_Temp);
 	Over_Volt_Alarm = !(*upper_encoder_val & Over_Volt);
 	Over_Other_Alarm = !(*upper_encoder_val & Over_Other);
-
-	// only on newer keypad boards
-	Jig_Alarm = !(*upper_encoder_val & Jig_Input) && !globals.Flash.older_keypad_3_alarm_pins;
+	Jig_Alarm = !(*upper_encoder_val & Jig_Input);
 
 	/* alarm condition */
 	/* valid for both local and remote modes */