resin_used_ml as usedMaterial in config.json

prusa3d · Aug 29, 2024 · f6ffacb · f6ffacb
1 parent 4b4b4f9
commit f6ffacb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/gcode_metadata/metadata.py b/gcode_metadata/metadata.py
@@ -782,7 +782,8 @@ def __init__(self, key_to_parse: str):
         "expTimeFirst": "exposure_time_first",
         "layerHeight": "layer_height",
         "materialName": "material",
-        "printerModel": "printer_model"
+        "printerModel": "printer_model",
+        "usedMaterial": "resin_used_ml",
     }
 
     @staticmethod
@@ -813,7 +814,8 @@ class SLMetaData(MetaData):
         "exposure_time_first": int,
         "total_layers": int,
         "total_height": int,
-        "resin_used_ml": int,
+        # to unify with filament used [mm] rounded to 2 decimal places
+        "resin_used_ml": lambda x: round(float(x), 2),
         "printer_model": str,
     }
 

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -338,7 +338,8 @@ def test_sl(self):
             'exposure_time_first': 25,
             'layer_height': 0.05,
             'material': 'Prusament Resin Tough Prusa Orange @0.05 SL1S',
-            'printer_model': 'SL1S'
+            'printer_model': 'SL1S',
+            'resin_used_ml': 17.15,
         }
 
         assert len(meta.thumbnails["400x400_PNG"]) == 26948