From 95d6b2ec15226367493651921df60528fd9473aa Mon Sep 17 00:00:00 2001
From: Raphael Assenat <raph@raphnet.net>
Date: Wed, 22 Nov 2017 09:35:59 -0500
Subject: [PATCH] Simplify config code and add disable triggers feature

---
 config.c   | 89 ++++++++++++++++++++++++++++++++++++------------------
 config.h   |  9 ++++--
 requests.h |  1 +
 usbpad.c   |  4 +++
 4 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/config.c b/config.c
index 82d153f..e83bd5a 100644
--- a/config.c
+++ b/config.c
@@ -42,8 +42,40 @@ static void config_set_serial(char serial[SERIAL_NUM_LEN])
 	eeprom_commit();
 }
 
+struct paramAndFlag {
+	uint8_t param; // CFG_PARAM_* (requests.h)
+	uint32_t flag; // FLAG_* (config.h)
+};
+
+static struct paramAndFlag paramsAndFlags[] = {
+	{ CFG_PARAM_INVERT_TRIG, FLAG_GC_INVERT_TRIGS },
+	{ CFG_PARAM_FULL_SLIDERS, FLAG_GC_FULL_SLIDERS },
+	{ CFG_PARAM_TRIGGERS_AS_BUTTONS, FLAG_GC_SLIDERS_AS_BUTTONS },
+	{ CFG_PARAM_DISABLE_ANALOG_TRIGGERS, FLAG_DISABLE_ANALOG_TRIGGERS },
+
+	{  },
+};
+
+uint8_t config_getSupportedParams(uint8_t *dst)
+{
+	uint8_t n = 0, i;
+
+	dst[n++] = CFG_PARAM_MODE;
+	dst[n++] = CFG_PARAM_SERIAL;
+	for (i=0; i<NUM_CHANNELS; i++) {
+		dst[n++] = CFG_PARAM_POLL_INTERVAL0 + i;
+	}
+	for (i=0; paramsAndFlags[i].flag; i++) {
+		dst[n++] = paramsAndFlags[i].param;
+	}
+
+	return n;
+}
+
 unsigned char config_getParam(unsigned char param, unsigned char *value, unsigned char max_len)
 {
+	int i;
+
 	switch (param)
 	{
 		case CFG_PARAM_MODE:
@@ -70,15 +102,14 @@ unsigned char config_getParam(unsigned char param, unsigned char *value, unsigne
 			*value = g_eeprom_data.cfg.poll_interval[3];
 			return 1;
 #endif
-		case CFG_PARAM_INVERT_TRIG:
-			*value = (g_eeprom_data.cfg.flags & FLAG_GC_INVERT_TRIGS) ? 1 : 0;
-			return 1;
-		case CFG_PARAM_FULL_SLIDERS:
-			*value = (g_eeprom_data.cfg.flags & FLAG_GC_FULL_SLIDERS) ? 1 : 0;
-			return 1;
-		case CFG_PARAM_TRIGGERS_AS_BUTTONS:
-			*value = (g_eeprom_data.cfg.flags & FLAG_GC_SLIDERS_AS_BUTTONS) ? 1 : 0;
-			return 1;
+
+		default:
+			for (i=0; paramsAndFlags[i].flag; i++) {
+				if (param == paramsAndFlags[i].param) {
+					*value = (g_eeprom_data.cfg.flags & paramsAndFlags[i].flag) ? 1 : 0;
+					return 1;
+				}
+			}
 	}
 
 	return 0;
@@ -86,6 +117,8 @@ unsigned char config_getParam(unsigned char param, unsigned char *value, unsigne
 
 unsigned char config_setParam(unsigned char param, const unsigned char *value)
 {
+	int i;
+
 	if (!value)
 		return 0;
 
@@ -115,28 +148,24 @@ unsigned char config_setParam(unsigned char param, const unsigned char *value)
 			g_eeprom_data.cfg.poll_interval[3] = value[0];
 			break;
 #endif
-		case CFG_PARAM_FULL_SLIDERS:
-			if (value[0]) {
-				g_eeprom_data.cfg.flags |= FLAG_GC_FULL_SLIDERS;
-			} else {
-				g_eeprom_data.cfg.flags &= ~FLAG_GC_FULL_SLIDERS;
-			}
-			break;
-		case CFG_PARAM_INVERT_TRIG:
-			if (value[0]) {
-				g_eeprom_data.cfg.flags |= FLAG_GC_INVERT_TRIGS;
-			} else {
-				g_eeprom_data.cfg.flags &= ~FLAG_GC_INVERT_TRIGS;
-			}
-			break;
-		case CFG_PARAM_TRIGGERS_AS_BUTTONS:
-			if (value[0]) {
-				g_eeprom_data.cfg.flags |= FLAG_GC_SLIDERS_AS_BUTTONS;
-			} else {
-				g_eeprom_data.cfg.flags &= ~FLAG_GC_SLIDERS_AS_BUTTONS;
-			}
+
 		default:
-			return 0;
+			for (i=0; paramsAndFlags[i].flag; i++) {
+				if (param == paramsAndFlags[i].param) {
+					if (value[0]) {
+						g_eeprom_data.cfg.flags |= paramsAndFlags[i].flag;
+					} else {
+						g_eeprom_data.cfg.flags &= ~paramsAndFlags[i].flag;
+					}
+					break;
+				}
+			}
+
+			// if we made it through the list without finding
+			// a matching parameter, do nothing.
+			if (!paramsAndFlags[i].flag) {
+				return 0;
+			}
 	}
 
 	eeprom_commit();
diff --git a/config.h b/config.h
index b6736cb..dd27d20 100644
--- a/config.h
+++ b/config.h
@@ -10,9 +10,10 @@ struct eeprom_cfg {
 	uint32_t flags;
 };
 
-#define FLAG_GC_FULL_SLIDERS	1
-#define FLAG_GC_INVERT_TRIGS	2
-#define FLAG_GC_SLIDERS_AS_BUTTONS	4
+#define FLAG_GC_FULL_SLIDERS			1
+#define FLAG_GC_INVERT_TRIGS			2
+#define FLAG_GC_SLIDERS_AS_BUTTONS		4
+#define FLAG_DISABLE_ANALOG_TRIGGERS	8
 
 void eeprom_app_write_defaults(void);
 void eeprom_app_ready(void);
@@ -20,4 +21,6 @@ void eeprom_app_ready(void);
 unsigned char config_setParam(unsigned char param, const unsigned char *value);
 unsigned char config_getParam(unsigned char param, unsigned char *value, unsigned char max_len);
 
+uint8_t config_getSupportedParams(uint8_t *dst);
+
 #endif
diff --git a/requests.h b/requests.h
index 24cfc51..57a49d8 100644
--- a/requests.h
+++ b/requests.h
@@ -39,5 +39,6 @@
 #define CFG_PARAM_INVERT_TRIG		0x24
 #define CFG_PARAM_TRIGGERS_AS_BUTTONS	0x25
 
+#define CFG_PARAM_DISABLE_ANALOG_TRIGGERS       0x32
 
 #endif
diff --git a/usbpad.c b/usbpad.c
index cba2711..0a3b6be 100644
--- a/usbpad.c
+++ b/usbpad.c
@@ -148,6 +148,10 @@ static void buildReportFromGC(const gc_pad_data *gc_data, unsigned char dstbuf[U
 		}
 	}
 
+	if (g_eeprom_data.cfg.flags & FLAG_DISABLE_ANALOG_TRIGGERS) {
+		ltrig = rtrig = 0;
+	}
+
 	/* Unsign for HID report */
 	xval += 16000;
 	yval += 16000;