Skip to content

Commit

Permalink
Merge branch 'edge' into onboot
Browse files Browse the repository at this point in the history
Conflicts:
	src/libs/Kernel.cpp
	src/libs/Kernel.h
	src/modules/robot/Block.cpp
	src/modules/robot/Block.h
	src/modules/robot/Conveyor.cpp
	src/modules/utils/simpleshell/SimpleShell.cpp
	src/modules/utils/simpleshell/SimpleShell.h
  • Loading branch information
logxen committed Feb 17, 2013
2 parents 663d794 + 3066ba0 commit addfb45
Show file tree
Hide file tree
Showing 226 changed files with 33,368 additions and 11,492 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ LPC176x/
/gcc4mbed/mac_install.log
/gcc4mbed/win_install.log
/gcc4mbed/linux_install.log
*~
15 changes: 15 additions & 0 deletions ConfigSamples/README.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
These subdirectories contain samples of config files that can be used with the
Smoothie software to configure it for your particular setup. To use one of
these configuration files with your Smoothie software, just copy the "config"
file found in the appropriate directory to the root of the uSD card on your
Smoothie enabled hardware.

The samples include:
* Smoothieboard - This directory contains a sample configuration for the
most recent Smoothieboard.

* Smoothieboard.Rostock - This directory contains a sample config for a
Rostock or Kossel style bot using the most recent Smoothieboard.

You can find even more information about Smoothie configuration at this URL:
http://smoothieware.org/configuring-smoothie
141 changes: 141 additions & 0 deletions ConfigSamples/Smoothieboard.Rostock/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
# Robot module configurations : general handling of movement G-codes and slicing into moves
default_feed_rate 4000 # Default rate ( mm/minute ) for G1/G2/G3 moves
default_seek_rate 4000 # Default rate ( mm/minute ) for G0 moves
mm_per_arc_segment 0.5 # Arcs are cut into segments ( lines ), this is the length for these segments. Smaller values mean more resolution, higher values mean faster computation
mm_per_line_segment 0.5 # Lines can be cut into segments ( not usefull with cartesian coordinates robots, but very useful on a delta type bot ).

# Arm solution configuration : Cartesian robot. Translates mm positions into stepper positions
arm_solution rostock # selects the rostock arm solution

alpha_steps_per_mm 80 # Steps per mm for alpha stepper
beta_steps_per_mm 80 # Steps per mm for beta stepper
gamma_steps_per_mm 80 # Steps per mm for gamma stepper

alpha_angle 30.0 # this provides an optional offset from the alpha tower to the x/y system
beta_relative_angle 120.0 # this is the angle in degrees from the alpha tower to the beta tower
gamma_relative_angle 240.0 # this is the angle in degrees from the alpha tower to the gamma tower

arm_length 250.0 # this is the length of an arm from hinge to hinge
arm_radius 124.0 # this is the horiontal distance from hinge to hinge when the effector is centered

# Planner module configuration : Look-ahead and acceleration configuration
planner_queue_size 64 # Size of the planning queue, must be a power of 2. 128 seems to be the maximum.
acceleration 3000 # Acceleration in mm/second/second.
acceleration_ticks_per_second 1000 # Number of times per second the speed is updated
junction_deviation 0.05 # Similar to the old "max_jerk", in millimeters, see : https://github.com/grbl/grbl/blob/master/planner.c#L409
# and https://github.com/grbl/grbl/wiki/Configuring-Grbl-v0.8 . Lower values mean being more careful, higher values means being faster and have more jerk

# Stepper module configuration
microseconds_per_step_pulse 1 # Duration of step pulses to stepper drivers, in microseconds
minimum_steps_per_minute 1200 # Never step slower than this
base_stepping_frequency 100000 # Base frequency for stepping, higher gives smoother movement

# Stepper module pins ( ports, and pin numbers, appending "!" to the number will invert a pin )
alpha_step_pin 2.0 # Pin for alpha stepper step signal
alpha_dir_pin 0.5 # Pin for alpha stepper direction
alpha_en_pin 0.4 # Pin for alpha enable pin
alpha_current 1.5 # X stepper motor current
x_axis_max_speed 30000 # mm/min

beta_step_pin 2.1 # Pin for beta stepper step signal
beta_dir_pin 0.11 # Pin for beta stepper direction
beta_en_pin 0.10 # Pin for beta enable
beta_current 1.5 # Y stepper motor current
y_axis_max_speed 30000 # mm/min

gamma_step_pin 2.2 # Pin for gamma stepper step signal
gamma_dir_pin 0.20 # Pin for gamma stepper direction
gamma_en_pin 0.19 # Pin for gamma enable
gamma_current 1.5 # Z stepper motor current
z_axis_max_speed 30000 # mm/min

# Serial communications configuration ( baud rate default to 9600 if undefined )
uart0.baud_rate 115200 # Baud rate for the default serial port

