Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita969480

Browse files
committed
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 typosSigned-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent3d7839e commita969480

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+
#ifndefADC_RESOLUTION
105+
#defineADC_RESOLUTION 12
106+
#endif
107+
#ifndefDACC_RESOLUTION
108+
#defineDACC_RESOLUTION 12
109+
#endif
110+
#ifndefPWM_RESOLUTION
111+
#definePWM_RESOLUTION 8
112+
#endif
113+
#ifndefPWM_FREQUENCY
114+
#definePWM_FREQUENCY 1000
115+
#endif
116+
#ifndefPWM_MAX_DUTY_CYCLE
117+
#definePWM_MAX_DUTY_CYCLE 255
118+
#endif
119+
120+
// Default for Arduino connector compatibility
121+
// SPI Definitions
122+
#ifndefSS
123+
#defineSS 10
124+
#endif
125+
#ifndefSS1
126+
#defineSS1 4
127+
#endif
128+
#ifndefSS2
129+
#defineSS2 7
130+
#endif
131+
#ifndefSS3
132+
#defineSS3 8
133+
#endif
134+
#ifndefMOSI
135+
#defineMOSI 11
136+
#endif
137+
#ifndefMISO
138+
#defineMISO 12
139+
#endif
140+
#ifndefSCK
141+
#defineSCK 13
142+
#endif
143+
// I2C Definitions
144+
#ifndefSDA
145+
#defineSDA 14
146+
#endif
147+
#ifndefSCL
148+
#defineSCL 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-
#defineADC_RESOLUTION 12
117-
#defineDACC_RESOLUTION 12
118-
119-
//PWR resolution
120-
#definePWM_RESOLUTION 8
121-
#definePWM_FREQUENCY 1000
122-
#definePWM_MAX_DUTY_CYCLE 255
123-
124-
//On-board LED pin number
125-
#defineLED_BUILTIN 21
115+
// On-board LED pin number
116+
#defineLED_BUILTIN PC9
126117
#defineLED_GREEN LED_BUILTIN
127-
#defineLED_BLUE20
118+
#defineLED_BLUEPC8
128119

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

132-
//SPIdefinitions
133-
#defineSS43
134-
#defineSS140
135-
#defineSS241
136-
#defineSS342
137-
#defineMOSI46
138-
#defineMISO45
139-
#defineSCK44
140-
141-
//I2C Definitions
142-
#defineSDA38
143-
#defineSCL37
144-
145-
//Timer Definitions
146-
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
123+
//SPIDefinitions
124+
#defineSSPB12
125+
#defineSS1PB9
126+
#defineSS2PB10
127+
#defineSS3PB11
128+
#defineMOSIPB15
129+
#defineMISOPB14
130+
#defineSCKPB13
131+
132+
//I2C Definitions
133+
#defineSDAPB7
134+
#defineSCLPB6
135+
136+
//Timer Definitions
137+
//Do not use timer used by PWM pins when possible. See PinMap_PWM.
147138
#defineTIMER_TONE TIM15
148-
#defineTIMER_UART_EMULATED TIM16
149139

150-
//Do not use basic timer: OC is required
140+
//Do not use basic timer: OC is required
151141
#defineTIMER_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-
#defineADC_RESOLUTION 12
142-
#defineDACC_RESOLUTION 12
143-
144-
//PWR resolution
145-
#definePWM_RESOLUTION 8
146-
#definePWM_FREQUENCY 1000
147-
#definePWM_MAX_DUTY_CYCLE 255
148-
149-
//On-board LED pin number
150-
#defineLED_BUILTIN 18
140+
// On-board LED pin number
141+
#defineLED_BUILTIN PD12
151142
#defineLED_GREEN LED_BUILTIN
152-
#defineLED_BLUE58
153-
#defineLED_RED19
154-
#defineLED_ORANGE57
143+
#defineLED_BLUEPD15
144+
#defineLED_REDPD14
145+
#defineLED_ORANGEPD13
155146

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

159-
160-
//SPI definitions
161-
#defineSS 10
162-
#defineSS1 4
150+
// SPI Definitions
163151
#defineSS2 14
164-
#defineMOSI44
152+
#defineMOSIPA7
165153
#defineMISO 5
166-
#defineSCK43
154+
#defineSCKPA5
167155

168-
//I2C Definitions
169-
#defineSDA66
170-
#defineSCL26
156+
//I2C Definitions
157+
#defineSDAPB7
158+
#defineSCLPB8
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
#defineTIMER_TONE TIM6
175163
#defineTIMER_SERVO TIM7
176-
#defineTIMER_UART_EMULATED TIM6
177164

