Merge remote-tracking branch 'upstream/master'

Makefile

@@ -8,7 +8,7 @@
 OUT=out/
 
 # Kconfig includes
-export KCONFIG_CONFIG     := $(CURDIR)/.config
+export KCONFIG_CONFIG     ?= $(CURDIR)/.config
 -include $(KCONFIG_CONFIG)
 
 # Common command definitions

README.md

@@ -122,6 +122,8 @@ See the [Danger Features document](https://dangerklipper.io/Danger_Features.html
 
 - [core: non-critical-mcus](https://github.com/DangerKlippers/danger-klipper/pull/339)
 
+- [core: action_log](https://github.com/DangerKlippers/danger-klipper/pull/367)
+
 If you're feeling adventurous, take a peek at the extra features in the bleeding-edge-v2 branch [feature documentation](docs/Bleeding_Edge.md)
 and [feature configuration reference](docs/Config_Reference_Bleeding_Edge.md):
 

docs/Command_Templates.md

@@ -190,6 +190,7 @@ Available "action" commands:
 - `action_respond_info(msg)`: Write the given `msg` to the
   /tmp/printer pseudo-terminal. Each line of `msg` will be sent with a
   "// " prefix.
+- `action_log(msg)`: Write the given msg to the klippy.log
 - `action_raise_error(msg)`: Abort the current macro (and any calling
   macros) and write the given `msg` to the /tmp/printer
   pseudo-terminal. The first line of `msg` will be sent with a "!! "

docs/Config_Reference_Bleeding_Edge.md

@@ -66,12 +66,12 @@ smoother_freq_y: 0
 
 ## Test print utilities
 
-### [ringing_tower]
+### [ringing_test]
 
 Ringing tower test print utility which isolates vibrations to one axis at a time.
 
 ```
-[ringing_tower]
+[ringing_test]
 size: 100
 #   X-Y Size of tower footprint (mm)
 height: 60

klippy/extras/smart_effector.py

@@ -69,13 +69,6 @@ def __init__(self, config):
         self.query_endstop = self.probe_wrapper.query_endstop
         self.multi_probe_begin = self.probe_wrapper.multi_probe_begin
         self.multi_probe_end = self.probe_wrapper.multi_probe_end
-        self.get_position_endstop = self.probe_wrapper.get_position_endstop
-        # Common probe implementation helpers
-        self.cmd_helper = probe.ProbeCommandHelper(
-            config, self, self.probe_wrapper.query_endstop
-        )
-        self.probe_offsets = probe.ProbeOffsetsHelper(config)
-        self.probe_session = probe.ProbeSessionHelper(config, self)
         # SmartEffector control
         control_pin = config.get("control_pin", None)
         if control_pin:

test/klippy/action_log.cfg

@@ -0,0 +1,81 @@
+[stepper_x]
+step_pin: PF0
+dir_pin: PF1
+enable_pin: !PD7
+microsteps: 16
+rotation_distance: 40
+endstop_pin: ^PE5
+position_endstop: 0
+position_max: 200
+homing_speed: 50
+
+[stepper_y]
+step_pin: PF6
+dir_pin: !PF7
+enable_pin: !PF2
+microsteps: 16
+rotation_distance: 40
+endstop_pin: ^PJ1
+position_endstop: 0
+position_max: 200
+homing_speed: 50
+
+[stepper_z]
+step_pin: PL3
+dir_pin: PL1
+enable_pin: !PK0
+microsteps: 16
+rotation_distance: 8
+endstop_pin: ^PD3
+position_endstop: 0.5
+position_max: 200
+
+[extruder]
+step_pin: PA4
+dir_pin: PA6
+enable_pin: !PA2
+microsteps: 16
+rotation_distance: 33.5
+nozzle_diameter: 0.500
+filament_diameter: 3.500
+heater_pin: PB4
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: PK5
+control: pid
+pid_Kp: 22.2
+pid_Ki: 1.08
+pid_Kd: 114
+min_temp: 0
+max_temp: 210
+
+[temperature_fan my_temp_fan]
+pin: PB5
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: PK6
+target_temp: 65.0
+control: curve
+points:
+  50.0, 0.0
+  55.0, 0.5
+  60.0, 1.0
+smooth_readings: 100
+cooling_hysteresis: 5.0
+heating_hysteresis: 0.0
+min_temp: 0
+max_temp: 200
+min_speed: 0.0
+max_speed: 1.0
+
+[mcu]
+serial: /dev/ttyACM0
+
+[printer]
+kinematics: cartesian
+max_velocity: 300
+max_accel: 3000
+max_z_velocity: 5
+max_z_accel: 100
+
+[gcode_macro ACTION_LOG]
+gcode:
+    {action_log("TEST")}

test/klippy/action_log.test

@@ -0,0 +1,5 @@
+# Test case for action_log
+CONFIG action_log.cfg
+DICTIONARY atmega2560.dict
+
+ACTION_LOG