Fix analog reading of channel 0 if another channel is active.

triffid · Feb 15, 2011 · b0d1ba0 · b0d1ba0
1 parent e41e659
commit b0d1ba0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/analog.c b/analog.c
@@ -9,7 +9,10 @@
 
 uint8_t adc_running_mask, adc_counter;
 
-#if	ANALOG_MASK & 2
+#if	ANALOG_MASK & 1
+	#define	ANALOG_START			0
+	#define	ANALOG_START_MASK	1
+#elif	ANALOG_MASK & 2
 	#define	ANALOG_START			1
 	#define	ANALOG_START_MASK	2
 #elif	ANALOG_MASK & 4
@@ -31,7 +34,7 @@ uint8_t adc_running_mask, adc_counter;
 	#define	ANALOG_START			7
 	#define	ANALOG_START_MASK	128
 #else
-	// ANALOG_MASK == 1 or 0, either way defines are the same except they're not used if ANALOG_MASK == 0
+	// ANALOG_MASK == 0
 	#define	ANALOG_START			0
 	#define	ANALOG_START_MASK	1
 #endif

diff --git a/extruder/analog.c b/extruder/analog.c
@@ -9,7 +9,10 @@
 
 uint8_t adc_running_mask, adc_counter;
 
-#if	ANALOG_MASK & 2
+#if	ANALOG_MASK & 1
+	#define	ANALOG_START			0
+	#define	ANALOG_START_MASK	1
+#elif	ANALOG_MASK & 2
 	#define	ANALOG_START			1
 	#define	ANALOG_START_MASK	2
 #elif	ANALOG_MASK & 4
@@ -31,7 +34,7 @@ uint8_t adc_running_mask, adc_counter;
 	#define	ANALOG_START			7
 	#define	ANALOG_START_MASK	128
 #else
-	// ANALOG_MASK == 1 or 0, either way defines are the same except they're not used if ANALOG_MASK == 0
+	// ANALOG_MASK == 0
 	#define	ANALOG_START			0
 	#define	ANALOG_START_MASK	1
 #endif