From b4d4bfa6676b0d8974579ac23d368667e1f98e36 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 6 Nov 2018 20:54:53 +0100 Subject: [PATCH] Do not declare extern class in .cpp file, include appropriate header. --- Firmware/Marlin.h | 3 +++ Firmware/Marlin_main.cpp | 2 +- Firmware/lcd.cpp | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 36ba1acf3..6d965a99e 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -21,6 +21,7 @@ #include "fastio.h" #include "Configuration.h" #include "pins.h" +#include "Timer.h" #ifndef AT90USB #define HardwareSerial_h // trick to disable the standard HWserial @@ -367,6 +368,8 @@ extern uint16_t gcode_in_progress; extern bool wizard_active; //autoload temporarily disabled during wizard +extern LongTimer safetyTimer; + #define PRINT_PERCENT_DONE_INIT 0xff #define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == CUSTOM_MSG_TYPE_TEMCAL) || saved_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL) || card.paused || mmu_print_saved) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 77bab1cbb..2ea0e551e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -204,7 +204,7 @@ unsigned long pause_time = 0; unsigned long start_pause_print = millis(); unsigned long t_fan_rising_edge = millis(); LongTimer safetyTimer; -LongTimer crashDetTimer; +static LongTimer crashDetTimer; //unsigned long load_filament_time; diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 2204fa08a..4ec40c5f1 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -768,7 +768,6 @@ void lcd_update_enable(uint8_t enabled) } } -extern LongTimer safetyTimer; void lcd_buttons_update(void) { static uint8_t lcd_long_press_active = 0;