178165
// UART Definitions
179166
#defineSERIAL_UART_INSTANCE 2 //Connected to ST-Link
180-
// UART Emulation
181-
#defineUART_EMUL_RX PE_9
182-
#defineUART_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-
#defineADC_RESOLUTION 12
74-
#defineDACC_RESOLUTION 12
75-
76-
//PWR resolution
77-
#definePWM_RESOLUTION 8
78-
#definePWM_FREQUENCY 1000
79-
#definePWM_MAX_DUTY_CYCLE 255
80-
81-
//On-board LED pin number
72+
// On-board LED pin number
8273
#defineLED_BUILTIN 13
8374
#defineLED_GREEN LED_BUILTIN
8475

85-
//On-board user button
86-
#defineUSER_BTN 22
87-
88-
89-
//SPI definitions
90-
#defineSS 10
91-
#defineSS1 4
92-
#defineSS2 7
93-
#defineSS3 8
94-
#defineMOSI 11
95-
#defineMISO 12
96-
#defineSCK 13
97-
98-
//I2C Definitions
99-
#defineSDA 14
100-
#defineSCL 15
76+
// On-board user button
77+
#defineUSER_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
#defineTIMER_TONE TIM6
105-
#defineTIMER_UART_EMULATED TIM7
10682

107-
//Do not use basic timer: OC is required
83+
//Do not use basic timer: OC is required
10884
#defineTIMER_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-
#defineADC_RESOLUTION 12
84-
#defineDACC_RESOLUTION 12
85-
86-
//PWR resolution
87-
#definePWM_RESOLUTION 8
88-
#definePWM_FREQUENCY 1000
89-
#definePWM_MAX_DUTY_CYCLE 255
90-
91-
//On-board LED pin number
82+
// On-board LED pin number
9283
#defineLED_BUILTIN PA5
9384
#defineLED_LD2 LED_BUILTIN
9485
#defineLED_GREEN2 LED_BUILTIN
@@ -99,28 +90,14 @@ enum {
9990
#defineLED_RED 5
10091
#defineLED_LD4 LED_RED
10192

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

105-
106-
//SPI definitions
107-
#defineSS 10
108-
#defineSS1 4
109-
#defineSS2 7
110-
#defineSS3 8
111-
#defineMOSI 11
112-
#defineMISO 12
113-
#defineSCK 13
114-
115-
//I2C Definitions
116-
#defineSDA 14
117-
#defineSCL 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
#defineTIMER_TONE TIM22
12299

123-
//Do not use basic timer: OC is required
100+
//Do not use basic timer: OC is required
124101
#defineTIMER_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-
#defineADC_RESOLUTION 12
144-
#defineDACC_RESOLUTION 12
145-
146-
//PWR resolution
147-
#definePWM_RESOLUTION 8
148-
#definePWM_FREQUENCY 1000
149-
#definePWM_MAX_DUTY_CYCLE 255
150-
151-
//On-board LED pin number
142+
// On-board LED pin number
152143
#defineLED_BUILTIN 13
153144
#defineLED1 LED_BUILTIN
154145
#defineLED2 PB14
155146
#defineLED3 PC9
156147
#defineLED4 LED3
157148

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

161-
162-
//SPI definitions
163-
#defineSS 10
164-
#defineSS1 4
165-
#defineSS2 7
166-
#defineSS3 8
167-
#defineMOSI 11
168-
#defineMISO 12
169-
#defineSCK 13
170-
171-
//I2C Definitions
172-
#defineSDA 14
173-
#defineSCL 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
#defineTIMER_TONE TIM6
178-
#defineTIMER_UART_EMULATED TIM7
179155

180-
//Do not use basic timer: OC is required
156+
//Do not use basic timer: OC is required
181157
#defineTIMER_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-
#defineADC_RESOLUTION 12
117-
118-
//PWR resolution
119-
#definePWM_RESOLUTION 8
120-
#definePWM_FREQUENCY 1000
121-
#definePWM_MAX_DUTY_CYCLE 255
122-
123-
//On-board LED pin number
115+
// On-board LED pin number
124116
#defineLED_BUILTIN 13
125117
#defineLED_GREEN LED_BUILTIN
126118

127-
//On-board user button
128-
#defineUSER_BTN 24
129-
130-
131-
//SPI definitions
132-
#defineSS 10
133-
#defineSS1 4
134-
#defineSS2 7
135-
#defineSS3 8
136-
#defineMOSI 11
137-
#defineMISO 12
138-
#defineSCK 13
139-
140-
//I2C Definitions
141-
#defineSDA 14
142-
#defineSCL 15
119+
// On-board user button
120+
#defineUSER_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
#defineTIMER_TONE TIM6
147125

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

151129
// UART Definitions

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp