MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fixes for Anet10 and gt2560

Browse Source 
Fixes for 2 "... not declared in this scope" compiler errors.
This commit is contained in:
Phr3d13 2017-09-27 05:40:48 -04:00 committed by Scott Lahteine
parent 5a3a53379f
commit 10c1b442ca
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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
suicide(); #if HAS_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) {