Browse Source
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.hpull/1/head
Bernhard Kubicek
13 years ago
9 changed files with 2284 additions and 2125 deletions
File diff suppressed because it is too large
@ -1,95 +1,98 @@ |
|||||
/*
|
/*
|
||||
planner.h - buffers movement commands and manages the acceleration profile plan |
planner.h - buffers movement commands and manages the acceleration profile plan |
||||
Part of Grbl |
Part of Grbl |
||||
|
|
||||
Copyright (c) 2009-2011 Simen Svale Skogsrud |
Copyright (c) 2009-2011 Simen Svale Skogsrud |
||||
|
|
||||
Grbl is free software: you can redistribute it and/or modify |
Grbl is free software: you can redistribute it and/or modify |
||||
it under the terms of the GNU General Public License as published by |
it under the terms of the GNU General Public License as published by |
||||
the Free Software Foundation, either version 3 of the License, or |
the Free Software Foundation, either version 3 of the License, or |
||||
(at your option) any later version. |
(at your option) any later version. |
||||
|
|
||||
Grbl is distributed in the hope that it will be useful, |
Grbl is distributed in the hope that it will be useful, |
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
GNU General Public License for more details. |
GNU General Public License for more details. |
||||
|
|
||||
You should have received a copy of the GNU General Public License |
You should have received a copy of the GNU General Public License |
||||
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/ |
*/ |
||||
|
|
||||
// This module is to be considered a sub-module of stepper.c. Please don't include
|
// This module is to be considered a sub-module of stepper.c. Please don't include
|
||||
// this file from any other module.
|
// this file from any other module.
|
||||
|
|
||||
#ifndef planner_h |
#ifndef planner_h |
||||
#define planner_h |
#define planner_h |
||||
|
|
||||
#include "Configuration.h" |
#include "Configuration.h" |
||||
|
|
||||
// This struct is used when buffering the setup for each linear movement "nominal" values are as specified in
|
// This struct is used when buffering the setup for each linear movement "nominal" values are as specified in
|
||||
// the source g-code and may never actually be reached if acceleration management is active.
|
// the source g-code and may never actually be reached if acceleration management is active.
|
||||
typedef struct { |
typedef struct { |
||||
// Fields used by the bresenham algorithm for tracing the line
|
// Fields used by the bresenham algorithm for tracing the line
|
||||
long steps_x, steps_y, steps_z, steps_e; // Step count along each axis
|
long steps_x, steps_y, steps_z, steps_e; // Step count along each axis
|
||||
long step_event_count; // The number of step events required to complete this block
|
long step_event_count; // The number of step events required to complete this block
|
||||
volatile long accelerate_until; // The index of the step event on which to stop acceleration
|
long accelerate_until; // The index of the step event on which to stop acceleration
|
||||
volatile long decelerate_after; // The index of the step event on which to start decelerating
|
long decelerate_after; // The index of the step event on which to start decelerating
|
||||
volatile long acceleration_rate; // The acceleration rate used for acceleration calculation
|
long acceleration_rate; // The acceleration rate used for acceleration calculation
|
||||
unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h)
|
unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h)
|
||||
#ifdef ADVANCE |
#ifdef ADVANCE |
||||
long advance_rate; |
// long advance_rate;
|
||||
volatile long initial_advance; |
// volatile long initial_advance;
|
||||
volatile long final_advance; |
// volatile long final_advance;
|
||||
float advance; |
// float advance;
|
||||
#endif |
#endif |
||||
|
|
||||
// Fields used by the motion planner to manage acceleration
|
// Fields used by the motion planner to manage acceleration
|
||||
float speed_x, speed_y, speed_z, speed_e; // Nominal mm/minute for each axis
|
// float speed_x, speed_y, speed_z, speed_e; // Nominal mm/minute for each axis
|
||||
float nominal_speed; // The nominal speed for this block in mm/min
|
float nominal_speed; // The nominal speed for this block in mm/min
|
||||
float millimeters; // The total travel of this block in mm
|
float entry_speed; // Entry speed at previous-current junction in mm/min
|
||||
float entry_speed; |
float max_entry_speed; // Maximum allowable junction entry speed in mm/min
|
||||
float acceleration; // acceleration mm/sec^2
|
float millimeters; // The total travel of this block in mm
|
||||
|
float acceleration; // acceleration mm/sec^2
|
||||
// Settings for the trapezoid generator
|
unsigned char recalculate_flag; // Planner flag to recalculate trapezoids on entry junction
|
||||
long nominal_rate; // The nominal step rate for this block in step_events/sec
|
unsigned char nominal_length_flag; // Planner flag for nominal speed always reached
|
||||
volatile long initial_rate; // The jerk-adjusted step rate at start of block
|
|
||||
volatile long final_rate; // The minimal rate at exit
|
// Settings for the trapezoid generator
|
||||
long acceleration_st; // acceleration steps/sec^2
|
unsigned long nominal_rate; // The nominal step rate for this block in step_events/sec
|
||||
volatile char busy; |
unsigned long initial_rate; // The jerk-adjusted step rate at start of block
|
||||
} block_t; |
unsigned long final_rate; // The minimal rate at exit
|
||||
|
unsigned long acceleration_st; // acceleration steps/sec^2
|
||||
// Initialize the motion plan subsystem
|
volatile char busy; |
||||
void plan_init(); |
} block_t; |
||||
|
|
||||
// Add a new linear movement to the buffer. x, y and z is the signed, absolute target position in
|
// Initialize the motion plan subsystem
|
||||
// millimaters. Feed rate specifies the speed of the motion.
|
void plan_init(); |
||||
void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate); |
|
||||
|
// Add a new linear movement to the buffer. x, y and z is the signed, absolute target position in
|
||||
// Set position. Used for G92 instructions.
|
// millimaters. Feed rate specifies the speed of the motion.
|
||||
void plan_set_position(const float &x, const float &y, const float &z, const float &e); |
void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate); |
||||
|
|
||||
|
// Set position. Used for G92 instructions.
|
||||
// Called when the current block is no longer needed. Discards the block and makes the memory
|
void plan_set_position(const float &x, const float &y, const float &z, const float &e); |
||||
// availible for new blocks.
|
|
||||
void plan_discard_current_block(); |
|
||||
|
// Called when the current block is no longer needed. Discards the block and makes the memory
|
||||
// Gets the current block. Returns NULL if buffer empty
|
// availible for new blocks.
|
||||
block_t *plan_get_current_block(); |
void plan_discard_current_block(); |
||||
|
|
||||
void check_axes_activity(); |
// Gets the current block. Returns NULL if buffer empty
|
||||
|
block_t *plan_get_current_block(); |
||||
extern unsigned long minsegmenttime; |
|
||||
extern float max_feedrate[4]; // set the max speeds
|
void check_axes_activity(); |
||||
extern float axis_steps_per_unit[4]; |
|
||||
extern long max_acceleration_units_per_sq_second[4]; // Use M201 to override by software
|
extern unsigned long minsegmenttime; |
||||
extern float minimumfeedrate; |
extern float max_feedrate[4]; // set the max speeds
|
||||
extern float acceleration; // Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX
|
extern float axis_steps_per_unit[4]; |
||||
extern float retract_acceleration; // mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX
|
extern unsigned long max_acceleration_units_per_sq_second[4]; // Use M201 to override by software
|
||||
extern float max_xy_jerk; //speed than can be stopped at once, if i understand correctly.
|
extern float minimumfeedrate; |
||||
extern float max_z_jerk; |
extern float acceleration; // Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX
|
||||
extern float mintravelfeedrate; |
extern float retract_acceleration; // mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX
|
||||
extern unsigned long axis_steps_per_sqr_second[NUM_AXIS]; |
extern float max_xy_jerk; //speed than can be stopped at once, if i understand correctly.
|
||||
#ifdef AUTOTEMP |
extern float max_z_jerk; |
||||
extern float high_e_speed; |
extern float mintravelfeedrate; |
||||
#endif |
extern unsigned long axis_steps_per_sqr_second[NUM_AXIS]; |
||||
#endif |
#ifdef AUTOTEMP |
||||
|
extern float high_e_speed; |
||||
|
#endif |
||||
|
#endif |
||||
|
|||||
File diff suppressed because it is too large
File diff suppressed because it is too large
@ -1,102 +1,103 @@ |
|||||
#ifndef __ULTRALCDH |
#ifndef __ULTRALCDH |
||||
#define __ULTRALCDH |
#define __ULTRALCDH |
||||
#include "Configuration.h" |
#include "Configuration.h" |
||||
|
|
||||
#ifdef ULTRA_LCD |
#ifdef ULTRA_LCD |
||||
|
|
||||
void lcd_status(); |
void lcd_status(); |
||||
void lcd_init(); |
void lcd_init(); |
||||
void lcd_status(const char* message); |
void lcd_status(const char* message); |
||||
void beep(); |
void beep(); |
||||
void buttons_check(); |
void buttons_check(); |
||||
|
|
||||
|
|
||||
#define LCD_UPDATE_INTERVAL 100 |
#define LCD_UPDATE_INTERVAL 100 |
||||
#define STATUSTIMEOUT 15000 |
#define STATUSTIMEOUT 15000 |
||||
|
|
||||
|
|
||||
#include <LiquidCrystal.h> |
#include <LiquidCrystal.h> |
||||
extern LiquidCrystal lcd; |
extern LiquidCrystal lcd; |
||||
|
|
||||
|
|
||||
#ifdef NEWPANEL |
#ifdef NEWPANEL |
||||
|
|
||||
|
|
||||
#define EN_C (1<<BLEN_C) |
#define EN_C (1<<BLEN_C) |
||||
#define EN_B (1<<BLEN_B) |
#define EN_B (1<<BLEN_B) |
||||
#define EN_A (1<<BLEN_A) |
#define EN_A (1<<BLEN_A) |
||||
|
|
||||
#define CLICKED (buttons&EN_C) |
#define CLICKED (buttons&EN_C) |
||||
#define BLOCK {blocking=millis()+blocktime;} |
#define BLOCK {blocking=millis()+blocktime;} |
||||
#define CARDINSERTED (READ(SDCARDDETECT)==0) |
#define CARDINSERTED (READ(SDCARDDETECT)==0) |
||||
|
|
||||
#else |
#else |
||||
|
|
||||
//atomatic, do not change
|
//atomatic, do not change
|
||||
#define B_LE (1<<BL_LE) |
#define B_LE (1<<BL_LE) |
||||
#define B_UP (1<<BL_UP) |
#define B_UP (1<<BL_UP) |
||||
#define B_MI (1<<BL_MI) |
#define B_MI (1<<BL_MI) |
||||
#define B_DW (1<<BL_DW) |
#define B_DW (1<<BL_DW) |
||||
#define B_RI (1<<BL_RI) |
#define B_RI (1<<BL_RI) |
||||
#define B_ST (1<<BL_ST) |
#define B_ST (1<<BL_ST) |
||||
#define EN_B (1<<BLEN_B) |
#define EN_B (1<<BLEN_B) |
||||
#define EN_A (1<<BLEN_A) |
#define EN_A (1<<BLEN_A) |
||||
|
|
||||
#define CLICKED ((buttons&B_MI)||(buttons&B_ST)) |
#define CLICKED ((buttons&B_MI)||(buttons&B_ST)) |
||||
#define BLOCK {blocking[BL_MI]=millis()+blocktime;blocking[BL_ST]=millis()+blocktime;} |
#define BLOCK {blocking[BL_MI]=millis()+blocktime;blocking[BL_ST]=millis()+blocktime;} |
||||
|
|
||||
#endif |
#endif |
||||
|
|
||||
// blocking time for recognizing a new keypress of one key, ms
|
// blocking time for recognizing a new keypress of one key, ms
|
||||
#define blocktime 500 |
#define blocktime 500 |
||||
#define lcdslow 5 |
#define lcdslow 5 |
||||
|
|
||||
enum MainStatus{Main_Status, Main_Menu, Main_Prepare, Main_Control, Main_SD}; |
enum MainStatus{Main_Status, Main_Menu, Main_Prepare, Main_Control, Main_SD}; |
||||
|
|
||||
class MainMenu{ |
class MainMenu{ |
||||
public: |
public: |
||||
MainMenu(); |
MainMenu(); |
||||
void update(); |
void update(); |
||||
uint8_t activeline; |
uint8_t activeline; |
||||
MainStatus status; |
MainStatus status; |
||||
uint8_t displayStartingRow; |
uint8_t displayStartingRow; |
||||
|
|
||||
void showStatus(); |
void showStatus(); |
||||
void showMainMenu(); |
void showMainMenu(); |
||||
void showPrepare(); |
void showPrepare(); |
||||
void showControl(); |
void showControl(); |
||||
void showSD(); |
void showSD(); |
||||
bool force_lcd_update; |
bool force_lcd_update; |
||||
int lastencoderpos; |
int lastencoderpos; |
||||
int8_t lineoffset; |
int8_t lineoffset; |
||||
int8_t lastlineoffset; |
int8_t lastlineoffset; |
||||
|
|
||||
bool linechanging; |
bool linechanging; |
||||
}; |
}; |
||||
|
|
||||
//conversion routines, could need some overworking
|
//conversion routines, could need some overworking
|
||||
char *fillto(int8_t n,char *c); |
char *fillto(int8_t n,char *c); |
||||
char *ftostr51(const float &x); |
char *ftostr51(const float &x); |
||||
char *ftostr31(const float &x); |
char *ftostr31(const float &x); |
||||
char *ftostr3(const float &x); |
char *ftostr3(const float &x); |
||||
|
|
||||
|
|
||||
|
|
||||
#define LCD_MESSAGE(x) lcd_status(x); |
#define LCD_MESSAGE(x) lcd_status(x); |
||||
#define LCD_MESSAGEPGM(x) lcd_statuspgm(PSTR(x)); |
#define LCD_MESSAGEPGM(x) lcd_statuspgm(PSTR(x)); |
||||
#define LCD_STATUS lcd_status() |
#define LCD_STATUS lcd_status() |
||||
#else //no lcd
|
#else //no lcd
|
||||
#define LCD_STATUS |
#define LCD_STATUS |
||||
#define LCD_MESSAGE(x) |
#define LCD_MESSAGE(x) |
||||
inline void lcd_status() {}; |
#define LCD_MESSAGEPGM(x) |
||||
#endif |
inline void lcd_status() {}; |
||||
|
#endif |
||||
#ifndef ULTIPANEL |
|
||||
#define CLICKED false |
#ifndef ULTIPANEL |
||||
#define BLOCK ; |
#define CLICKED false |
||||
#endif |
#define BLOCK ; |
||||
|
#endif |
||||
void lcd_statuspgm(const char* message); |
|
||||
|
void lcd_statuspgm(const char* message); |
||||
#endif //ULTRALCD
|
|
||||
|
#endif //ULTRALCD
|
||||
|
|
||||
|
|||||
Loading…
Reference in new issue