# Extruder module configuration
extruder_module_enable true # Whether to activate the extruder module at all. All configuration is ignored if false
extruder_steps_per_mm 140 # Steps per mm for extruder stepper
extruder_default_feed_rate 600 # Default rate ( mm/minute ) for moves where only the extruder moves
extruder_acceleration 50 # Acceleration for the stepper motor, as of 0.6, arbitrary ratio
extruder_max_speed 1000 # mm^3/s

extruder_step_pin 2.3 # Pin for extruder step signal
extruder_dir_pin 0.22 # Pin for extruder dir signal
extruder_en_pin 0.21 # Pin for extruder enable signal
delta_current 1.5 # Extruder stepper motor current

# Laser module configuration
laser_module_enable false # Whether to activate the laser module at all. All configuration is ignored if false.

# Hotend temperature control configuration
temperature_control.hotend.enable true # Whether to activate this ( "hotend" ) module at all. All configuration is ignored if false.
temperature_control.hotend.thermistor_pin 0.23 # Pin for the thermistor to read
temperature_control.hotend.heater_pin 2.7 # Pin that controls the heater
temperature_control.hotend.thermistor EPCOS100K # see src/modules/tools/temperaturecontrol/TemperatureControl.cpp:64 for a list of valid thermistor names
temperature_control.hotend.set_m_code 104 #
temperature_control.hotend.set_and_wait_m_code 109 #
temperature_control.hotend.designator T #

temperature_control.bed.enable true #
temperature_control.bed.thermistor_pin 0.24 #
temperature_control.bed.heater_pin 2.5 #
temperature_control.bed.thermistor Honeywell100K # see src/modules/tools/temperaturecontrol/TemperatureControl.cpp:64 for a list of valid thermistor names
temperature_control.bed.set_m_code 140 #
temperature_control.bed.set_and_wait_m_code 190 #
temperature_control.bed.designator B #

# Switch module for fan control
switch.fan.enable true #
switch.fan.on_m_code 106 #
switch.fan.off_m_code 107 #
switch.fan.output_pin 2.6 #

switch.misc.enable true #
switch.misc.on_m_code 42 #
switch.misc.off_m_code 43 #
switch.misc.output_pin 2.4 #

# Switch module for spindle control
switch.spindle.enable false #

# Endstops
alpha_min_endstop 1.24 #
alpha_max_endstop 1.25 #
alpha_homing_direction 1 #
alpha_min 0 #
alpha_max 0 #
beta_min_endstop 1.26 #
beta_max_endstop 1.27 #
beta_homing_direction 1 #
beta_min 0 #
beta_max 0 #
gamma_min_endstop 1.28 #
gamma_max_endstop 1.29 #
gamma_homing_direction 1 #
gamma_min 0 #
gamma_max 300 #

alpha_fast_homing_rate 3000 # rates in steps/second
beta_fast_homing_rate 3000 #
gamma_fast_homing_rate 3000 #
alpha_slow_homing_rate 1000 #
beta_slow_homing_rate 1000 #
gamma_slow_homing_rate 1000

alpha_homing_retract 500 #
beta_homing_retract 500 #
gamma_homing_retract 500 #

# Pause button
pause_button_enable true #

# Panel
panel.enable false #
panel.up_button_pin 0.1! #
panel.down_button_pin 0.0! #
panel.click_button_pin 0.18! #
panel.encoder_a_pin 0.15! #
panel.encoder_b_pin 0.17! #

# Only needed on a smoothieboard
currentcontrol_module_enable true #
133 changes: 133 additions & 0 deletions ConfigSamples/Smoothieboard/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# Robot module configurations : general handling of movement G-codes and slicing into moves
default_feed_rate 4000 # Default rate ( mm/minute ) for G1/G2/G3 moves
default_seek_rate 4000 # Default rate ( mm/minute ) for G0 moves
mm_per_arc_segment 0.5 # Arcs are cut into segments ( lines ), this is the length for these segments. Smaller values mean more resolution, higher values mean faster computation
mm_per_line_segment 5 # Lines can be cut into segments ( not usefull with cartesian coordinates robots ).

# Arm solution configuration : Cartesian robot. Translates mm positions into stepper positions
alpha_steps_per_mm 80 # Steps per mm for alpha stepper
beta_steps_per_mm 80 # Steps per mm for beta stepper
gamma_steps_per_mm 1600 # Steps per mm for gamma stepper

# Planner module configuration : Look-ahead and acceleration configuration
planner_queue_size 64 # Size of the planning queue, must be a power of 2. 128 seems to be the maximum.
acceleration 3000 # Acceleration in mm/second/second.
acceleration_ticks_per_second 1000 # Number of times per second the speed is updated
junction_deviation 0.05 # Similar to the old "max_jerk", in millimeters, see : https://github.com/grbl/grbl/blob/master/planner.c#L409
# and https://github.com/grbl/grbl/wiki/Configuring-Grbl-v0.8 . Lower values mean being more careful, higher values means being faster and have more jerk

