Skip to content

Commit

Permalink
Merge pull request #1607 from PavelSindler/7x7
Browse files Browse the repository at this point in the history
7x7 mbl and switching mmu modes
  • Loading branch information
PavelSindler authored Mar 15, 2019
2 parents b2d2828 + 0ca5221 commit c05561d
Show file tree
Hide file tree
Showing 18 changed files with 638 additions and 121 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ Firmware/Doc
/lang/textaddr.txt
/build-env/
/Firmware/Firmware.vcxproj
/Firmware/Configuration_prusa_bckp.h
2 changes: 2 additions & 0 deletions Firmware/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,9 @@ your extruder heater takes 2 minutes to hit the target on heating.
// When enabled Marlin will send a busy status message to the host
// every couple of seconds when it can't accept commands.
//
#ifndef HEATBED_ANALYSIS
#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages
#endif //HEATBED_ANALYSIS
#define HOST_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.

//LCD and SD support
Expand Down
15 changes: 7 additions & 8 deletions Firmware/Marlin.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "Configuration.h"
#include "pins.h"
#include "Timer.h"
extern int mbl_z_probe_nr;

#ifndef AT90USB
#define HardwareSerial_h // trick to disable the standard HWserial
Expand Down Expand Up @@ -316,9 +317,9 @@ extern float retract_length_swap;
extern float retract_recover_length_swap;
#endif

#ifdef HOST_KEEPALIVE_FEATURE

extern uint8_t host_keepalive_interval;
#endif


extern unsigned long starttime;
extern unsigned long stoptime;
Expand Down Expand Up @@ -402,13 +403,12 @@ extern void check_babystep();
extern void long_pause();
extern void crashdet_stop_and_save_print();

#ifdef DIS

#ifdef HEATBED_ANALYSIS
void d_setup();
float d_ReadData();
void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y);

#endif
void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y);
#endif //HEATBED_ANALYSIS
float temp_comp_interpolation(float temperature);
void temp_compensation_apply();
void temp_compensation_start();
Expand Down Expand Up @@ -448,7 +448,7 @@ extern void restore_print_from_ram_and_continue(float e_move);
extern uint16_t print_time_remaining();
extern uint8_t calc_percent_done();

#ifdef HOST_KEEPALIVE_FEATURE


// States for managing Marlin and host communication
// Marlin sends messages if blocked or busy
Expand All @@ -471,7 +471,6 @@ extern void host_keepalive();
//extern MarlinBusyState busy_state;
extern int busy_state;

#endif //HOST_KEEPALIVE_FEATURE

#ifdef TMC2130

Expand Down
Loading

0 comments on commit c05561d

Please sign in to comment.