Skip to content

Commit 69a9648

Browse files
fpistmfpistm
committed
Make variant definition more generic
Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent a5fdf7d commit 69a9648

File tree

6 files changed

+72
-84
lines changed

6 files changed

+72
-84
lines changed

‎variants/DISCO_F407VG/variant.h‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,23 @@ enum {
6666
DEND
6767
};
6868

69-
//Analog pins
70-
#define A0 79
71-
#define A1 (A0+1)
72-
#define A2 (A0+2)
73-
#define A3 (A0+3)
74-
#define A4 (A0+4)
75-
#define A5 (A0+5)
76-
77-
#define NUM_DIGITAL_PINS DEND
78-
#define NUM_ANALOG_INPUTS (sizeof(PinMap_ADC)/sizeof(PinMap))
79-
#define MAX_DIGITAL_IOS NUM_DIGITAL_PINS
80-
#define MAX_ANALOG_IOS NUM_ANALOG_INPUTS
69+
enum {
70+
A_START_AFTER = D78,
71+
A0, A1, A2, A3, A4, A5,
72+
AEND
73+
};
74+
75+
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
76+
#define MAX_DIGITAL_IOS DEND
77+
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
78+
#define NUM_ANALOG_INPUTS (AEND - A0)
8179

8280
// Convert a digital pin number Dxx to a PinName Pxy
8381
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8482
// Convert an analog pin number Axx to a PinName Pxy
85-
#define analogToPinName(p) ((p < 6) ? digitalToPinName(p+79) : digitalToPinName(p))
83+
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
8684
// Convert an analog pin number to a digital pin number
87-
#define analogToDigital(p) ((p < 6) ? (p+79) : p)
85+
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
8886
// Convert a PinName Pxy to a pin number
8987
uint32_t pinNametoPinNumber(PinName p);
9088

‎variants/NUCLEO_F091RC/variant.h‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,23 @@ enum {
6363
DEND
6464
};
6565

66-
//Analog pins
67-
#define A0 46
68-
#define A1 (A0+1)
69-
#define A2 (A0+2)
70-
#define A3 (A0+3)
71-
#define A4 (A0+4)
72-
#define A5 (A0+5)
73-
74-
#define NUM_DIGITAL_PINS DEND
75-
#define NUM_ANALOG_INPUTS (sizeof(PinMap_ADC)/sizeof(PinMap))
76-
#define MAX_DIGITAL_IOS NUM_DIGITAL_PINS
77-
#define MAX_ANALOG_IOS NUM_ANALOG_INPUTS
66+
enum {
67+
A_START_AFTER = D45,
68+
A0, A1, A2, A3, A4, A5,
69+
AEND
70+
};
71+
72+
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73+
#define MAX_DIGITAL_IOS DEND
74+
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
75+
#define NUM_ANALOG_INPUTS (AEND - A0)
7876

7977
// Convert a digital pin number Dxx to a PinName Pxy
8078
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8179
// Convert an analog pin number Axx to a PinName Pxy
82-
#define analogToPinName(p) ((p < 6) ? digitalToPinName(p+46) : digitalToPinName(p))
80+
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
8381
// Convert an analog pin number to a digital pin number
84-
#define analogToDigital(p) ((p < 6) ? (p+46) : p)
82+
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
8583
// Convert a PinName Pxy to a pin number
8684
uint32_t pinNametoPinNumber(PinName p);
8785

‎variants/NUCLEO_F303RE/variant.h‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,23 @@ enum {
6363
DEND
6464
};
6565

66-
//Analog pins
67-
#define A0 46
68-
#define A1 (A0+1)
69-
#define A2 (A0+2)
70-
#define A3 (A0+3)
71-
#define A4 (A0+4)
72-
#define A5 (A0+5)
73-
74-
#define NUM_DIGITAL_PINS DEND
75-
#define NUM_ANALOG_INPUTS (sizeof(PinMap_ADC)/sizeof(PinMap))
76-
#define MAX_DIGITAL_IOS NUM_DIGITAL_PINS
77-
#define MAX_ANALOG_IOS NUM_ANALOG_INPUTS
66+
enum {
67+
A_START_AFTER = D45,
68+
A0, A1, A2, A3, A4, A5,
69+
AEND
70+
};
71+
72+
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73+
#define MAX_DIGITAL_IOS DEND
74+
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
75+
#define NUM_ANALOG_INPUTS (AEND - A0)
7876

7977
// Convert a digital pin number Dxx to a PinName Pxy
8078
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8179
// Convert an analog pin number Axx to a PinName Pxy
82-
#define analogToPinName(p) ((p < 6) ? digitalToPinName(p+46) : digitalToPinName(p))
80+
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
8381
// Convert an analog pin number to a digital pin number
84-
#define analogToDigital(p) ((p < 6) ? (p+46) : p)
82+
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
8583
// Convert a PinName Pxy to a pin number
8684
uint32_t pinNametoPinNumber(PinName p);
8785

