Scott Lahteine 2 лет назад
Родитель
Сommit
f2a83bc245
21 измененных файлов: 54 добавлений и 56 удалений
  1. 2
    2
      Marlin/src/HAL/STM32/timers.cpp
  2. 2
    2
      buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
  3. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
  4. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
  5. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
  6. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h
  7. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
  8. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
  9. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
  10. 2
    2
      buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
  11. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
  12. 2
    2
      buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
  13. 2
    2
      buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
  14. 2
    2
      buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
  15. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h
  16. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
  17. 2
    2
      buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
  18. 4
    6
      buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
  19. 3
    3
      buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h
  20. 1
    1
      buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
  21. 2
    2
      buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h

+ 2
- 2
Marlin/src/HAL/STM32/timers.cpp Просмотреть файл

@@ -74,10 +74,10 @@
74 74
   #define MCU_STEP_TIMER  4
75 75
   #define MCU_TEMP_TIMER  2
76 76
 #elif defined(STM32F401xC) || defined(STM32F401xE)
77
-  #define MCU_STEP_TIMER  9
77
+  #define MCU_STEP_TIMER  9           // STM32F401 has no TIM6, TIM7, or TIM8
78 78
   #define MCU_TEMP_TIMER 10
79 79
 #elif defined(STM32F4xx) || defined(STM32F7xx) || defined(STM32H7xx)
80
-  #define MCU_STEP_TIMER  6           // STM32F401 has no TIM6, TIM7, or TIM8
80
+  #define MCU_STEP_TIMER  6
81 81
   #define MCU_TEMP_TIMER 14           // TIM7 is consumed by Software Serial if used.
82 82
 #endif
83 83
 

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h Просмотреть файл

