rename of key

Author: usmfi

pyGCodeDecode/data/default_printer_presets.yaml

@@ -49,7 +49,7 @@ debugging:
   # general properties
   nozzle_diam: 0.4
   filament_diam: 2.85
-  extrusion_volumetric: True # true: mm3 with UltiGCode, else mm length
+  volumetric_extrusion: True # true: mm3 with UltiGCode, else mm length
   # default settings
   p_vel: 85
   p_acc: 100

pyGCodeDecode/gcode_interpreter.py

@@ -623,7 +623,7 @@ def check_initial_setup(self, initial_machine_setup):
             "printer_name",
             "firmware",
         ]
-        optional_keys = ["layer_cue", "nozzle_diam", "filament_diam", "extrusion_volumetric"]
+        optional_keys = ["layer_cue", "nozzle_diam", "filament_diam", "volumetric_extrusion"]
 
         valid_keys = req_keys + optional_keys
 

pyGCodeDecode/state_generator.py

@@ -82,7 +82,7 @@
 default_virtual_machine = {
     "absolute_position": True,
     "absolute_extrusion": True,
-    "extrusion_volumetric": False,
+    "volumetric_extrusion": False,
     "units": "SI (mm)",
     "initial_position": None,
     # general properties
@@ -216,7 +216,7 @@ def apply_extrusion(line_dict: dict, virtual_machine: dict, command: str) -> dic
         # volumetric to length conversion
         # (1) V = (d/2)^2 * pi * E
         # (2) E = V / ((d/2)^2 * pi)
-        if virtual_machine.get("extrusion_volumetric", False):
+        if virtual_machine.get("volumetric_extrusion", False):
             # volumetric extrusion
             e_value = e_value / (math.pi * (virtual_machine["filament_diam"] / 2) ** 2)
 

tests/test_end_to_end.py

@@ -20,7 +20,7 @@ def test_end_to_end_volumetr():
     from pyGCodeDecode.gcode_interpreter import setup, simulation
 
     preset = setup(pathlib.Path("./tests/data/test_printer_setups.yaml"), "test")
-    preset.set_property({"extrusion_volumetric": False})
+    preset.set_property({"volumetric_extrusion": False})
 
     sim = simulation(
         gcode_path=pathlib.Path("./tests/data/test_state_generator.gcode"),
@@ -32,7 +32,7 @@ def test_end_to_end_volumetr():
     assert end_extrusion == expected_extrusion, f"Expected {expected_extrusion}, but got {end_extrusion}"
 
     preset = setup(pathlib.Path("./tests/data/test_printer_setups.yaml"), "test")
-    preset.set_property({"extrusion_volumetric": True})
+    preset.set_property({"volumetric_extrusion": True})
 
     sim = simulation(
         gcode_path=pathlib.Path("./tests/data/test_state_generator.gcode"),