another A6/A7 fix

ladyada · ladyada · commit c569975de64b · 2016-08-03T15:35:44.000-04:00
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
@@ -132,11 +132,13 @@ uint32_t analogRead(uint32_t pin)
 {
   uint32_t valueRead = 0;
 
-  if (pin < A0) {
+  if (pin == 6) {
+    pin = PIN_A6;
+  } else if (pin == 7) {
+    pin = PIN_A7;
+  } else if (pin <= 5) {
     pin += A0;
   }
-  if (pin == 6) pin = PIN_A6;
-  if (pin == 7) pin = PIN_A7;
 
   pinPeripheral(pin, PIO_ANALOG);
 

Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,13 @@ uint32_t analogRead(uint32_t pin)`
`132`	`132`	`{`
`133`	`133`	`uint32_t valueRead = 0;`
`134`	`134`
`135`		`- if (pin < A0) {`
	`135`	`+ if (pin == 6) {`
	`136`	`+ pin = PIN_A6;`
	`137`	`+ } else if (pin == 7) {`
	`138`	`+ pin = PIN_A7;`
	`139`	`+ } else if (pin <= 5) {`
`136`	`140`	`pin += A0;`
`137`	`141`	`}`
`138`		`- if (pin == 6) pin = PIN_A6;`
`139`		`- if (pin == 7) pin = PIN_A7;`
`140`	`142`
`141`	`143`	`pinPeripheral(pin, PIO_ANALOG);`
`142`	`144`