# Stepper module configuration
microseconds_per_step_pulse 1 # Duration of step pulses to stepper drivers, in microseconds
minimum_steps_per_minute 1200 # Never step slower than this
base_stepping_frequency 100000 # Base frequency for stepping, higher gives smoother movement

# Stepper module pins ( ports, and pin numbers, appending "!" to the number will invert a pin )
alpha_step_pin 2.0 # Pin for alpha stepper step signal
alpha_dir_pin 0.5 # Pin for alpha stepper direction
alpha_en_pin 0.4 # Pin for alpha enable pin
alpha_current 1.5 # X stepper motor current
x_axis_max_speed 30000 # mm/min

beta_step_pin 2.1 # Pin for beta stepper step signal
beta_dir_pin 0.11 # Pin for beta stepper direction
beta_en_pin 0.10 # Pin for beta enable
beta_current 1.5 # Y stepper motor current
y_axis_max_speed 30000 # mm/min

gamma_step_pin 2.2 # Pin for gamma stepper step signal
gamma_dir_pin 0.20 # Pin for gamma stepper direction
gamma_en_pin 0.19 # Pin for gamma enable
gamma_current 1.5 # Z stepper motor current
z_axis_max_speed 300 # mm/min

# Serial communications configuration ( baud rate default to 9600 if undefined )
uart0.baud_rate 115200 # Baud rate for the default hardware serial port
second_usb_serial_enable false # This enables a second usb serial port (to have both pronterface and a terminal connected)

# Extruder module configuration
extruder_module_enable true # Whether to activate the extruder module at all. All configuration is ignored if false
extruder_steps_per_mm 140 # Steps per mm for extruder stepper
extruder_default_feed_rate 600 # Default rate ( mm/minute ) for moves where only the extruder moves
extruder_acceleration 50 # Acceleration for the stepper motor, as of 0.6, arbitrary ratio
extruder_max_speed 1000 # mm^3/s

extruder_step_pin 2.3 # Pin for extruder step signal
extruder_dir_pin 0.22 # Pin for extruder dir signal
extruder_en_pin 0.21 # Pin for extruder enable signal
delta_current 1.5 # Extruder stepper motor current

# Laser module configuration
laser_module_enable false # Whether to activate the laser module at all. All configuration is ignored if false.

# Hotend temperature control configuration
temperature_control.hotend.enable true # Whether to activate this ( "hotend" ) module at all. All configuration is ignored if false.
temperature_control.hotend.thermistor_pin 0.23 # Pin for the thermistor to read
temperature_control.hotend.heater_pin 2.7 # Pin that controls the heater
temperature_control.hotend.thermistor EPCOS100K # see src/modules/tools/temperaturecontrol/TemperatureControl.cpp:64 for a list of valid thermistor names
temperature_control.hotend.set_m_code 104 #
temperature_control.hotend.set_and_wait_m_code 109 #
temperature_control.hotend.designator T #

temperature_control.bed.enable true #
temperature_control.bed.thermistor_pin 0.24 #
temperature_control.bed.heater_pin 2.5 #
temperature_control.bed.thermistor Honeywell100K # see src/modules/tools/temperaturecontrol/TemperatureControl.cpp:64 for a list of valid thermistor names
temperature_control.bed.set_m_code 140 #
temperature_control.bed.set_and_wait_m_code 190 #
temperature_control.bed.designator B #

# Switch module for fan control
switch.fan.enable true #
switch.fan.on_m_code 106 #
switch.fan.off_m_code 107 #
switch.fan.output_pin 2.6 #

switch.misc.enable true #
switch.misc.on_m_code 42 #
switch.misc.off_m_code 43 #
switch.misc.output_pin 2.4 #

# Switch module for spindle control
switch.spindle.enable false #

# Endstops
alpha_min_endstop 1.24 #
alpha_max_endstop 1.25 #
alpha_homing_direction -1 #
alpha_min 0 #
alpha_max 200 #
beta_min_endstop 1.26 #
beta_max_endstop 1.27 #
beta_homing_direction -1 #
beta_min 0 #
beta_max 200 #
gamma_min_endstop 1.28 #
gamma_max_endstop 1.29 #
gamma_homing_direction 1 #
gamma_min 0 #
gamma_max 200 #

alpha_fast_homing_rate 3000 # rates in steps/second
beta_fast_homing_rate 3000 # depends on steps/mm setting above
gamma_fast_homing_rate 30000 # "
alpha_slow_homing_rate 1000 # "
beta_slow_homing_rate 1000 # "
gamma_slow_homing_rate 10000

alpha_homing_retract 500 # "
beta_homing_retract 500 # "
gamma_homing_retract 5000 # "

# Pause button
pause_button_enable true #

# Panel
panel.enable false #
panel.up_button_pin 0.1! #
panel.down_button_pin 0.0! #
panel.click_button_pin 0.18! #
panel.encoder_a_pin 0.15! #
panel.encoder_b_pin 0.17! #

# Only needed on a smoothieboard
currentcontrol_module_enable true #
Loading

0 comments on commit addfb45

Please sign in to comment.