From abc9b526921ffd2a554dda64915aab84c4eb8c03 Mon Sep 17 00:00:00 2001 From: Ludy Date: Wed, 17 Jul 2019 05:42:36 +0200 Subject: [PATCH] Update copyright in header, etc. (#14645) --- Marlin/src/pins/lpc1768/pins_MKS_SBASE.h | 57 +++++++++++---------- Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 2 +- Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h | 52 +++++++++---------- Marlin/src/pins/lpc1769/pins_MKS_SGEN.h | 14 +++-- Marlin/src/pins/ramps/pins_FYSETC_F6_13.h | 8 ++- Marlin/src/pins/ramps/pins_TT_OSCAR.h | 8 +-- 6 files changed, 77 insertions(+), 64 deletions(-) diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h index 8bdece702..fa1402305 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h @@ -260,7 +260,7 @@ #define RGB_LED_B_PIN P1_22 // J8-2 (LCD_D7 on Fysetc schematic) #endif #elif ENABLED(FYSETC_MINI_12864_2_1) - #define NEOPIXEL_PIN P2_12 + #define NEOPIXEL_PIN P2_12 #endif #elif ENABLED(MINIPANEL) @@ -304,9 +304,14 @@ #endif #if MB(MKS_SBASE) && HAS_TMC220x - // The shortage of pins becomes apparent. - // Worst case you may have to give up the LCD - // RX pins need to be interrupt capable + + /** + * TMC2208/TMC2209 stepper drivers + * + * The shortage of pins becomes apparent. + * Worst case you may have to give up the LCD + * RX pins need to be interrupt capable + */ #define X_SERIAL_TX_PIN P1_22 // J8-2 #define X_SERIAL_RX_PIN P2_12 // J8-4 Interrupt Capable #define Y_SERIAL_TX_PIN P1_23 // J8-3 @@ -344,26 +349,26 @@ * PWM1.6 P2_05 RAMPS_D10_PIN */ - /** - * Special pins - * P1_30 - not 5V tolerant - EXP1 - * P1_31 - not 5V tolerant - EXP1 - * P0_27 - open collector - EXP2 - * P0_28 - open collector - EXP2 - * - */ +/** + * Special pins + * P1_30 - not 5V tolerant - EXP1 + * P1_31 - not 5V tolerant - EXP1 + * P0_27 - open collector - EXP2 + * P0_28 - open collector - EXP2 + * + */ - /** - * Serial Ports - * P0_00 - Port 3 - * P0_01 - SD Card (Onboard) - * P0_10 - Port 2 - * P0_11 - Y_EN/Y_DIR - * P0_15 - Port 1 - * P0_16 - EXP1 - * P0_02 - Port 0 - * P0_03 - AUX1 - * P0_29 - Port -1 - * P0_30 - USB - * - */ +/** + * Serial Ports + * P0_00 - Port 3 + * P0_01 - SD Card (Onboard) + * P0_10 - Port 2 + * P0_11 - Y_EN/Y_DIR + * P0_15 - Port 1 + * P0_16 - EXP1 + * P0_02 - Port 0 + * P0_03 - AUX1 + * P0_29 - Port -1 + * P0_30 - USB + * + */ diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h index 564cee19b..def03f3ad 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h @@ -110,7 +110,7 @@ #if HAS_TMC220x /** - * TMC2208 stepper drivers + * TMC2208/TMC2209 stepper drivers * * Hardware serial communication ports. * If undefined software serial is used according to the pins below diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h index 12d20b294..802fc9fe7 100644 --- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h @@ -121,24 +121,24 @@ * If undefined software serial is used according to the pins below */ - /** - * Software serial - */ + // + // Software serial + // - // P2_08 E1-Step - // P2_13 E1-Dir + // P2_08 E1-Step + // P2_13 E1-Dir - #define X_SERIAL_TX_PIN P2_13 - #define X_SERIAL_RX_PIN P2_13 + #define X_SERIAL_TX_PIN P2_13 + #define X_SERIAL_RX_PIN P2_13 - #define Y_SERIAL_TX_PIN P0_00 - #define Y_SERIAL_RX_PIN P0_00 + #define Y_SERIAL_TX_PIN P0_00 + #define Y_SERIAL_RX_PIN P0_00 - #define Z_SERIAL_TX_PIN P0_01 - #define Z_SERIAL_RX_PIN P0_01 + #define Z_SERIAL_TX_PIN P0_01 + #define Z_SERIAL_RX_PIN P0_01 - #define E0_SERIAL_TX_PIN P2_08 - #define E0_SERIAL_RX_PIN P2_08 + #define E0_SERIAL_TX_PIN P2_08 + #define E0_SERIAL_RX_PIN P2_08 #endif @@ -254,9 +254,9 @@ #error "LASER_FEATURE requires 3 free servo pins." #endif #endif - #define SPINDLE_LASER_ENA_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown! - #define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM - #define SPINDLE_DIR_PIN SERVO2_PIN // (5) + #define SPINDLE_LASER_ENA_PIN SERVO1_PIN // (6) Pin should have a pullup/pulldown! + #define SPINDLE_LASER_PWM_PIN SERVO3_PIN // (4) MUST BE HARDWARE PWM + #define SPINDLE_DIR_PIN SERVO2_PIN // (5) #endif // @@ -309,10 +309,10 @@ #elif HAS_SPI_LCD - //#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3 - //#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3 - //#define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3 - //#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) + //#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3 + //#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3 + //#define MOSI_PIN P0_18 // (51) system defined J3-10 & AUX-3 + //#define SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) #if ENABLED(FYSETC_MINI_12864) #define BEEPER_PIN P1_01 @@ -337,10 +337,10 @@ #define SHIFT_LD P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant) #endif #else - //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4 - //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4 - //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4 - //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4 + //#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4 + //#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4 + //#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4 + //#define SHIFT_EN P1_22 // (41) J5-4 & AUX-4 #endif #if ANY(VIKI2, miniVIKI) @@ -365,7 +365,7 @@ //#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems // results in LCD soft SPI mode 3, SD soft SPI mode 0 - #define LCD_RESET_PIN P0_16 // Must be high or open for LCD to operate normally. + #define LCD_RESET_PIN P0_16 // Must be high or open for LCD to operate normally. #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #ifndef RGB_LED_R_PIN @@ -378,7 +378,7 @@ #define RGB_LED_B_PIN P1_08 #endif #elif ENABLED(FYSETC_MINI_12864_2_1) - #define NEOPIXEL_PIN P1_00 + #define NEOPIXEL_PIN P1_00 #endif #else #define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2 diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h index 89f1d800d..bf6359f09 100644 --- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h +++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h @@ -40,13 +40,17 @@ //#undef BTN_EN1 //#undef BTN_EN2 -//#define BTN_EN1 P1_23 // EXP2.5 -//#define BTN_EN2 P1_22 // EXP2.3 +//#define BTN_EN1 P1_23 // EXP2.5 +//#define BTN_EN2 P1_22 // EXP2.3 #if HAS_TMC220x - // The shortage of pins becomes apparent. - // In the worst case you may have to give up the LCD. - // RX pins must be interrupt-capable. + /** + * TMC2208/TMC2209 stepper drivers + * + * The shortage of pins becomes apparent. + * In the worst case you may have to give up the LCD. + * RX pins must be interrupt-capable. + */ #define X_SERIAL_TX_PIN P4_29 // J8-2 #define X_SERIAL_RX_PIN P4_29 // J8-2 diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h index be5ff2a30..1a3c5d239 100644 --- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h +++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h @@ -118,8 +118,12 @@ // #if HAS_TMC220x - // Software serial - // At the moment, F6 rx pins are not pc interrupt pins + /** + * TMC2208/TMC2209 stepper drivers + * + * Software serial communication pins. + * At the moment, F6 rx pins are not pc interrupt pins + */ #define X_SERIAL_RX_PIN -1 // 71 #define X_SERIAL_TX_PIN 72 #define Y_SERIAL_RX_PIN -1 // 73 diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h index 87ce4c7d6..da79f98e3 100644 --- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h +++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h @@ -1,9 +1,9 @@ /** * Marlin 3D Printer Firmware - * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * * Based on Sprinter and grbl. - * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -99,9 +99,9 @@ #define E4_ENABLE_PIN 47 #define E4_CS_PIN E0_CS_PIN -#if ENABLED(HAVE_TMC2208) +#if HAS_TMC220x /** - * TMC2208 stepper drivers + * TMC2208/TMC2209 stepper drivers * * Hardware serial communication ports. * If undefined software serial is used according to the pins below