‎variants/NUCLEO_F429ZI/variant.h‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,23 @@ enum {
6666
DEND
6767
};
6868

69-
//Analog pins
70-
#define A0 73
71-
#define A1 (A0+1)
72-
#define A2 (A0+2)
73-
#define A3 (A0+3)
74-
#define A4 (A0+4)
75-
#define A5 (A0+5)
76-
77-
#define NUM_DIGITAL_PINS DEND
78-
#define NUM_ANALOG_INPUTS (sizeof(PinMap_ADC)/sizeof(PinMap))
79-
#define MAX_DIGITAL_IOS NUM_DIGITAL_PINS
80-
#define MAX_ANALOG_IOS NUM_ANALOG_INPUTS
69+
enum {
70+
A_START_AFTER = D72,
71+
A0, A1, A2, A3, A4, A5,
72+
AEND
73+
};
74+
75+
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
76+
#define MAX_DIGITAL_IOS DEND
77+
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
78+
#define NUM_ANALOG_INPUTS (AEND - A0)
8179

8280
// Convert a digital pin number Dxx to a PinName Pxy
8381
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8482
// Convert an analog pin number Axx to a PinName Pxy
85-
#define analogToPinName(p) ((p < 6) ? digitalToPinName(p+73) : digitalToPinName(p))
83+
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
8684
// Convert an analog pin number to a digital pin number
87-
#define analogToDigital(p) ((p < 6) ? (p+73) : p)
85+
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
8886
// Convert a PinName Pxy to a pin number
8987
uint32_t pinNametoPinNumber(PinName p);
9088

‎variants/NUCLEO_L053R8/variant.h‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,23 @@ enum {
6363
DEND
6464
};
6565

66-
//Analog pins
67-
#define A0 46
68-
#define A1 (A0+1)
69-
#define A2 (A0+2)
70-
#define A3 (A0+3)
71-
#define A4 (A0+4)
72-
#define A5 (A0+5)
73-
74-
#define NUM_DIGITAL_PINS DEND
75-
#define NUM_ANALOG_INPUTS (sizeof(PinMap_ADC)/sizeof(PinMap))
76-
#define MAX_DIGITAL_IOS NUM_DIGITAL_PINS
77-
#define MAX_ANALOG_IOS NUM_ANALOG_INPUTS
66+
enum {
67+
A_START_AFTER = D45,
68+
A0, A1, A2, A3, A4, A5,
69+
AEND
70+
};
71+
72+
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73+
#define MAX_DIGITAL_IOS DEND
74+
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
75+
#define NUM_ANALOG_INPUTS (AEND - A0)
7876

7977
// Convert a digital pin number Dxx to a PinName Pxy
8078
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8179
// Convert an analog pin number Axx to a PinName Pxy
82-
#define analogToPinName(p) ((p < 6) ? digitalToPinName(p+46) : digitalToPinName(p))
80+
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
8381
// Convert an analog pin number to a digital pin number
84-
#define analogToDigital(p) ((p < 6) ? (p+46) : p)
82+
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
8583
// Convert a PinName Pxy to a pin number
8684
uint32_t pinNametoPinNumber(PinName p);
8785

‎variants/NUCLEO_L476RG/variant.h‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,23 @@ enum {
6363
DEND
6464
};
6565

66-
//Analog pins
67-
#define A0 46
68-
#define A1 (A0+1)
69-
#define A2 (A0+2)
70-
#define A3 (A0+3)
71-
#define A4 (A0+4)
72-
#define A5 (A0+5)
73-
74-
#define NUM_DIGITAL_PINS DEND
75-
#define NUM_ANALOG_INPUTS (sizeof(PinMap_ADC)/sizeof(PinMap))
76-
#define MAX_DIGITAL_IOS NUM_DIGITAL_PINS
77-
#define MAX_ANALOG_IOS NUM_ANALOG_INPUTS
66+
enum {
67+
A_START_AFTER = D45,
68+
A0, A1, A2, A3, A4, A5,
69+
AEND
70+
};
71+
72+
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73+
#define MAX_DIGITAL_IOS DEND
74+
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
75+
#define NUM_ANALOG_INPUTS (AEND - A0)
7876

7977
// Convert a digital pin number Dxx to a PinName Pxy
8078
#define digitalToPinName(p) ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
8179
// Convert an analog pin number Axx to a PinName Pxy
82-
#define analogToPinName(p) ((p < 6) ? digitalToPinName(p+46) : digitalToPinName(p))
80+
#define analogToPinName(p) ((p < NUM_ANALOG_INPUTS) ? digitalToPinName(p+A0) : digitalToPinName(p))
8381
// Convert an analog pin number to a digital pin number
84-
#define analogToDigital(p) ((p < 6) ? (p+46) : p)
82+
#define analogToDigital(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
8583
// Convert a PinName Pxy to a pin number
8684
uint32_t pinNametoPinNumber(PinName p);
8785

0 commit comments

Comments
 (0)