Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a969480

Browse files
fpistmfpistm
committedDec 5, 2017
Clean variants files
- Common definitions are moved to pins_arduino_var.h. They could be redefined in variant.h if needed. - Removed *UART_EMUL* definitions as it need to be reworked in SoftwareSerial library. - Pin number over D15 replaced by pin name (more relevant) - Fixed some typos Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 3d7839e commit a969480

File tree

22 files changed

+216
-611
lines changed

22 files changed

+216
-611
lines changed
 

‎cores/arduino/pins_arduino_var.h

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,54 @@ uint32_t pinNametoDigitalPin(PinName p);
100100
(digitalPinFirstOccurence(p) == PIN_SERIAL_TX))
101101
#endif
102102

103+
// Default Definitions, could be redefined in variant.h
104+
#ifndef ADC_RESOLUTION
105+
#define ADC_RESOLUTION 12
106+
#endif
107+
#ifndef DACC_RESOLUTION
108+
#define DACC_RESOLUTION 12
109+
#endif
110+
#ifndef PWM_RESOLUTION
111+
#define PWM_RESOLUTION 8
112+
#endif
113+
#ifndef PWM_FREQUENCY
114+
#define PWM_FREQUENCY 1000
115+
#endif
116+
#ifndef PWM_MAX_DUTY_CYCLE
117+
#define PWM_MAX_DUTY_CYCLE 255
118+
#endif
119+
120+
// Default for Arduino connector compatibility
121+
// SPI Definitions
122+
#ifndef SS
123+
#define SS 10
124+
#endif
125+
#ifndef SS1
126+
#define SS1 4
127+
#endif
128+
#ifndef SS2
129+
#define SS2 7
130+
#endif
131+
#ifndef SS3
132+
#define SS3 8
133+
#endif
134+
#ifndef MOSI
135+
#define MOSI 11
136+
#endif
137+
#ifndef MISO
138+
#define MISO 12
139+
#endif
140+
#ifndef SCK
141+
#define SCK 13
142+
#endif
143+
// I2C Definitions
144+
#ifndef SDA
145+
#define SDA 14
146+
#endif
147+
#ifndef SCL
148+
#define SCL 15
149+
#endif
150+
103151
#ifdef __cplusplus
104152
}
105153
#endif

‎variants/DISCO_F100RB/variant.h

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -112,42 +112,32 @@ enum {
112112
AEND
113113
};
114114

115-
//ADC resolution is 12bits
116-
#define ADC_RESOLUTION 12
117-
#define DACC_RESOLUTION 12
118-
119-
//PWR resolution
120-
#define PWM_RESOLUTION 8
121-
#define PWM_FREQUENCY 1000
122-
#define PWM_MAX_DUTY_CYCLE 255
123-
124-
//On-board LED pin number
125-
#define LED_BUILTIN 21
115+
// On-board LED pin number
116+
#define LED_BUILTIN PC9
126117
#define LED_GREEN LED_BUILTIN
127-
#define LED_BLUE 20
118+
#define LED_BLUE PC8
128119

129-
//On-board user button
120+
// On-board user button
130121
#define USER_BTN 5
131122

132-
//SPI definitions
133-
#define SS 43
134-
#define SS1 40
135-
#define SS2 41
136-
#define SS3 42
137-
#define MOSI 46
138-
#define MISO 45
139-
#define SCK 44
140-
141-
//I2C Definitions
142-
#define SDA 38
143-
#define SCL 37
144-
145-
//Timer Definitions
146-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
123+
// SPI Definitions
124+
#define SS PB12
125+
#define SS1 PB9
126+
#define SS2 PB10
127+
#define SS3 PB11
128+
#define MOSI PB15
129+
#define MISO PB14
130+
#define SCK PB13
131+
132+
// I2C Definitions
133+
#define SDA PB7
134+
#define SCL PB6
135+
136+
// Timer Definitions
137+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
147138
#define TIMER_TONE TIM15
148-
#define TIMER_UART_EMULATED TIM16
149139

150-
//Do not use basic timer: OC is required
140+
// Do not use basic timer: OC is required
151141
#define TIMER_SERVO TIM17 //TODO: advanced-control timers don't work
152142

153143
// UART Definitions

‎variants/DISCO_F407VG/variant.h

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -137,49 +137,33 @@ enum {
137137
AEND
138138
};
139139

