SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix line-endings, formatting, whitespace

Browse source 
Followup to #12770
This commit is contained in:
Scott Lahteine 2018-12-30 12:20:30 -06:00
parent 135c74017c
commit 371d9a1acf
5 changed files with 180 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View file

@ -841,7 +841,7 @@
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating #define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap //#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
//#define STATUS_ALT_FAN_BITMAP // Use the alternate fan bitmap //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
//#define STATUS_HEAT_PERCENT // Show heating in a progress bar //#define STATUS_HEAT_PERCENT // Show heating in a progress bar

2
Marlin/src/module/configuration_store.cpp
View file

@ -488,7 +488,7 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(dummy); EEPROM_WRITE(dummy);
#endif #endif
#else #else
const float planner_max_jerk[XYZE] = { float(DEFAULT_EJERK) }; const float planner_max_jerk[XYZE] = { float(DEFAULT_EJERK) };
EEPROM_WRITE(planner_max_jerk); EEPROM_WRITE(planner_max_jerk);
#endif #endif

2
Marlin/src/pins/pins.h
View file

@ -101,7 +101,7 @@
#elif MB(MKS_BASE) #elif MB(MKS_BASE)
#include "pins_MKS_BASE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 #include "pins_MKS_BASE.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MKS_BASE_14) #elif MB(MKS_BASE_14)
#include "pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560 #include "pins_MKS_BASE_14.h" // ATmega2560 env:megaatmega2560
#elif MB(MKS_BASE_15) #elif MB(MKS_BASE_15)
#include "pins_MKS_BASE_15.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560 #include "pins_MKS_BASE_15.h" // ATmega1280, ATmega2560 env:megaatmega1280 env:megaatmega2560
#elif MB(MKS_BASE_HEROIC) #elif MB(MKS_BASE_HEROIC)

2
Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h
View file

@ -141,7 +141,7 @@
* ################################## * ##################################
* *
* @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
* *
* == Y-endstop == == Z-endstop == == Bed temperature == * == Y-endstop == == Z-endstop == == Bed temperature ==
* *
* 1 2 1 2 1 2 * 1 2 1 2 1 2

380
Marlin/src/pins/pins_MKS_BASE_14.h
View file

