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

cleanup: static variables in Marlin_main.cpp

This commit is contained in:
Guðni Már Gilbert 2023-04-16 23:23:31 +00:00
parent 9b6e1babcb
commit 43d41ddd2b
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin.h
View File

@ -304,8 +304,6 @@ extern float retract_length_swap;
extern float retract_recover_length_swap; extern float retract_recover_length_swap;
#endif #endif
extern uint8_t host_keepalive_interval;
extern uint32_t starttime; // milliseconds extern uint32_t starttime; // milliseconds
extern uint32_t pause_time; // milliseconds extern uint32_t pause_time; // milliseconds
extern uint32_t start_pause_print; // milliseconds extern uint32_t start_pause_print; // milliseconds
@ -350,9 +348,6 @@ extern uint16_t print_time_to_change_silent;
#define PRINT_TIME_REMAINING_INIT 0xffff #define PRINT_TIME_REMAINING_INIT 0xffff
extern uint16_t mcode_in_progress;
extern uint16_t gcode_in_progress;
extern LongTimer safetyTimer; extern LongTimer safetyTimer;
#define PRINT_PERCENT_DONE_INIT 0xff #define PRINT_PERCENT_DONE_INIT 0xff

24
Firmware/Marlin_main.cpp
View File

@ -248,7 +248,7 @@ static bool cancel_heatup = false;
int8_t busy_state = NOT_BUSY; int8_t busy_state = NOT_BUSY;
static long prev_busy_signal_ms = -1; static long prev_busy_signal_ms = -1;
uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; static uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL;
const char errormagic[] PROGMEM = "Error:"; const char errormagic[] PROGMEM = "Error:";
const char echomagic[] PROGMEM = "echo:"; const char echomagic[] PROGMEM = "echo:";
@ -258,9 +258,9 @@ const char echomagic[] PROGMEM = "echo:";
#define X_COORD_INVALID (X_MIN_POS-1) #define X_COORD_INVALID (X_MIN_POS-1)
#define SAVED_START_POSITION_UNSET X_COORD_INVALID #define SAVED_START_POSITION_UNSET X_COORD_INVALID
float saved_start_position[NUM_AXIS] = {SAVED_START_POSITION_UNSET, 0, 0, 0}; static float saved_start_position[NUM_AXIS] = {SAVED_START_POSITION_UNSET, 0, 0, 0};
uint16_t saved_segment_idx = 0; static uint16_t saved_segment_idx = 0;
// storing estimated time to end of print counted by slicer // storing estimated time to end of print counted by slicer
uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT; uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT;
@ -292,16 +292,16 @@ static float next_feedrate;
// Original feedrate saved during homing moves // Original feedrate saved during homing moves
static float saved_feedrate; static float saved_feedrate;
const int8_t sensitive_pins[] PROGMEM = SENSITIVE_PINS; // Sensitive pin list for M42 static const int8_t sensitive_pins[] PROGMEM = SENSITIVE_PINS; // Sensitive pin list for M42
//static float tt = 0; //static float tt = 0;
//static float bt = 0; //static float bt = 0;
//Inactivity shutdown variables //Inactivity shutdown variables
static LongTimer previous_millis_cmd; static LongTimer previous_millis_cmd;
unsigned long max_inactive_time = 0; static uint32_t max_inactive_time = 0;
static unsigned long stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l; static uint32_t stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l;
static unsigned long safetytimer_inactive_time = DEFAULT_SAFETYTIMER_TIME_MINS*60*1000ul; static uint32_t safetytimer_inactive_time = DEFAULT_SAFETYTIMER_TIME_MINS*60*1000ul;
uint32_t starttime; uint32_t starttime;
uint32_t pause_time; uint32_t pause_time;
@ -315,12 +315,12 @@ bool processing_tcode; // Helper variable to block certain functions while T-cod
Servo servos[NUM_SERVOS]; Servo servos[NUM_SERVOS];
#endif #endif
bool target_direction; static bool target_direction;
//Insert variables if CHDK is defined //Insert variables if CHDK is defined
#ifdef CHDK #ifdef CHDK
unsigned long chdkHigh = 0; static uint32_t chdkHigh = 0;
bool chdkActive = false; static bool chdkActive = false;
#endif #endif
//! @name RAM save/restore printing //! @name RAM save/restore printing
@ -410,8 +410,8 @@ static void temp_compensation_apply();
static uint8_t get_PRUSA_SN(char* SN); static uint8_t get_PRUSA_SN(char* SN);
#endif //PRUSA_SN_SUPPORT #endif //PRUSA_SN_SUPPORT
uint16_t gcode_in_progress = 0; static uint16_t gcode_in_progress = 0;
uint16_t mcode_in_progress = 0; static uint16_t mcode_in_progress = 0;
void serial_echopair_P(const char *s_P, float v) void serial_echopair_P(const char *s_P, float v)
{ serialprintPGM(s_P); SERIAL_ECHO(v); } { serialprintPGM(s_P); SERIAL_ECHO(v); }