140-
//ADC resolution is 12bits
141-
#define ADC_RESOLUTION 12
142-
#define DACC_RESOLUTION 12
143-
144-
//PWR resolution
145-
#define PWM_RESOLUTION 8
146-
#define PWM_FREQUENCY 1000
147-
#define PWM_MAX_DUTY_CYCLE 255
148-
149-
//On-board LED pin number
150-
#define LED_BUILTIN 18
140+
// On-board LED pin number
141+
#define LED_BUILTIN PD12
151142
#define LED_GREEN LED_BUILTIN
152-
#define LED_BLUE 58
153-
#define LED_RED 19
154-
#define LED_ORANGE 57
143+
#define LED_BLUE PD15
144+
#define LED_RED PD14
145+
#define LED_ORANGE PD13
155146

156-
//On-board user button
147+
// On-board user button
157148
#define USER_BTN 2
158149

159-
160-
//SPI definitions
161-
#define SS 10
162-
#define SS1 4
150+
// SPI Definitions
163151
#define SS2 14
164-
#define MOSI 44
152+
#define MOSI PA7
165153
#define MISO 5
166-
#define SCK 43
154+
#define SCK PA5
167155

168-
//I2C Definitions
169-
#define SDA 66
170-
#define SCL 26
156+
// I2C Definitions
157+
#define SDA PB7
158+
#define SCL PB8
171159

172-
//Timer Definitions
173-
//Do not use timer used by PWM pin. See PinMap_PWM.
160+
// Timer Definitions
161+
// Do not use timer used by PWM pin. See PinMap_PWM.
174162
#define TIMER_TONE TIM6
175163
#define TIMER_SERVO TIM7
176-
#define TIMER_UART_EMULATED TIM6
177164

178165
// UART Definitions
179166
#define SERIAL_UART_INSTANCE 2 //Connected to ST-Link
180-
// UART Emulation
181-
#define UART_EMUL_RX PE_9
182-
#define UART_EMUL_TX PE_11
183167

184168
// Default pin used for 'Serial' instance (ex: ST-Link)
185169
// Mandatory for Firmata

‎variants/DISCO_F746NG/variant.h

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -69,42 +69,18 @@ enum {
6969
AEND
7070
};
7171

72-
//ADC resolution is 12bits
73-
#define ADC_RESOLUTION 12
74-
#define DACC_RESOLUTION 12
75-
76-
//PWR resolution
77-
#define PWM_RESOLUTION 8
78-
#define PWM_FREQUENCY 1000
79-
#define PWM_MAX_DUTY_CYCLE 255
80-
81-
//On-board LED pin number
72+
// On-board LED pin number
8273
#define LED_BUILTIN 13
8374
#define LED_GREEN LED_BUILTIN
8475

85-
//On-board user button
86-
#define USER_BTN 22
87-
88-
89-
//SPI definitions
90-
#define SS 10
91-
#define SS1 4
92-
#define SS2 7
93-
#define SS3 8
94-
#define MOSI 11
95-
#define MISO 12
96-
#define SCK 13
97-
98-
//I2C Definitions
99-
#define SDA 14
100-
#define SCL 15
76+
// On-board user button
77+
#define USER_BTN PI11
10178

102-
//Timer Definitions
103-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
79+
// Timer Definitions
80+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
10481
#define TIMER_TONE TIM6
105-
#define TIMER_UART_EMULATED TIM7
10682

107-
//Do not use basic timer: OC is required
83+
// Do not use basic timer: OC is required
10884
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
10985

11086
// UART Definitions

‎variants/DISCO_L072CZ_LRWAN1/variant.h

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,7 @@ enum {
7979
AEND
8080
};
8181

