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

whitespace

Browse source
This commit is contained in:
Scott Lahteine 2020-05-22 02:02:03 -05:00
parent f7346b6ee1
commit 31eb487da5
6 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View file

@ -47,7 +47,7 @@
* is reported. This allows us to ignore intermittent error conditions while * is reported. This allows us to ignore intermittent error conditions while
* still detecting an actual failure, which should result in a continuous * still detecting an actual failure, which should result in a continuous
* stream of errors from the sensor. * stream of errors from the sensor.
* *
* Set this value to 0 to fail on the first error to occur. * Set this value to 0 to fail on the first error to occur.
*/ */
#define THERMOCOUPLE_MAX_ERRORS 15 #define THERMOCOUPLE_MAX_ERRORS 15

2
Marlin/src/feature/direct_stepping.cpp
View file

@ -61,7 +61,7 @@ namespace DirectStepping {
template<typename Cfg> template<typename Cfg>
uint8_t SerialPageManager<Cfg>::pages[Cfg::NUM_PAGES][Cfg::PAGE_SIZE]; uint8_t SerialPageManager<Cfg>::pages[Cfg::NUM_PAGES][Cfg::PAGE_SIZE];
template<typename Cfg> template<typename Cfg>
uint8_t SerialPageManager<Cfg>::checksum; uint8_t SerialPageManager<Cfg>::checksum;

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

@ -2075,7 +2075,7 @@ void Temperature::disable_all_heaters() {
// Needed to return the correct temp when this is called too soon // Needed to return the correct temp when this is called too soon
static uint16_t max6675_temp_previous[COUNT_6675] = { 0 }; static uint16_t max6675_temp_previous[COUNT_6675] = { 0 };
#endif #endif
static uint8_t max6675_errors[COUNT_6675] = { 0 }; static uint8_t max6675_errors[COUNT_6675] = { 0 };
#define MAX6675_HEAT_INTERVAL 250UL #define MAX6675_HEAT_INTERVAL 250UL

3
Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
View file

@ -47,7 +47,6 @@
#define PS_ON_PIN 40 // Used by CR2020 Industrial series #define PS_ON_PIN 40 // Used by CR2020 Industrial series
#endif #endif
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN)
#define CASE_LIGHT_PIN 65 #define CASE_LIGHT_PIN 65
#endif #endif
@ -65,5 +64,5 @@
#define SUICIDE_PIN 12 // Used by CR2020 Industrial series #define SUICIDE_PIN 12 // Used by CR2020 Industrial series
#ifndef SUICIDE_PIN_INVERTING #ifndef SUICIDE_PIN_INVERTING
#define SUICIDE_PIN_INVERTING true #define SUICIDE_PIN_INVERTING true
#endif #endif

4
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View file

@ -59,7 +59,7 @@
#define RAMPS_D10_PIN TG_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h #define RAMPS_D10_PIN TG_HEATER_0_PIN // HEATER_0_PIN is always RAMPS_D10_PIN in pins_RAMPS.h
#if HAS_MULTI_HOTEND // EEF and EEB #if HAS_MULTI_HOTEND // EEF and EEB
#define RAMPS_D9_PIN TG_HEATER_1_PIN #define RAMPS_D9_PIN TG_HEATER_1_PIN
#if !TEMP_SENSOR_BED #if !TEMP_SENSOR_BED
// EEF // EEF
@ -79,7 +79,7 @@
#define RAMPS_D8_PIN TG_FAN0_PIN #define RAMPS_D8_PIN TG_FAN0_PIN
#endif #endif
#if HAS_MULTI_HOTEND || TEMP_SENSOR_BED // EEF, EEB, EFB #if HAS_MULTI_HOTEND || TEMP_SENSOR_BED // EEF, EEB, EFB
#define FAN1_PIN TG_FAN1_PIN #define FAN1_PIN TG_FAN1_PIN
#endif #endif
#define FAN2_PIN TG_FAN2_PIN #define FAN2_PIN TG_FAN2_PIN

4
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_V1_1.h
View file

@ -352,8 +352,8 @@
* ￣￣ * ￣￣
* W1 * W1
*/ */
#define ESP_WIFI_MODULE_COM 6 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this #define ESP_WIFI_MODULE_COM 6 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this
#define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2 #define ESP_WIFI_MODULE_BAUDRATE BAUDRATE // Must use same BAUDRATE as SERIAL_PORT & SERIAL_PORT_2
#define ESP_WIFI_MODULE_RESET_PIN PG0 #define ESP_WIFI_MODULE_RESET_PIN PG0
#define ESP_WIFI_MODULE_ENABLE_PIN PG1 #define ESP_WIFI_MODULE_ENABLE_PIN PG1
#define ESP_WIFI_MODULE_GPIO0_PIN PF14 #define ESP_WIFI_MODULE_GPIO0_PIN PF14