X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_quadrature.c;h=98bd7c083f7eaaec4f0bdcb33f5025e0c7f0bd61;hb=ccad6e970c5c7416561443f1e6e2fa8f80698957;hp=0cdcc9fb464b413541e891cac4cc2d392398f53c;hpb=819f73698f57e76dca50fe4fadccebd23ffb776d;p=fw%2Faltos

diff --git a/src/drivers/ao_quadrature.c b/src/drivers/ao_quadrature.c
index 0cdcc9fb..98bd7c08 100644
--- a/src/drivers/ao_quadrature.c
+++ b/src/drivers/ao_quadrature.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -38,20 +39,25 @@ static struct ao_debounce ao_debounce_state[AO_QUADRATURE_COUNT][2];
 #define pinb(q) AO_QUADRATURE_ ## q ## _B ## _PIN
 #define isr(q)  ao_quadrature_isr_ ## q
 
-#define DEBOUNCE	10
+#ifndef AO_QUADRATURE_DEBOUNCE
+#define AO_QUADRATURE_DEBOUNCE	30
+#endif
 
 static uint8_t
 ao_debounce(uint8_t cur, struct ao_debounce *debounce)
 {
-	if (cur == debounce->state)
-		debounce->count = 0;
-	else {
-		if (++debounce->count == DEBOUNCE) {
-			debounce->state = cur;
-			debounce->count = 0;
-		}
+#if AO_QUADRATURE_DEBOUNCE > 0
+	if (debounce->count > 0) {
+		debounce->count--;
+	} else if (cur != debounce->state) {
+		debounce->state = cur;
+		debounce->count = AO_QUADRATURE_DEBOUNCE;
 	}
 	return debounce->state;
+#else
+	(void) debounce;
+	return cur;
+#endif
 }
 
 static uint16_t
@@ -78,16 +84,38 @@ _ao_quadrature_queue(uint8_t q, int8_t step)
 	ao_wakeup(&ao_quadrature_count[q]);
 }
 
+#if AO_QUADRATURE_SINGLE_CODE
+struct ao_quadrature_step {
+	uint8_t	inc;
+	uint8_t dec;
+};
+
+static struct ao_quadrature_step ao_quadrature_steps[4] = {
+	[0] = { .inc = 1, .dec = 2 },
+	[1] = { .inc = 3, .dec = 0 },
+	[3] = { .inc = 2, .dec = 1 },
+	[2] = { .inc = 0, .dec = 3 },
+};
+#endif
+
 static void
 _ao_quadrature_set(uint8_t q, uint8_t new) {
 	uint8_t	old = ao_quadrature_state[q];
 
+#ifdef AO_QUADRATURE_SINGLE_CODE
+	if (new == ao_quadrature_steps[old].inc) {
+		_ao_quadrature_queue(q, 1);
+	} else if (new == ao_quadrature_steps[old].dec) {
+		_ao_quadrature_queue(q, -1);
+	}
+#else
 	if (old != new && new == 0) {
-		if (old & 2)
+		if (old == 2)
 			_ao_quadrature_queue(q, 1);
-		else if (old & 1)
+		else if (old == 1)
 			_ao_quadrature_queue(q, -1);
 	}
+#endif
 	ao_quadrature_state[q] = new;
 }