82-
//ADC resolution is 12bits
83-
#define ADC_RESOLUTION 12
84-
#define DACC_RESOLUTION 12
85-
86-
//PWR resolution
87-
#define PWM_RESOLUTION 8
88-
#define PWM_FREQUENCY 1000
89-
#define PWM_MAX_DUTY_CYCLE 255
90-
91-
//On-board LED pin number
82+
// On-board LED pin number
9283
#define LED_BUILTIN PA5
9384
#define LED_LD2 LED_BUILTIN
9485
#define LED_GREEN2 LED_BUILTIN
@@ -99,28 +90,14 @@ enum {
9990
#define LED_RED 5
10091
#define LED_LD4 LED_RED
10192

102-
//On-board user button
93+
// On-board user button
10394
#define USER_BTN 6
10495

105-
106-
//SPI definitions
107-
#define SS 10
108-
#define SS1 4
109-
#define SS2 7
110-
#define SS3 8
111-
#define MOSI 11
112-
#define MISO 12
113-
#define SCK 13
114-
115-
//I2C Definitions
116-
#define SDA 14
117-
#define SCL 15
118-
119-
//Timer Definitions
120-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
96+
// Timer Definitions
97+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
12198
#define TIMER_TONE TIM22
12299

123-
//Do not use basic timer: OC is required
100+
// Do not use basic timer: OC is required
124101
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
125102

126103
// UART Definitions

‎variants/DISCO_L475VG_IOT/variant.h

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -139,45 +139,21 @@ enum {
139139
AEND
140140
};
141141

142-
//ADC resolution is 12bits
143-
#define ADC_RESOLUTION 12
144-
#define DACC_RESOLUTION 12
145-
146-
//PWR resolution
147-
#define PWM_RESOLUTION 8
148-
#define PWM_FREQUENCY 1000
149-
#define PWM_MAX_DUTY_CYCLE 255
150-
151-
//On-board LED pin number
142+
// On-board LED pin number
152143
#define LED_BUILTIN 13
153144
#define LED1 LED_BUILTIN
154145
#define LED2 PB14
155146
#define LED3 PC9
156147
#define LED4 LED3
157148

158-
//On-board user button
149+
// On-board user button
159150
#define USER_BTN PC13
160151

161-
162-
//SPI definitions
163-
#define SS 10
164-
#define SS1 4
165-
#define SS2 7
166-
#define SS3 8
167-
#define MOSI 11
168-
#define MISO 12
169-
#define SCK 13
170-
171-
//I2C Definitions
172-
#define SDA 14
173-
#define SCL 15
174-
175-
//Timer Definitions
176-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
152+
// Timer Definitions
153+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
177154
#define TIMER_TONE TIM6
178-
#define TIMER_UART_EMULATED TIM7
179155

180-
//Do not use basic timer: OC is required
156+
// Do not use basic timer: OC is required
181157
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
182158

183159
// UART Definitions

‎variants/NUCLEO_F030R8/variant.h

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -112,40 +112,18 @@ enum {
112112
AEND
113113
};
114114

115-
//ADC resolution is 12bits
116-
#define ADC_RESOLUTION 12
117-
118-
//PWR resolution
119-
#define PWM_RESOLUTION 8
120-
#define PWM_FREQUENCY 1000
121-
#define PWM_MAX_DUTY_CYCLE 255
122-
123-
//On-board LED pin number
115+
// On-board LED pin number
124116
#define LED_BUILTIN 13
125117
#define LED_GREEN LED_BUILTIN
126118

127-
//On-board user button
128-
#define USER_BTN 24
129-
130-
131-
//SPI definitions
132-
#define SS 10
133-
#define SS1 4
134-
#define SS2 7
135-
#define SS3 8
136-
#define MOSI 11
137-
#define MISO 12
138-
#define SCK 13
139-
140-
//I2C Definitions
141-
#define SDA 14
142-
#define SCL 15
119+
// On-board user button
120+
#define USER_BTN PC13
143121

144-
//Timer Definitions
145-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
122+
// Timer Definitions
123+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
146124
#define TIMER_TONE TIM6
147125

148-
//Do not use basic timer: OC is required
126+
// Do not use basic timer: OC is required
149127
#define TIMER_SERVO TIM3 //TODO: advanced-control timers don't work
150128

151129
// UART Definitions

‎variants/NUCLEO_F091RC/variant.h

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -109,49 +109,22 @@ enum {
109109
AEND
110110
};
111111

112-
//ADC resolution is 12bits
113-
#define ADC_RESOLUTION 12
114-
#define DACC_RESOLUTION 12
115-
116-
//PWR resolution
117-
#define PWM_RESOLUTION 8
118-
#define PWM_FREQUENCY 1000
119-
#define PWM_MAX_DUTY_CYCLE 255
120-
121-
//On-board LED pin number
112+
// On-board LED pin number
122113
#define LED_BUILTIN 13
123114
#define LED_GREEN LED_BUILTIN
124115

125-
//On-board user button
126-
#define USER_BTN 23
127-
128-
129-
//SPI definitions
130-
#define SS 10
131-
#define SS1 4
132-
#define SS2 7
133-
#define SS3 8
134-
#define MOSI 11
135-
#define MISO 12
136-
#define SCK 13
137-
138-
//I2C Definitions
139-
#define SDA 14
140-
#define SCL 15
116+
// On-board user button
117+
#define USER_BTN PC13
141118

142-
//Timer Definitions
143-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
119+
// Timer Definitions
120+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
144121
#define TIMER_TONE TIM6
145-
#define TIMER_UART_EMULATED TIM7
146122

147-
//Do not use basic timer: OC is required
123+
// Do not use basic timer: OC is required
148124
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
149125

150126
// UART Definitions
151127
#define SERIAL_UART_INSTANCE 2 //Connected to ST-Link
152-
// UART Emulation
153-
#define UART_EMUL_RX PB_14
154-
#define UART_EMUL_TX PB_13
155128

156129
// Default pin used for 'Serial' instance (ex: ST-Link)
157130
// Mandatory for Firmata

‎variants/NUCLEO_F103RB/variant.h

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -111,41 +111,18 @@ enum {
111111
AEND
112112
};
113113

114-
//ADC resolution is 12bits
115-
#define ADC_RESOLUTION 12
116-
#define DACC_RESOLUTION 12
117-
118-
//PWR resolution
119-
#define PWM_RESOLUTION 8
120-
#define PWM_FREQUENCY 1000
121-
#define PWM_MAX_DUTY_CYCLE 255
122-
123-
//On-board LED pin number
114+
// On-board LED pin number
124115
#define LED_BUILTIN 13
125116
#define LED_GREEN LED_BUILTIN
126117

127-
//On-board user button
128-
#define USER_BTN 23
129-
130-
//SPI definitions
131-
#define SS 10
132-
#define SS1 4
133-
#define SS2 7
134-
#define SS3 8
135-
#define MOSI 11
136-
#define MISO 12
137-
#define SCK 13
138-
139-
//I2C Definitions
140-
#define SDA 14
141-
#define SCL 15
118+
// On-board user button
119+
#define USER_BTN PC13
142120

143-
//Timer Definitions
144-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
121+
// Timer Definitions
122+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
145123
#define TIMER_TONE TIM4
146-
#define TIMER_UART_EMULATED TIM4
147124

148-
//Do not use basic timer: OC is required
125+
// Do not use basic timer: OC is required
149126
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
150127

151128
// UART Definitions

‎variants/NUCLEO_F207ZG/variant.h

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -155,41 +155,20 @@ enum {
155155
AEND
156156
};
157157

158-
//ADC resolution is 12bits
159-
#define ADC_RESOLUTION 12
160-
#define DACC_RESOLUTION 12
161-
162-
//PWR resolution
163-
#define PWM_RESOLUTION 8
164-
#define PWM_FREQUENCY 1000
165-
#define PWM_MAX_DUTY_CYCLE 255
166-
167-
//On-board LED pin number
168-
#define LED_BUILTIN 33
158+
// On-board LED pin number
159+
#define LED_BUILTIN PB0
169160
#define LED_GREEN LED_BUILTIN
170-
#define LED_BLUE 73
171-
#define LED_RED 74
172-
173-
//On-board user button
174-
#define USER_BTN 75
175-
176-
177-
//SPI definitions
178-
#define SS 10
179-
#define MOSI 11
180-
#define MISO 12
181-
#define SCK 13
161+
#define LED_BLUE PB7
162+
#define LED_RED PB14
182163

183-
//I2C Definitions
184-
#define SDA 14
185-
#define SCL 15
164+
// On-board user button
165+
#define USER_BTN PC13
186166

187-
//Timer Definitions
188-
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
167+
// Timer Definitions
168+
// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
189169
#define TIMER_TONE TIM6
190-
#define TIMER_UART_EMULATED TIM7
191170

192-
//Do not use basic timer: OC is required
171+
// Do not use basic timer: OC is required
193172
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
194173

195174
// UART Definitions

‎variants/NUCLEO_F302R8/variant.h

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -109,41 +109,18 @@ enum {
109109
AEND
110110
};
111111

112-
//ADC resolution is 12bits
113-
#define ADC_RESOLUTION 12
114-
#define DACC_RESOLUTION 12
115-
116-
//PWR resolution
117-
#define PWM_RESOLUTION 8
118-
#define PWM_FREQUENCY 1000
119-
#define PWM_MAX_DUTY_CYCLE 255
120-
121-
//On-board LED pin number
112+
// On-board LED pin number
122113
#define LED_BUILTIN 13
123114
#define LED_GREEN LED_BUILTIN
124115

125-
//On-board user button
126-
#define USER_BTN 23
127-
128-
129-
//SPI definitions
130-
#define SS 10
131-
#define SS1 4
132-
#define SS2 7
133-
#define SS3 8
134-
#define MOSI 11
135-
#define MISO 12
136-
#define SCK 13
137-
138-
//I2C Definitions
139-
#define SDA 14
140-
#define SCL 15
116+
// On-board user button
117+
#define USER_BTN PC13
141118

142-
//Timer Definitions
143-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
119+
// Timer Definitions
120+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
144121
#define TIMER_TONE TIM6
145122

146-
//Do not use basic timer: OC is required
123+
// Do not use basic timer: OC is required
147124
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
148125

149126
// UART Definitions

‎variants/NUCLEO_F303K8/variant.h

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,38 +67,22 @@ enum {
6767
AEND
6868
};
6969

70-
//ADC resolution is 12bits
71-
#define ADC_RESOLUTION 12
72-
#define DACC_RESOLUTION 12
73-
74-
//PWR resolution
75-
#define PWM_RESOLUTION 8
76-
#define PWM_FREQUENCY 1000
77-
#define PWM_MAX_DUTY_CYCLE 255
78-
79-
//On-board LED pin number
70+
// On-board LED pin number
8071
#define LED_BUILTIN 13
8172
#define LED_GREEN LED_BUILTIN
8273

83-
//On-board user button
74+
// On-board user button
8475
//#define USER_BTN NC
8576

86-
87-
//SPI definitions
88-
#define SS 10
89-
#define MOSI 11
90-
#define MISO 12
91-
#define SCK 13
92-
93-
//I2C Definitions
77+
// I2C Definitions
9478
#define SDA 4
9579
#define SCL 5
9680

97-
//Timer Definitions
98-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
81+
// Timer Definitions
82+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
9983
#define TIMER_TONE TIM6
10084

101-
//Do not use basic timer: OC is required
85+
// Do not use basic timer: OC is required
10286
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
10387

10488
// UART Definitions

‎variants/NUCLEO_F303RE/variant.h

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -111,49 +111,22 @@ enum {
111111
AEND
112112
};
113113

114-
//ADC resolution is 12bits
115-
#define ADC_RESOLUTION 12
116-
#define DACC_RESOLUTION 12
117-
118-
//PWR resolution
119-
#define PWM_RESOLUTION 8
120-
#define PWM_FREQUENCY 1000
121-
#define PWM_MAX_DUTY_CYCLE 255
122-
123-
//On-board LED pin number
114+
// On-board LED pin number
124115
#define LED_BUILTIN 13
125116
#define LED_GREEN LED_BUILTIN
126117

127-
//On-board user button
128-
#define USER_BTN 23
129-
130-
131-
//SPI definitions
132-
#define SS 10
133-
#define SS1 4
134-
#define SS2 7
135-
#define SS3 8
136-
#define MOSI 11
137-
#define MISO 12
138-
#define SCK 13
139-
140-
//I2C Definitions
141-
#define SDA 14
142-
#define SCL 15
118+
// On-board user button
119+
#define USER_BTN PC13
143120

144-
//Timer Definitions
145-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
121+
// Timer Definitions
122+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
146123
#define TIMER_TONE TIM6
147-
#define TIMER_UART_EMULATED TIM7
148124

149125
//Do not use basic timer: OC is required
150126
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
151127

152128
// UART Definitions
153129
#define SERIAL_UART_INSTANCE 2 //Connected to ST-Link
154-
// UART Emulation
155-
#define UART_EMUL_RX PC_1
156-
#define UART_EMUL_TX PC_3
157130

158131
// Default pin used for 'Serial' instance (ex: ST-Link)
159132
// Mandatory for Firmata

‎variants/NUCLEO_F401RE/variant.h

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -110,49 +110,22 @@ enum {
110110
AEND
111111
};
112112

113-
//ADC resolution is 12bits
114-
#define ADC_RESOLUTION 12
115-
#define DACC_RESOLUTION 12
116-
117-
//PWR resolution
118-
#define PWM_RESOLUTION 8
119-
#define PWM_FREQUENCY 1000
120-
#define PWM_MAX_DUTY_CYCLE 255
121-
122-
//On-board LED pin number
113+
// On-board LED pin number
123114
#define LED_BUILTIN 13
124115
#define LED_GREEN LED_BUILTIN
125116

126-
//On-board user button
127-
#define USER_BTN 23
128-
129-
130-
//SPI definitions
131-
#define SS 10
132-
#define SS1 4
133-
#define SS2 7
134-
#define SS3 8
135-
#define MOSI 11
136-
#define MISO 12
137-
#define SCK 13
138-
139-
//I2C Definitions
140-
#define SDA 14
141-
#define SCL 15
117+
// On-board user button
118+
#define USER_BTN PC13
142119

143-
//Timer Definitions
144-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
120+
// Timer Definitions
121+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
145122
#define TIMER_TONE TIM10
146-
#define TIMER_UART_EMULATED TIM11
147123

148-
//Do not use basic timer: OC is required
124+
// Do not use basic timer: OC is required
149125
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
150126

151127
// UART Definitions
152128
#define SERIAL_UART_INSTANCE 2 //Connected to ST-Link
153-
// UART Emulation
154-
#define UART_EMUL_RX PC_1
155-
#define UART_EMUL_TX PC_3
156129

157130
// Default pin used for 'Serial' instance (ex: ST-Link)
158131
// Mandatory for Firmata

‎variants/NUCLEO_F411RE/variant.h

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -110,42 +110,18 @@ enum {
110110
AEND
111111
};
112112

113-
//ADC resolution is 12bits
114-
#define ADC_RESOLUTION 12
115-
#define DACC_RESOLUTION 12
116-
117-
//PWR resolution
118-
#define PWM_RESOLUTION 8
119-
#define PWM_FREQUENCY 1000
120-
#define PWM_MAX_DUTY_CYCLE 255
121-
122-
//On-board LED pin number
113+
// On-board LED pin number
123114
#define LED_BUILTIN 13
124115
#define LED_GREEN LED_BUILTIN
125116

126-
//On-board user button
127-
#define USER_BTN 23
128-
129-
130-
//SPI definitions
131-
#define SS 10
132-
#define SS1 4
133-
#define SS2 7
134-
#define SS3 8
135-
#define MOSI 11
136-
#define MISO 12
137-
#define SCK 13
138-
139-
//I2C Definitions
140-
#define SDA 14
141-
#define SCL 15
117+
// On-board user button
118+
#define USER_BTN PC13
142119

143-
//Timer Definitions
144-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
120+
// Timer Definitions
121+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
145122
#define TIMER_TONE TIM10
146-
#define TIMER_UART_EMULATED TIM11
147123

148-
//Do not use basic timer: OC is required
124+
// Do not use basic timer: OC is required
149125
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
150126

151127
// UART Definitions

‎variants/NUCLEO_F429ZI/variant.h

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -142,51 +142,24 @@ enum {
142142
AEND
143143
};
144144

145-
//ADC resolution is 12bits
146-
#define ADC_RESOLUTION 12
147-
#define DACC_RESOLUTION 12
148-
149-
//PWR resolution
150-
#define PWM_RESOLUTION 8
151-
#define PWM_FREQUENCY 1000
152-
#define PWM_MAX_DUTY_CYCLE 255
153-
154-
//On-board LED pin number
155-
#define LED_BUILTIN 33
145+
// On-board LED pin number
146+
#define LED_BUILTIN PB0
156147
#define LED_GREEN LED_BUILTIN
157-
#define LED_BLUE 73
158-
#define LED_RED 74
159-
160-
//On-board user button
161-
#define USER_BTN 75
162-
163-
164-
//SPI definitions
165-
#define SS 10
166-
#define SS1 4
167-
#define SS2 7
168-
#define SS3 8
169-
#define MOSI 11
170-
#define MISO 12
171-
#define SCK 13
148+
#define LED_BLUE PB7
149+
#define LED_RED PB14
172150

173-
//I2C Definitions
174-
#define SDA 14
175-
#define SCL 15
151+
// On-board user button
152+
#define USER_BTN PC13
176153

177-
//Timer Definitions
178-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
154+
// Timer Definitions
155+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
179156
#define TIMER_TONE TIM6
180-
#define TIMER_UART_EMULATED TIM7
181157

182-
//Do not use basic timer: OC is required
158+
// Do not use basic timer: OC is required
183159
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
184160

185161
// UART Definitions
186162
#define SERIAL_UART_INSTANCE 3 //Connected to ST-Link
187-
// UART Emulation
188-
#define UART_EMUL_RX PF_15
189-
#define UART_EMUL_TX PE_13
190163

191164
// Serial pin used for console (ex: stlink)
192165
// Rerquired by Firmata

‎variants/NUCLEO_F446RE/variant.h

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -111,41 +111,19 @@ enum {
111111
AEND
112112
};
113113

114-
//ADC resolution is 12bits
115-
#define ADC_RESOLUTION 12
116-
#define DACC_RESOLUTION 12
117-
118-
//PWM resolution
119-
#define PWM_RESOLUTION 8
120-
#define PWM_FREQUENCY 1000
121-
#define PWM_MAX_DUTY_CYCLE 255
122-
123-
//On-board LED pin number
114+
// On-board LED pin number
124115
#define LED_BUILTIN 13
125116
#define LED_LD2 LED_BUILTIN
126117
#define LED_GREEN LED_BUILTIN
127118

128-
//On-board user button
119+
// On-board user button
129120
#define USER_BTN PC13
130121

131-
//SPI definitions
132-
#define SS 10
133-
#define SS1 4
134-
#define SS2 7
135-
#define SS3 8
136-
#define MOSI 11
137-
#define MISO 12
138-
#define SCK 13
139-
140-
//I2C Definitions
141-
#define SDA 14
142-
#define SCL 15
143-
144-
//Timer Definitions
145-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
122+
// Timer Definitions
123+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
146124
#define TIMER_TONE TIM10
147125

148-
//Do not use basic timer: OC is required
126+
// Do not use basic timer: OC is required
149127
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
150128

151129
// UART Definitions

‎variants/NUCLEO_L053R8/variant.h

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -109,42 +109,18 @@ enum {
109109
AEND
110110
};
111111

112-
//ADC resolution is 12bits
113-
#define ADC_RESOLUTION 12
114-
#define DACC_RESOLUTION 12
115-
116-
//PWR resolution
117-
#define PWM_RESOLUTION 8
118-
#define PWM_FREQUENCY 1000
119-
#define PWM_MAX_DUTY_CYCLE 255
120-
121-
//On-board LED pin number
112+
// On-board LED pin number
122113
#define LED_BUILTIN 13
123114
#define LED_GREEN LED_BUILTIN
124115

125-
//On-board user button
126-
#define USER_BTN 23
127-
128-
129-
//SPI definitions
130-
#define SS 10
131-
#define SS1 4
132-
#define SS2 7
133-
#define SS3 8
134-
#define MOSI 11
135-
#define MISO 12
136-
#define SCK 13
137-
138-
//I2C Definitions
139-
#define SDA 14
140-
#define SCL 15
116+
// On-board user button
117+
#define USER_BTN PC13
141118

142-
//Timer Definitions
143-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
119+
// Timer Definitions
120+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
144121
#define TIMER_TONE TIM6
145-
#define TIMER_UART_EMULATED TIM7
146122

147-
//Do not use basic timer: OC is required
123+
// Do not use basic timer: OC is required
148124
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
149125

150126
// UART Definitions

‎variants/NUCLEO_L152RE/variant.h

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -114,42 +114,18 @@ enum {
114114
AEND
115115
};
116116

117-
//ADC resolution is 12bits
118-
#define ADC_RESOLUTION 12
119-
#define DACC_RESOLUTION 12
120-
121-
//PWR resolution
122-
#define PWM_RESOLUTION 8
123-
#define PWM_FREQUENCY 1000
124-
#define PWM_MAX_DUTY_CYCLE 255
125-
126-
//On-board LED pin number
117+
// On-board LED pin number
127118
#define LED_BUILTIN 13
128119
#define LED_GREEN LED_BUILTIN
129120

130-
//On-board user button
131-
#define USER_BTN 23
132-
133-
134-
//SPI definitions
135-
#define SS 10
136-
#define SS1 4
137-
#define SS2 7
138-
#define SS3 8
139-
#define MOSI 11
140-
#define MISO 12
141-
#define SCK 13
142-
143-
//I2C Definitions
144-
#define SDA 14
145-
#define SCL 15
121+
// On-board user button
122+
#define USER_BTN PC13
146123

147-
//Timer Definitions
148-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
124+
// Timer Definitions
125+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
149126
#define TIMER_TONE TIM10
150-
#define TIMER_UART_EMULATED TIM11
151127

152-
//Do not use basic timer: OC is required
128+
// Do not use basic timer: OC is required
153129
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
154130

155131
// UART Definitions

‎variants/NUCLEO_L432KC/variant.h

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,38 +67,22 @@ enum {
6767
AEND
6868
};
6969

70-
//ADC resolution is 12bits
71-
#define ADC_RESOLUTION 12
72-
#define DACC_RESOLUTION 12
73-
74-
//PWR resolution
75-
#define PWM_RESOLUTION 8
76-
#define PWM_FREQUENCY 1000
77-
#define PWM_MAX_DUTY_CYCLE 255
78-
79-
//On-board LED pin number
70+
// On-board LED pin number
8071
#define LED_BUILTIN 13
8172
#define LED_GREEN LED_BUILTIN
8273

83-
//On-board user button
74+
// On-board user button
8475
//#define USER_BTN NC
8576

86-
87-
//SPI definitions
88-
#define SS 10
89-
#define MOSI 11
90-
#define MISO 12
91-
#define SCK 13
92-
93-
//I2C Definitions
77+
// I2C Definitions
9478
#define SDA 4
9579
#define SCL 5
9680

97-
//Timer Definitions
81+
// Timer Definitions
9882
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
9983
#define TIMER_TONE TIM6
10084

101-
//Do not use basic timer: OC is required
85+
// Do not use basic timer: OC is required
10286
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
10387

10488
// UART Definitions

‎variants/NUCLEO_L476RG/variant.h

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -109,49 +109,22 @@ enum {
109109
AEND
110110
};
111111

112-
//ADC resolution is 12bits
113-
#define ADC_RESOLUTION 12
114-
#define DACC_RESOLUTION 12
115-
116-
//PWR resolution
117-
#define PWM_RESOLUTION 8
118-
#define PWM_FREQUENCY 1000
119-
#define PWM_MAX_DUTY_CYCLE 255
120-
121-
//On-board LED pin number
112+
// On-board LED pin number
122113
#define LED_BUILTIN 13
123114
#define LED_GREEN LED_BUILTIN
124115

125-
//On-board user button
126-
#define USER_BTN 23
127-
128-
129-
//SPI definitions
130-
#define SS 10
131-
#define SS1 4
132-
#define SS2 7
133-
#define SS3 8
134-
#define MOSI 11
135-
#define MISO 12
136-
#define SCK 13
137-
138-
//I2C Definitions
139-
#define SDA 14
140-
#define SCL 15
116+
// On-board user button
117+
#define USER_BTN PC13
141118

142-
//Timer Definitions
143-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
119+
// Timer Definitions
120+
// Do not use timer used by PWM pins when possible. See PinMap_PWM.
144121
#define TIMER_TONE TIM6
145-
#define TIMER_UART_EMULATED TIM7
146122

147-
//Do not use basic timer: OC is required
123+
// Do not use basic timer: OC is required
148124
#define TIMER_SERVO TIM2 //TODO: advanced-control timers don't work
149125

150126
// UART Definitions
151127
#define SERIAL_UART_INSTANCE 2 //Connected to ST-Link
152-
// UART Emulation
153-
#define UART_EMUL_RX PB_13
154-
#define UART_EMUL_TX PB_14
155128

156129
// Default pin used for 'Serial' instance (ex: ST-Link)
157130
// Mandatory for Firmata

‎variants/board_template/variant.h

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,39 +69,43 @@ enum {
6969
AEND
7070
};
7171

72-
//ADC resolution is 12bits
73-
#define ADC_RESOLUTION 12
74-
#define DACC_RESOLUTION 12
7572

76-
//PWR resolution
77-
#define PWM_RESOLUTION 8
78-
#define PWM_FREQUENCY 1000
79-
#define PWM_MAX_DUTY_CYCLE 255
73+
// Below ADC, DAC and PWM definitions already done in the core
74+
// Could be redefined here if needed
75+
// ADC resolution is 12bits
76+
//#define ADC_RESOLUTION 12
77+
//#define DACC_RESOLUTION 12
8078

81-
//On-board LED pin number
79+
// PWM resolution
80+
//#define PWM_RESOLUTION 8
81+
//#define PWM_FREQUENCY 1000
82+
//#define PWM_MAX_DUTY_CYCLE 255
83+
84+
// On-board LED pin number
8285
#define LED_BUILTIN Dx
8386
#define LED_GREEN LED_BUILTIN
8487

85-
//On-board user button
88+
// On-board user button
8689
#define USER_BTN Dx
8790

91+
// Below SPI and I2C definitions already done in the core
92+
// Could be redefined here if needed
93+
// SPI Definitions
94+
//#define SS 10 // Default for Arduino connector compatibility
95+
//#define MOSI 11 // Default for Arduino connector compatibility
96+
//#define MISO 12 // Default for Arduino connector compatibility
97+
//#define SCK 13 // Default for Arduino connector compatibility
8898

89-
//SPI definitions
90-
#define SS 10 // Default for Arduino connector compatibility
91-
#define MOSI 11 // Default for Arduino connector compatibility
92-
#define MISO 12 // Default for Arduino connector compatibility
93-
#define SCK 13 // Default for Arduino connector compatibility
94-
95-
//I2C Definitions
96-
#define SDA 14 // Default for Arduino connector compatibility
97-
#define SCL 15 // Default for Arduino connector compatibility
99+
// I2C Definitions
100+
//#define SDA 14 // Default for Arduino connector compatibility
101+
//#define SCL 15 // Default for Arduino connector compatibility
98102

99-
//Timer Definitions
103+
// Timer Definitions
100104
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
101105
#define TIMER_TONE TIMx
102-
#define TIMER_UART_EMULATED TIMx
106+
//#define TIMER_UART_EMULATED TIMx
103107

104-
//Do not use basic timer: OC is required
108+
// Do not use basic timer: OC is required
105109
#define TIMER_SERVO TIMx //TODO: advanced-control timers don't work
106110

107111
// UART Definitions

0 commit comments

Comments
 (0)
Please sign in to comment.