Apply all changes from latest Marlin_V1

Diffed and merged, preserving my updates
This commit is contained in:
Scott Lahteine
2013-06-06 15:49:25 -07:00
parent a5cd582665
commit 5dabc95409
22 changed files with 3221 additions and 996 deletions

View File

@ -60,6 +60,10 @@ typedef struct {
unsigned long final_rate; // The minimal rate at exit
unsigned long acceleration_st; // acceleration steps/sec^2
unsigned long fan_speed;
#ifdef BARICUDA
unsigned long valve_pressure;
unsigned long e_to_p_pressure;
#endif
volatile char busy;
} block_t;
@ -135,7 +139,9 @@ FORCE_INLINE bool blocks_queued()
return true;
}
void allow_cold_extrudes(bool allow);
#ifdef PREVENT_DANGEROUS_EXTRUDE
void set_extrude_min_temp(float temp);
#endif
void reset_acceleration_rates();
#endif