Merge branch 'edge' into multitool

Conflicts:
	ConfigSamples/Smoothieboard/config
	src/libs/Kernel.h
	src/modules/tools/extruder/Extruder.h
	src/modules/tools/extruder/ExtruderMaker.cpp

diff --cc ConfigSamples/Smoothieboard/config
index b0d827e,75541cf..8ab2b20
--- 1/ConfigSamples/Smoothieboard/config
--- 2/ConfigSamples/Smoothieboard/config
+++ b/ConfigSamples/Smoothieboard/config
@@@ -53,52 -61,35 +61,58 @@@ second_usb_serial_enabl
  
  
  # 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/sec NOTE
 -
 -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
++<<<<<<< HEAD
 +extruder.hotend.enable                          true             # Whether to activate the extruder module at all. All configuration is ignored if false
 +extruder.hotend.steps_per_mm                    140              # Steps per mm for extruder stepper
 +extruder.hotend.default_feed_rate               600              # Default rate ( mm/minute ) for moves where only the extruder moves
 +extruder.hotend.acceleration                    50               # Acceleration for the stepper motor, as of 0.6, arbitrary ratio
 +extruder.hotend.max_speed                       1000             # mm^3/s
 +
 +extruder.hotend.step_pin                        2.3              # Pin for extruder step signal
 +extruder.hotend.dir_pin                         0.22             # Pin for extruder dir signal
 +extruder.hotend.en_pin                          0.21             # Pin for extruder enable signal
 +
 +# for now the first extruder's offsets should be left at 0 or homing will get confused
 +extruder.hotend.x_offset                        0                # x offset from first tool in mm
 +extruder.hotend.y_offset                        0                # y offset from first tool in mm
 +extruder.hotend.z_offset                        0                # z offset from first tool in mm
 +
 +delta_current                                1.5              # First extruder stepper motor current
 +
 +# Second extruder module configuration
 +#extruder.hotend2.enable                          true             # Whether to activate the extruder module at all. All configuration is ignored if false
 +#extruder.hotend2.steps_per_mm                    140              # Steps per mm for extruder stepper
 +#extruder.hotend2.default_feed_rate               600              # Default rate ( mm/minute ) for moves where only the extruder moves
 +#extruder.hotend2.acceleration                    50               # Acceleration for the stepper motor, as of 0.6, arbitrary ratio
 +#extruder.hotend2.max_speed                       1000             # mm^3/s
 +
 +#extruder.hotend2.step_pin                        2.8              # Pin for extruder step signal
 +#extruder.hotend2.dir_pin                         2.13             # Pin for extruder dir signal
 +#extruder.hotend2.en_pin                          4.29             # Pin for extruder enable signal
 +
 +#extruder.hotend2.x_offset                        50               # x offset from first tool in mm
 +#extruder.hotend2.y_offset                        0                # y offset from first tool in mm
 +#extruder.hotend2.z_offset                        0                # z offset from first tool in mm
 +
 +#epsilon_current                              1.5              # Second 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.
- #laser_module_pin                             2.5              # this pin will be PWMed to control the laser. Only P2.0 - P2.5 can be used since laser requires hardware PWM
- #laser_module_max_power                       0.8              # this is the maximum duty cycle that will be applied to the laser
- #laser_module_tickle_power                    0.0              # this duty cycle will be used for travel moves to keep the laser active without actually burning
- #laser_module_pwm_period                      20               # this sets the pwm frequency, the value is the period in microseconds
+ laser_module_enable                          false            # Whether to activate the laser module at all. All configuration is 
+                                                               # ignored if false.
+ #laser_module_pin                             2.5             # this pin will be PWMed to control the laser. Only P2.0 - P2.5 
+                                                               # can be used since laser requires hardware PWM
+ #laser_module_max_power                       0.8             # this is the maximum duty cycle that will be applied to the laser
+ #laser_module_tickle_power                    0.0             # this duty cycle will be used for travel moves to keep the laser 
+                                                               # active without actually burning
+ #laser_module_pwm_period                      20              # this sets the pwm frequency as the period in microseconds
  
  # 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.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.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                #

diff --cc src/libs/Kernel.cpp
Simple merge

diff --cc src/libs/Kernel.h
Simple merge

diff --cc src/modules/communication/GcodeDispatch.cpp
Simple merge

diff --cc src/modules/robot/Robot.cpp
Simple merge

diff --cc src/modules/tools/extruder/Extruder.cpp
Simple merge

diff --cc src/modules/tools/extruder/Extruder.h
index 290d9ce,e941d8c..b85f2cd
--- 1/src/modules/tools/extruder/Extruder.h
--- 2/src/modules/tools/extruder/Extruder.h
+++ b/src/modules/tools/extruder/Extruder.h
@@@ -13,7 -13,10 +13,10 @@@
  #include "libs/Module.h"
  #include "libs/Kernel.h"
  #include "modules/robot/Block.h"
 -#include "modules/tools/toolsmanager/Tool.h"
 +#include "modules/tools/toolmanager/Tool.h"
+ #include "Pin.h"
+ 
+ class StepperMotor;
  
  #define OFF 0
  #define SOLO 1