Fix #1

fpistm · fpistm · commit b87f9e560aa1 · 2017-05-22T14:21:02.000+02:00
For analog api 0 is now D0.

Signed-off-by: Frederic.Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
@@ -71,7 +71,6 @@ void analogOutputInit(void) {
 void analogWrite(uint32_t ulPin, uint32_t ulValue) {
 
   uint8_t do_init = 0;
-  uint32_t dp = analogToDigital(ulPin);
   PinName p = analogToPinName(ulPin);
   if(p != NC) {
     if(pin_in_pinmap(p, PinMap_DAC)) {
@@ -92,13 +91,13 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {
                    ulValue, do_init);
       } else { //DIGITAL PIN ONLY
         // Defaults to digital write
-        pinMode(dp, OUTPUT);
+        pinMode(ulPin, OUTPUT);
         ulValue = mapResolution(ulValue, _writeResolution, 8);
         if (ulValue < 128) {
-          digitalWrite(dp, LOW);
+          digitalWrite(ulPin, LOW);
         }
         else {
-          digitalWrite(dp, HIGH);
+          digitalWrite(ulPin, HIGH);
 	  }
     }
   }
diff --git a/variants/DISCO_F407VG/variant.h b/variants/DISCO_F407VG/variant.h
@@ -80,9 +80,9 @@ enum {
 // Convert a digital pin number Dxx to a PinName Pxy
 #define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
 // Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
+#define analogToPinName(p)      (digitalToPinName(p))
 // Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#define analogToDigital(p)      (p)
 // Convert a PinName Pxy to a pin number
 uint32_t pinNametoPinNumber(PinName p);
 
diff --git a/variants/DISCO_F746NG/variant.h b/variants/DISCO_F746NG/variant.h
@@ -74,9 +74,9 @@ enum {
 // Convert a digital pin number Dxx to a PinName Pxy
 #define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
 // Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
+#define analogToPinName(p)      (digitalToPinName(p))
 // Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#define analogToDigital(p)      (p)
 // Convert a PinName Pxy to a pin number
 uint32_t pinNametoPinNumber(PinName p);
 
diff --git a/variants/NUCLEO_F091RC/variant.h b/variants/NUCLEO_F091RC/variant.h
@@ -77,9 +77,9 @@ enum {
 // Convert a digital pin number Dxx to a PinName Pxy
 #define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
 // Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
+#define analogToPinName(p)      (digitalToPinName(p))
 // Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#define analogToDigital(p)      (p)
 // Convert a PinName Pxy to a pin number
 uint32_t pinNametoPinNumber(PinName p);
 
diff --git a/variants/NUCLEO_F303RE/variant.h b/variants/NUCLEO_F303RE/variant.h
@@ -77,9 +77,9 @@ enum {
 // Convert a digital pin number Dxx to a PinName Pxy
 #define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
 // Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
+#define analogToPinName(p)      (digitalToPinName(p))
 // Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#define analogToDigital(p)      (p)
 // Convert a PinName Pxy to a pin number
 uint32_t pinNametoPinNumber(PinName p);
 
diff --git a/variants/NUCLEO_F429ZI/variant.h b/variants/NUCLEO_F429ZI/variant.h
@@ -80,9 +80,9 @@ enum {
 // Convert a digital pin number Dxx to a PinName Pxy
 #define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
 // Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
+#define analogToPinName(p)      (digitalToPinName(p))
 // Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#define analogToDigital(p)      (p)
 // Convert a PinName Pxy to a pin number
 uint32_t pinNametoPinNumber(PinName p);
 
diff --git a/variants/NUCLEO_L053R8/variant.h b/variants/NUCLEO_L053R8/variant.h
@@ -77,9 +77,9 @@ enum {
 // Convert a digital pin number Dxx to a PinName Pxy
 #define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
 // Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
+#define analogToPinName(p)      (digitalToPinName(p))
 // Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#define analogToDigital(p)      (p)
 // Convert a PinName Pxy to a pin number
 uint32_t pinNametoPinNumber(PinName p);
 
diff --git a/variants/NUCLEO_L476RG/variant.h b/variants/NUCLEO_L476RG/variant.h
@@ -77,9 +77,9 @@ enum {
 // Convert a digital pin number Dxx to a PinName Pxy
 #define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
 // Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
+#define analogToPinName(p)      (digitalToPinName(p))
 // Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+#define analogToDigital(p)      (p)
 // Convert a PinName Pxy to a pin number
 uint32_t pinNametoPinNumber(PinName p);
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ void analogOutputInit(void) {`
`71`	`71`	`void analogWrite(uint32_t ulPin, uint32_t ulValue) {`
`72`	`72`
`73`	`73`	`uint8_t do_init = 0;`
`74`		`- uint32_t dp = analogToDigital(ulPin);`
`75`	`74`	`PinName p = analogToPinName(ulPin);`
`76`	`75`	`if(p != NC) {`
`77`	`76`	`if(pin_in_pinmap(p, PinMap_DAC)) {`
`@@ -92,13 +91,13 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {`
`92`	`91`	`ulValue, do_init);`
`93`	`92`	`} else { //DIGITAL PIN ONLY`
`94`	`93`	`// Defaults to digital write`
`95`		`- pinMode(dp, OUTPUT);`
	`94`	`+ pinMode(ulPin, OUTPUT);`
`96`	`95`	`ulValue = mapResolution(ulValue, _writeResolution, 8);`
`97`	`96`	`if (ulValue < 128) {`
`98`		`- digitalWrite(dp, LOW);`
	`97`	`+ digitalWrite(ulPin, LOW);`
`99`	`98`	`}`
`100`	`99`	`else {`
`101`		`- digitalWrite(dp, HIGH);`
	`100`	`+ digitalWrite(ulPin, HIGH);`
`102`	`101`	`}`
`103`	`102`	`}`
`104`	`103`	`}`