josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not declare extern class in .cpp file, include appropriate header.

This commit is contained in:
Marek Bel 2018-11-06 20:54:53 +01:00
parent 95b0506284
commit b4d4bfa667
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin.h
View File

@ -21,6 +21,7 @@
#include "fastio.h" #include "fastio.h"
#include "Configuration.h" #include "Configuration.h"
#include "pins.h" #include "pins.h"
#include "Timer.h"
#ifndef AT90USB #ifndef AT90USB
#define HardwareSerial_h // trick to disable the standard HWserial #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 bool wizard_active; //autoload temporarily disabled during wizard
extern LongTimer safetyTimer;
#define PRINT_PERCENT_DONE_INIT 0xff #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) #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)

2
Firmware/Marlin_main.cpp
View File

@ -204,7 +204,7 @@ unsigned long pause_time = 0;
unsigned long start_pause_print = millis(); unsigned long start_pause_print = millis();
unsigned long t_fan_rising_edge = millis(); unsigned long t_fan_rising_edge = millis();
LongTimer safetyTimer; LongTimer safetyTimer;
LongTimer crashDetTimer; static LongTimer crashDetTimer;
//unsigned long load_filament_time; //unsigned long load_filament_time;

1
Firmware/lcd.cpp
View File

@ -768,7 +768,6 @@ void lcd_update_enable(uint8_t enabled)
} }
} }
extern LongTimer safetyTimer;
void lcd_buttons_update(void) void lcd_buttons_update(void)
{ {
static uint8_t lcd_long_press_active = 0; static uint8_t lcd_long_press_active = 0;