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

Merge pull request #7769 from thinkyhead/bf2_GT2560

Browse source 
Fixes for GT2560, ANET A8
This commit is contained in:
Scott Lahteine 2017-09-27 10:32:50 -05:00 committed by GitHub
commit f582f1bf4e
5 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/src/Marlin.cpp
View file

@ -239,12 +239,6 @@ void setup_powerhold() {
#endif #endif
} }
void suicide() {
#if HAS_SUICIDE
OUT_WRITE(SUICIDE_PIN, LOW);
#endif
}
#if HAS_SERVOS #if HAS_SERVOS
HAL_SERVO_LIB servo[NUM_SERVOS]; HAL_SERVO_LIB servo[NUM_SERVOS];
@ -612,7 +606,10 @@ void kill(const char* lcd_msg) {
SET_INPUT(PS_ON_PIN); SET_INPUT(PS_ON_PIN);
#endif #endif
#if HAS_SUICIDE
suicide(); suicide();
#endif
while (1) { while (1) {
#if ENABLED(USE_WATCHDOG) #if ENABLED(USE_WATCHDOG)
watchdog_reset(); watchdog_reset();

4
Marlin/src/Marlin.h
View file

@ -218,4 +218,8 @@ extern millis_t max_inactive_time, stepper_inactive_time;
bool pin_is_protected(const int8_t pin); bool pin_is_protected(const int8_t pin);
#if HAS_SUICIDE
inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); }
#endif
#endif // __MARLIN_H__ #endif // __MARLIN_H__

4
Marlin/src/gcode/control/M80_M81.cpp
View file

@ -30,6 +30,10 @@
#include "../../lcd/ultralcd.h" #include "../../lcd/ultralcd.h"
#endif #endif
#if HAS_SUICIDE
#include "../../Marlin.h"
#endif
#if HAS_POWER_SWITCH #if HAS_POWER_SWITCH
// Could be moved to a feature, but this is all the data // Could be moved to a feature, but this is all the data

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

@ -1972,7 +1972,7 @@ void Temperature::isr() {
#if ENABLED(ADC_KEYPAD) #if ENABLED(ADC_KEYPAD)
case Prepare_ADC_KEY: case Prepare_ADC_KEY:
START_ADC(ADC_KEYPAD_PIN); HAL_START_ADC(ADC_KEYPAD_PIN);
break; break;
case Measure_ADC_KEY: case Measure_ADC_KEY:
if (ADCKey_count < 16) { if (ADCKey_count < 16) {

4
Marlin/src/pins/pins_GT2560_REV_A_PLUS.h
View file

@ -29,4 +29,8 @@
#undef BOARD_NAME #undef BOARD_NAME
#define BOARD_NAME "GT2560 Rev.A+" #define BOARD_NAME "GT2560 Rev.A+"
#if ENABLED(BLTOUCH)
#define SERVO0_PIN 32
#else
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#endif