|
225 | 225 | #endif
|
226 | 226 | #endif
|
227 | 227 |
|
228 |
| -// TODO: remove? |
229 |
| -#ifndef VFD_SPINDLE |
230 |
| -#if VFD_ENABLE |
231 |
| -#define VFD_SPINDLE 1 |
232 |
| -#else |
233 |
| -#define VFD_SPINDLE 0 |
234 |
| -#endif |
235 |
| -#endif |
236 |
| - |
237 | 228 | #ifndef SPINDLE0_ENABLE
|
238 |
| - #if VFD_ENABLE |
239 |
| - #define SPINDLE0_ENABLE VFD_ENABLE |
240 |
| - #if N_SPINDLE > 1 && !defined(SPINDLE1_ENABLE) |
241 |
| - #define SPINDLE1_ENABLE SPINDLE_PWM0 |
242 |
| - #endif |
243 |
| - #else |
244 |
| - #define SPINDLE0_ENABLE SPINDLE_PWM0 |
245 |
| - #endif |
| 229 | +#define SPINDLE0_ENABLE SPINDLE_PWM0 |
246 | 230 | #endif
|
247 | 231 |
|
248 | 232 | #ifndef SPINDLE1_ENABLE
|
249 | 233 | #define SPINDLE1_ENABLE 0
|
| 234 | +#elif SPINDLE1_ENABLE == -1 || SPINDLE1_ENABLE == SPINDLE_ALL || SPINDLE1_ENABLE == SPINDLE_ALL_VFD |
| 235 | +#warning "SPINDLE1_ENABLE cannot be set to -1, SPINDLE_ALL or SPINDLE_ALL_VFD" |
| 236 | +#undef SPINDLE1_ENABLE |
| 237 | +#define SPINDLE1_ENABLE 0 |
250 | 238 | #endif
|
251 | 239 |
|
252 | 240 | #ifndef SPINDLE2_ENABLE
|
253 | 241 | #define SPINDLE2_ENABLE 0
|
| 242 | +#elif SPINDLE2_ENABLE == -1 || SPINDLE2_ENABLE == SPINDLE_ALL || SPINDLE2_ENABLE == SPINDLE_ALL_VFD |
| 243 | +#warning "SPINDLE2_ENABLE cannot be set to -1, SPINDLE_ALL or SPINDLE_ALL_VFD" |
| 244 | +#undef SPINDLE2_ENABLE |
| 245 | +#define SPINDLE2_ENABLE 0 |
254 | 246 | #endif
|
255 | 247 |
|
256 | 248 | #ifndef SPINDLE3_ENABLE
|
257 | 249 | #define SPINDLE3_ENABLE 0
|
| 250 | +#elif SPINDLE3_ENABLE == -1 || SPINDLE3_ENABLE == SPINDLE_ALL || SPINDLE3_ENABLE == SPINDLE_ALL_VFD |
| 251 | +#warning "SPINDLE3_ENABLE cannot be set to -1, SPINDLE_ALL or SPINDLE_ALL_VFD" |
| 252 | +#undef SPINDLE1_ENABLE |
| 253 | +#define SPINDLE1_ENABLE 0 |
258 | 254 | #endif
|
259 | 255 |
|
260 |
| -#if SPINDLE0_ENABLE == SPINDLE_ALL |
261 |
| -#define SPINDLE_ENABLE SPINDLE_ALL |
| 256 | +#if SPINDLE0_ENABLE == -1 || SPINDLE0_ENABLE == SPINDLE_ALL |
| 257 | +#define SPINDLE_ENABLE (SPINDLE_ALL|(1<<SPINDLE1_ENABLE)|(1<<SPINDLE2_ENABLE)|(1<<SPINDLE3_ENABLE)) |
| 258 | +#elif SPINDLE0_ENABLE == SPINDLE_ALL_VFD |
| 259 | +#define SPINDLE_ENABLE (SPINDLE_ALL_VFD|SPINDLE_ALL|(1<<SPINDLE1_ENABLE)|(1<<SPINDLE2_ENABLE)|(1<<SPINDLE3_ENABLE)) |
262 | 260 | #else
|
263 | 261 | #define SPINDLE_ENABLE ((1<<SPINDLE0_ENABLE)|(1<<SPINDLE1_ENABLE)|(1<<SPINDLE2_ENABLE)|(1<<SPINDLE3_ENABLE))
|
264 | 262 | #endif
|
|
314 | 312 | //
|
315 | 313 |
|
316 | 314 | #ifndef VFD_ENABLE
|
317 |
| - #if SPINDLE_ENABLE & ((1<<SPINDLE_HUANYANG1)|(1<<SPINDLE_HUANYANG2)|(1<<SPINDLE_GS20)|(1<<SPINDLE_YL620A)|(1<<SPINDLE_MODVFD)|(1<<SPINDLE_H100)|(1<<SPINDLE_NOWFOREVER)) |
| 315 | + #if SPINDLE_ENABLE & SPINDLE_ALL_VFD |
318 | 316 | #define VFD_ENABLE 1
|
319 | 317 | #else
|
320 | 318 | #define VFD_ENABLE 0
|
|
0 commit comments