@ -1,204 +1,176 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* *
* Based on Sprinter and grbl. * 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 * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
/** /**
* MKS BASE v1.4 * MKS BASE v1.4
*/ */
#if HOTENDS > 2 || E_STEPPERS > 2 #if HOTENDS > 2 || E_STEPPERS > 2
#error "MKS BASE 1.4 only supports up to 2 hotends / E-steppers. Comment out this line to continue." #error "MKS BASE 1.4 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif #endif
#define BOARD_NAME "MKS BASE 1.4" #define BOARD_NAME "MKS BASE 1.4"
// //
// Heaters / Fans // Heaters / Fans
// //
#define MOSFET_D_PIN 7 // PH4 ** Pin16 ** PWM7 //E1 #define MOSFET_D_PIN 7 // PH4 ** Pin16 ** PWM7 //E1
#define FAN_PIN 9 // PH6 ** Pin18 ** PWM9 #define FAN_PIN 9 // PH6 ** Pin18 ** PWM9
// Other Mods
#define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11 // Other Mods
#define SERVO3_PIN 12 // PB6 ** Pin25 ** D12 #define CASE_LIGHT_PIN 11 // PB5 ** Pin24 ** PWM11
#define PS_ON_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM #define SERVO3_PIN 12 // PB6 ** Pin25 ** D12
#define FILWIDTH_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup! #define PS_ON_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
#define FIL_RUNOUT_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX #define FILWIDTH_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
#define FIL_RUNOUT_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_PWM_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM #define SPINDLE_LASER_PWM_PIN 2 // X+ // PE4 ** Pin6 ** PWM2 **MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup! #define SPINDLE_LASER_ENABLE_PIN 15 // Y+ // PJ0 ** Pin63 ** USART3_RX **Pin should have a pullup!
#define SPINDLE_DIR_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX #define SPINDLE_DIR_PIN 19 // Z+ // PD2 ** Pin45 ** USART1_RX
/** //
* Microstepping pins // Microstepping pins
*/ //
#define X_MS1_PIN 5 // PE3 ** Pin5 ** PWM5 #define X_MS1_PIN 5 // PE3 ** Pin5 ** PWM5
#define X_MS2_PIN 6 // PH3 ** Pin15 ** PWM6 #define X_MS2_PIN 6 // PH3 ** Pin15 ** PWM6
#define Y_MS1_PIN 59 // PF5 ** Pin92 ** A5 #define Y_MS1_PIN 59 // PF5 ** Pin92 ** A5
#define Y_MS2_PIN 58 // PF4 ** Pin93 ** A4 #define Y_MS2_PIN 58 // PF4 ** Pin93 ** A4
#define Z_MS1_PIN 22 // PA0 ** Pin78 ** D22 #define Z_MS1_PIN 22 // PA0 ** Pin78 ** D22
#define Z_MS2_PIN 39 // PG2 ** Pin70 ** D39 #define Z_MS2_PIN 39 // PG2 ** Pin70 ** D39
#define E0_MS1_PIN 64 // PK2 ** Pin87 ** A10 #define E0_MS1_PIN 64 // PK2 ** Pin87 ** A10
#define E0_MS2_PIN 63 // PK1 ** Pin88 ** A9 #define E0_MS2_PIN 63 // PK1 ** Pin88 ** A9
#define E1_MS1_PIN 57 // PF3 ** Pin94 ** A3 #define E1_MS1_PIN 57 // PF3 ** Pin94 ** A3
#define E1_MS2_PIN 4 // PG5 ** Pin1 ** PWM4 #define E1_MS2_PIN 4 // PG5 ** Pin1 ** PWM4
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
/*****************************************/ /*
/* Available connectors on MKS BASE v1.4 */ Available connectors on MKS BASE v1.4
/*****************************************/
=======
/* | GND |
******* |-----| E0
* GND * | 10 | (10) PB4 ** Pin23 ** PWM10
******* E0 |-----|
* 10 * | GND |
******* |-----| E1
* GND * | 7 | ( 7) PH4 ** Pin16 ** PWM7
******* E1 |-----|
* 7 * | GND |
******* |-----| FAN
* GND * | 9 | ( 9) PH6 ** Pin18 ** PWM9
******* FAN =======
* 9 *
******* =======
10 // PB4 ** Pin23 ** PWM10 | GND |
7 // PH4 ** Pin16 ** PWM7 |-----| Heated Bed
9 // PH6 ** Pin18 ** PWM9 | 8 | ( 8) PH5 ** Pin17 ** PWM8
******* =======
* GND *
******* Heat Bed ==========
* 8 * | 12-24V |
******* |--------| Power
8 // PH5 ** Pin17 ** PWM8 | GND |
********** ==========
* 12-24V *
********** Power XS3 Connector
* GND * =================
********** | 65 | GND | 5V | (65) PK3 ** Pin86 ** A11
XS3 Connector |----|-----|----|
***************** | 66 | GND | 5V | (66) PK4 ** Pin85 ** A12
* 65 * GND * 5V * =================
*****************
* 66 * GND * 5V * Servos Connector
***************** =================
65 // PK3 ** Pin86 ** A11 | 11 | GND | 5V | (11) PB5 ** Pin24 ** PWM11
66 // PK4 ** Pin85 ** A12 |----|-----|----|
Servos Connector | 12 | GND | 5V | (12) PB6 ** Pin25 ** PWM12
***************** =================
* 11 * GND * 5V *
***************** ICSP
* 12 * GND * 5V * =================
***************** | 5V | 51 | GND | (51) PB2 ** Pin21 ** SPI_MOSI
11 // PB5 ** Pin24 ** PWM11 |----|----|-----|
12 // PB6 ** Pin25 ** PWM12 | 50 | 52 | RST | (50) PB3 ** Pin22 ** SPI_MISO
ICSP ================= (52) PB1 ** Pin20 ** SPI_SCK
*****************
* 5V * 51 * GND * XS6/AUX-1 Connector
***************** ======================
* 50 * 52 * RST * | 5V | GND | NC | 20 | (20) PD1 ** Pin44 ** I2C_SDA
***************** |----|-----|----|----|
50 // PB3 ** Pin22 ** SPI_MISO | 50 | 51 | 52 | 21 | (50) PB3 ** Pin22 ** SPI_MISO
51 // PB2 ** Pin21 ** SPI_MOSI ====================== (51) PB2 ** Pin21 ** SPI_MOSI
52 // PB1 ** Pin20 ** SPI_SCK (52) PB1 ** Pin20 ** SPI_SCK
XS6/AUX-1 Connector (21) PD0 ** Pin43 ** I2C_SCL
**********************
* 5V * GND * NC * 20 * Temperature
********************** ==================================
* 50 * 51 * 52 * 21 * | GND | 69 | GND | 68 | GND | 67 |
********************** ==================================
50 // PB3 ** Pin22 ** SPI_MISO (69) PK7 ** Pin82 ** A15
51 // PB2 ** Pin21 ** SPI_MOSI (68) PK6 ** Pin83 ** A14
52 // PB1 ** Pin20 ** SPI_SCK (67) PK5 ** Pin84 ** A13
20 // PD1 ** Pin44 ** I2C_SDA
21 // PD0 ** Pin43 ** I2C_SCL Limit Switches
Temperature ============
********************************** | 2 | GND | X+ ( 2) PE4 ** Pin6 ** PWM2
* GND * 69 * GND * 68 * GND * 68 * |----|-----|
********************************** | 3 | GND | X- ( 3) PE5 ** Pin7 ** PWM3
69 // PK7 ** Pin82 ** A15 |----|-----|
68 // PK6 ** Pin83 ** A14 | 15 | GND | Y+ (15) PJ0 ** Pin63 ** USART3_RX
67 // PK5 ** Pin84 ** A13 |----|-----|
Limit Switches | 14 | GND | Y- (14) PJ1 ** Pin64 ** USART3_TX
************ |----|-----|
* 2 * GND * X+ | 19 | GND | Z+ (19) PD2 ** Pin45 ** USART1_RX
************ |----|-----|
* 3 * GND * X- | 18 | GND | Z- (18) PD3 ** Pin46 ** USART1_TX
************ ============
* 15 * GND * Y+
************ EXP1
* 14 * GND * Y- ============
************ | 37 | 35 | (37) PC0 ** Pin53 ** D37
* 19 * GND * Z+ |-----|----| (35) PC2 ** Pin55 ** D35
************ | 17 | 16 | (17) PH0 ** Pin12 ** USART2_RX
* 18 * GND * Z- |-----|----| (16) PH1 ** Pin13 ** USART2_TX
************ | 23 | 25 | (23) PA1 ** Pin77 ** D23
2 // PE4 ** Pin6 ** PWM2 **X+ |-----|----| (25) PA3 ** Pin75 ** D25
3 // PE5 ** Pin7 ** PWM3 **X- | 27 | 29 | (27) PA5 ** Pin73 ** D27
15 // PJ0 ** Pin63 ** USART3_RX **Y+ |-----|----| (29) PA7 ** Pin71 ** D29
14 // PJ1 ** Pin64 ** USART3_TX **Y- | GND | 5V |
19 // PD2 ** Pin45 ** USART1_RX **Z+ ============
18 // PD3 ** Pin46 ** USART1_TX **Z-
EXP1 EXP2
************ ============
* 37 * 35 * | 50 | 52 | (50) PB3 ** Pin22 ** SPI_MISO
************ |-----|----| (52) PB1 ** Pin20 ** SPI_SCK
* 17 * 16 * | 31 | 53 | (31) PC6 ** Pin59 ** D31
************ |-----|----| (53) PB0 ** Pin19 ** SPI_SS
* 23 * 25 * | 33 | 51 | (33) PC4 ** Pin57 ** D33
************ |-----|----| (51) PB2 ** Pin21 ** SPI_MOSI
* 27 * 29 * | 49 | 41 | (49) PL0 ** Pin35 ** D49
************ |-----|----| (41) PG0 ** Pin51 ** D41
* GND * 5V * | GND | NC |
************ ============
37 // PC0 ** Pin53 ** D37 */
35 // PC2 ** Pin55 ** D35
17 // PH0 ** Pin12 ** USART2_RX
16 // PH1 ** Pin13 ** USART2_TX
23 // PA1 ** Pin77 ** D23
25 // PA3 ** Pin75 ** D25
27 // PA5 ** Pin73 ** D27
29 // PA7 ** Pin71 ** D29
EXP2
************
* 50 * 52 *
************
* 31 * 53 *
************
* 33 * 51 *
************
* 49 * 41 *
************
* GND * NC *
************
50 // PB3 ** Pin22 ** SPI_MISO
52 // PB1 ** Pin20 ** SPI_SCK
31 // PC6 ** Pin59 ** D31
53 // PB0 ** Pin19 ** SPI_SS
33 // PC4 ** Pin57 ** D33
51 // PB2 ** Pin21 ** SPI_MOSI
49 // PL0 ** Pin35 ** D49
41 // PG0 ** Pin51 ** D41
*/