@@ -107,8 +107,8 @@ extern "C" {
107 107
 // TIM9  - STEP_TIMER
108 108
 // TIM10 - TEMP_TIMER
109 109
 // TIM11 -
110
-#define TIMER_SERVO             TIM2
111
-#define TIMER_TONE              TIM5
110
+#define TIMER_SERVO             TIM2  // TIMER_SERVO must be defined in this file
111
+#define TIMER_TONE              TIM5  // TIMER_TONE must be defined in this file
112 112
 
113 113
 // UART Definitions
114 114
 #define SERIAL_UART_INSTANCE    1

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h Просмотреть файл

@@ -245,9 +245,9 @@ extern "C" {
245 245
 
246 246
 // Timer Definitions
247 247
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
248
-#define TIMER_TONE              TIM7
249
-#define TIMER_SERVO             TIM5
250
-#define TIMER_SERIAL            TIM2
248
+#define TIMER_TONE              TIM7  // TIMER_TONE must be defined in this file
249
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
250
+#define TIMER_SERIAL            TIM2  // TIMER_SERIAL must be defined in this file
251 251
 
252 252
 // UART Definitions
253 253
 // Define here Serial instance number to map on Serial generic name

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h Просмотреть файл

@@ -245,9 +245,9 @@ extern "C" {
245 245
 
246 246
 // Timer Definitions
247 247
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
248
-#define TIMER_TONE              TIM7
249
-#define TIMER_SERVO             TIM5
250
-#define TIMER_SERIAL            TIM8
248
+#define TIMER_TONE              TIM7  // TIMER_TONE must be defined in this file
249
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
250
+#define TIMER_SERIAL            TIM8  // TIMER_SERIAL must be defined in this file
251 251
 
252 252
 // UART Definitions
253 253
 // Define here Serial instance number to map on Serial generic name

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h Просмотреть файл

@@ -255,9 +255,9 @@ extern "C" {
255 255
 
256 256
 // Timer Definitions
257 257
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
258
-#define TIMER_TONE              TIM10
259
-#define TIMER_SERVO             TIM5
260
-#define TIMER_SERIAL            TIM7
258
+#define TIMER_TONE              TIM10 // TIMER_TONE must be defined in this file
259
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
260
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
261 261
 
262 262
 // UART Definitions
263 263
 //#define ENABLE_HWSERIAL1        done automatically by the #define SERIAL_UART_INSTANCE below

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_PRO_V1_F429/variant.h Просмотреть файл

@@ -165,9 +165,9 @@ extern "C" {
165 165
 
166 166
 // Timer Definitions
167 167
 // Do not use timer used by PWM pin. See PinMap_PWM.
168
-#define TIMER_TONE              TIM6
169
-#define TIMER_SERVO             TIM5
170
-#define TIMER_SERIAL            TIM7
168
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
169
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
170
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
171 171
 
172 172
 // UART Definitions
173 173
 //#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h Просмотреть файл

@@ -165,9 +165,9 @@ extern "C" {
165 165
 
166 166
 // Timer Definitions
167 167
 // Do not use timer used by PWM pin. See PinMap_PWM.
168
-#define TIMER_TONE              TIM6
169
-#define TIMER_SERVO             TIM5
170
-#define TIMER_SERIAL            TIM7
168
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
169
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
170
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
171 171
 
172 172
 // UART Definitions
173 173
 //#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h Просмотреть файл

@@ -255,9 +255,9 @@ extern "C" {
255 255
 
256 256
 // Timer Definitions
257 257
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
258
-#define TIMER_TONE              TIM2
259
-#define TIMER_SERVO             TIM5 // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
260
-#define TIMER_SERIAL            TIM7
258
+#define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
259
+#define TIMER_SERVO             TIM5  // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
260
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
261 261
 
262 262
 // UART Definitions
263 263
 //#define ENABLE_HWSERIAL1        done automatically by the #define SERIAL_UART_INSTANCE below

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h Просмотреть файл

@@ -157,9 +157,9 @@ extern "C" {
157 157
 
158 158
 // Timer Definitions
159 159
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
160
-#define TIMER_TONE              TIM2
161
-#define TIMER_SERVO             TIM5
162
-#define TIMER_SERIAL            TIM7
160
+#define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
161
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
162
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
163 163
 
164 164
 // UART1 for TFT port
165 165
 #define ENABLE_HWSERIAL1

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h Просмотреть файл

@@ -126,10 +126,10 @@ extern "C" {
126 126
 
127 127
 // Timer Definitions
128 128
 #ifndef TIMER_TONE
129
-  #define TIMER_TONE            TIM3
129
+  #define TIMER_TONE            TIM3  // TIMER_TONE must be defined in this file
130 130
 #endif
131 131
 #ifndef TIMER_SERVO
132
-  #define TIMER_SERVO           TIM2
132
+  #define TIMER_SERVO           TIM2  // TIMER_SERVO must be defined in this file
133 133
 #endif
134 134
 
135 135
 // UART Definitions

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h Просмотреть файл

@@ -121,9 +121,9 @@ extern "C" {
121 121
 #define TEMP_TIMER              3
122 122
 // Leave TIMER 4 for TFT backlight PWM or Servo freq...
123 123
 #define STEP_TIMER              5
124
-#define TIMER_TONE              TIM6
125
-#define TIMER_SERVO             TIM7
126
-#define TIMER_SERIAL            TIM8
124
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
125
+#define TIMER_SERVO             TIM7  // TIMER_SERVO must be defined in this file
126
+#define TIMER_SERIAL            TIM8  // TIMER_SERIAL must be defined in this file
127 127
 
128 128
 // UART Definitions
129 129
 // Define here Serial instance number to map on Serial generic name

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h Просмотреть файл

@@ -133,10 +133,10 @@ extern "C" {
133 133
 // Timer Definitions (optional)
134 134
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
135 135
 #ifndef TIMER_TONE
136
-  #define TIMER_TONE            TIM6
136
+  #define TIMER_TONE            TIM6  // TIMER_TONE must be defined in this file
137 137
 #endif
138 138
 #ifndef TIMER_SERVO
139
-  #define TIMER_SERVO           TIM7
139
+  #define TIMER_SERVO           TIM7  // TIMER_SERVO must be defined in this file
140 140
 #endif
141 141
 
142 142
 // UART Definitions

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h Просмотреть файл

@@ -177,8 +177,8 @@ extern "C" {
177 177
 
178 178
 // Timer Definitions (optional)
179 179
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
180
-#define TIMER_TONE              TIM6
181
-#define TIMER_SERVO             TIM7
180
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
181
+#define TIMER_SERVO             TIM7  // TIMER_SERVO must be defined in this file
182 182
 
183 183
 // UART Definitions
184 184
 // Define here Serial instance number to map on Serial generic name

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h Просмотреть файл

@@ -299,10 +299,10 @@ extern "C" {
299 299
 
300 300
 // Timer Definitions
301 301
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
302
-#define TIMER_TONE              TIM6
302
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
303 303
 
304 304
 // Do not use basic timer: OC is required
305
-#define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
305
+#define TIMER_SERVO             TIM2  // TODO: advanced-control timers don't work
306 306
 
307 307
 // UART Definitions
308 308
 // Define here Serial instance number to map on Serial generic name

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h Просмотреть файл

@@ -134,15 +134,15 @@ extern "C" {
134 134
 // Timer Definitions
135 135
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
136 136
 #ifndef TIMER_TONE
137
-#define TIMER_TONE              TIM6
137
+  #define TIMER_TONE            TIM6  // TIMER_TONE must be defined in this file
138 138
 #endif
139 139
 
140 140
 #ifndef TIMER_SERVO
141
-#define TIMER_SERVO             TIM7
141
+  #define TIMER_SERVO           TIM7  // TIMER_SERVO must be defined in this file
142 142
 #endif
143 143
 
144 144
 #ifndef TIMER_SERIAL
145
-#define TIMER_SERIAL            TIM9
145
+  #define TIMER_SERIAL          TIM9  // TIMER_SERIAL must be defined in this file
146 146
 #endif
147 147
 
148 148
 // UART Definitions

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h Просмотреть файл

@@ -153,13 +153,13 @@ extern "C" {
153 153
 // Timer Definitions
154 154
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
155 155
 #ifndef TIMER_TONE
156
-  #define TIMER_TONE            TIM6
156
+  #define TIMER_TONE            TIM6  // TIMER_TONE must be defined in this file
157 157
 #endif
158 158
 #ifndef TIMER_SERVO
159
-  #define TIMER_SERVO           TIM7
159
+  #define TIMER_SERVO           TIM7  // TIMER_SERVO must be defined in this file
160 160
 #endif
161 161
 #ifndef TIMER_SERIAL
162
-  #define TIMER_SERIAL          TIM5
162
+  #define TIMER_SERIAL          TIM5  // TIMER_SERIAL must be defined in this file
163 163
 #endif
164 164
 
165 165
 // UART Definitions

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h Просмотреть файл

@@ -185,10 +185,10 @@ extern "C" {
185 185
 
186 186
 // Timer Definitions
187 187
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
188
-#define TIMER_TONE              TIM6
188
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
189 189
 
190 190
 // Do not use basic timer: OC is required
191
-#define TIMER_SERVO             TIM1  //TODO: advanced-control timers don't work
191
+#define TIMER_SERVO             TIM1  // TODO: advanced-control timers don't work
192 192
 
193 193
 // UART Definitions
194 194
 // Define here Serial instance number to map on Serial generic name

+ 4
- 6
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h Просмотреть файл

@@ -93,17 +93,15 @@ extern "C" {
93 93
 #define PIN_SPI_MISO            PA6
94 94
 #define PIN_SPI_SCK             PA5
95 95
 
96
-
97 96
 // Timer Definitions
98
-#define TIMER_TONE              TIM2
99
-#define TIMER_SERVO             TIM5
100
-#define TIMER_SERIAL            TIM11
97
+#define TIMER_TONE              TIM2  // TIMER_TONE must be defined in this file
98
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
99
+#define TIMER_SERIAL            TIM11 // TIMER_SERIAL must be defined in this file
101 100
 
102 101
 // UART Definitions
103 102
 //#define ENABLE_HWSERIAL1        done automatically by the #define SERIAL_UART_INSTANCE below
104 103
 #define ENABLE_HWSERIAL2
105 104
 
106
-
107 105
 // Define here Serial instance number to map on Serial generic name (if not already used by SerialUSB)
108 106
 #define SERIAL_UART_INSTANCE    1 //1 for Serial = Serial1 (USART1)
109 107
 
@@ -148,4 +146,4 @@ extern "C" {
148 146
   #define SERIAL_PORT_HARDWARE_OPEN   Serial2
149 147
 #endif
150 148
 
151
-#endif /* _VARIANT_ARDUINO_STM32_ */
149
+#endif /* _VARIANT_ARDUINO_STM32_ */

+ 3
- 3
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/variant.h Просмотреть файл

@@ -133,9 +133,9 @@ extern "C" {
133 133
 
134 134
 // Timer Definitions
135 135
 // Do not use timer used by PWM pin. See PinMap_PWM.
136
-#define TIMER_TONE              TIM6
137
-#define TIMER_SERVO             TIM5
138
-#define TIMER_SERIAL            TIM7
136
+#define TIMER_TONE              TIM6  // TIMER_TONE must be defined in this file
137
+#define TIMER_SERVO             TIM5  // TIMER_SERVO must be defined in this file
138
+#define TIMER_SERIAL            TIM7  // TIMER_SERIAL must be defined in this file
139 139
 
140 140
 // UART Definitions
141 141
 //#define SERIAL_UART_INSTANCE    1 // Connected to EXP3 header

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h Просмотреть файл

@@ -183,7 +183,7 @@ extern "C" {
183 183
 // Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
184 184
 // FANs may require PWM timers 3 10 11 13
185 185
 // The LED/RGB connectors timer 4
186
-// Beware: STEP_TIMER default is 6 and TEMP_TIMER 14 for the F407
186
+// Beware: MCU_TIMER_STEP default is 6 and MCU_TIMER_TEMP 14 for the F407
187 187
 #ifndef TIMER_TONE
188 188
   #define TIMER_TONE            TIM8  // TIM3 or TIM8 for SPEAKER compat on the lerdge K (PC6)
189 189
 #endif                                // TIM4 for that on the Lerdge S (PD11)

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h Просмотреть файл

@@ -103,8 +103,8 @@ extern "C" {
103 103
 
104 104
 // Timer Definitions
105 105
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
106
-#define TIMER_TONE              TIM5
107
-#define TIMER_SERVO             TIM4
106
+#define TIMER_TONE              TIM5  // TIMER_TONE must be defined in this file
107
+#define TIMER_SERVO             TIM4  // TIMER_SERVO must be defined in this file
108 108
 
109 109
 // UART Definitions
110 110
 // Define here Serial instance number to map on Serial generic name

Загрузка…
Отмена
Сохранить