Skip to content

Commit b87f9e5

Browse files
fpistmfpistm
committed
Fix #1
For analog api 0 is now D0. Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent 100da0d commit b87f9e5

File tree

8 files changed

+17
-18
lines changed

8 files changed

+17
-18
lines changed

‎cores/arduino/wiring_analog.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ void analogOutputInit(void) {
7171
void analogWrite(uint32_t ulPin, uint32_t ulValue) {
7272

7373
uint8_t do_init = 0;
74-
uint32_t dp = analogToDigital(ulPin);
7574
PinName p = analogToPinName(ulPin);
7675
if(p != NC) {
7776
if(pin_in_pinmap(p, PinMap_DAC)) {
@@ -92,13 +91,13 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {
9291
ulValue, do_init);
9392
} else { //DIGITAL PIN ONLY
9493
// Defaults to digital write
95-
pinMode(dp, OUTPUT);
94+
pinMode(ulPin, OUTPUT);
9695
ulValue = mapResolution(ulValue, _writeResolution, 8);
9796
if (ulValue < 128) {
98-
digitalWrite(dp, LOW);
97+
digitalWrite(ulPin, LOW);
9998
}
10099
else {
101-
digitalWrite(dp, HIGH);
100+
digitalWrite(ulPin, HIGH);
102101
}
103102
}
104103
}

‎variants/DISCO_F407VG/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ enum {
8080
// Convert a digital pin number Dxx to a PinName Pxy
8181
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8282
// Convert an analog pin number Axx to a PinName Pxy
83-
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
83+
#define analogToPinName(p) (digitalToPinName(p))
8484
// Convert an analog pin number to a digital pin number
85-
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
85+
#define analogToDigital(p) (p)
8686
// Convert a PinName Pxy to a pin number
8787
uint32_t pinNametoPinNumber(PinName p);
8888

‎variants/DISCO_F746NG/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ enum {
7474
// Convert a digital pin number Dxx to a PinName Pxy
7575
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
7676
// Convert an analog pin number Axx to a PinName Pxy
77-
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
77+
#define analogToPinName(p) (digitalToPinName(p))
7878
// Convert an analog pin number to a digital pin number
79-
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
79+
#define analogToDigital(p) (p)
8080
// Convert a PinName Pxy to a pin number
8181
uint32_t pinNametoPinNumber(PinName p);
8282

‎variants/NUCLEO_F091RC/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ enum {
7777
// Convert a digital pin number Dxx to a PinName Pxy
7878
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
7979
// Convert an analog pin number Axx to a PinName Pxy
80-
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
80+
#define analogToPinName(p) (digitalToPinName(p))
8181
// Convert an analog pin number to a digital pin number
82-
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
82+
#define analogToDigital(p) (p)
8383
// Convert a PinName Pxy to a pin number
8484
uint32_t pinNametoPinNumber(PinName p);
8585

‎variants/NUCLEO_F303RE/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ enum {
7777
// Convert a digital pin number Dxx to a PinName Pxy
7878
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
7979
// Convert an analog pin number Axx to a PinName Pxy
80-
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
80+
#define analogToPinName(p) (digitalToPinName(p))
8181
// Convert an analog pin number to a digital pin number
82-
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
82+
#define analogToDigital(p) (p)
8383
// Convert a PinName Pxy to a pin number
8484
uint32_t pinNametoPinNumber(PinName p);
8585

‎variants/NUCLEO_F429ZI/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ enum {
8080
// Convert a digital pin number Dxx to a PinName Pxy
8181
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8282
// Convert an analog pin number Axx to a PinName Pxy
83-
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
83+
#define analogToPinName(p) (digitalToPinName(p))
8484
// Convert an analog pin number to a digital pin number
85-
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
85+
#define analogToDigital(p) (p)
8686
// Convert a PinName Pxy to a pin number
8787
uint32_t pinNametoPinNumber(PinName p);
8888

‎variants/NUCLEO_L053R8/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ enum {
7777
// Convert a digital pin number Dxx to a PinName Pxy
7878
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
7979
// Convert an analog pin number Axx to a PinName Pxy
80-
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
80+
#define analogToPinName(p) (digitalToPinName(p))
8181
// Convert an analog pin number to a digital pin number
82-
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
82+
#define analogToDigital(p) (p)
8383
// Convert a PinName Pxy to a pin number
8484
uint32_t pinNametoPinNumber(PinName p);
8585

‎variants/NUCLEO_L476RG/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ enum {
7777
// Convert a digital pin number Dxx to a PinName Pxy
7878
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
7979
// Convert an analog pin number Axx to a PinName Pxy
80-
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
80+
#define analogToPinName(p) (digitalToPinName(p))
8181
// Convert an analog pin number to a digital pin number
82-
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
82+
#define analogToDigital(p) (p)
8383
// Convert a PinName Pxy to a pin number
8484
uint32_t pinNametoPinNumber(PinName p);
8585

0 commit comments

Comments
 (0)