Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/addons/fabex/gcode_import_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,9 @@ def do_M163(self, args):
extr_idx = int(args["S"]) # e.g. M163 S0 P1
weight = args["P"]
# change CMYKW
col[extr_idx + 3] = (
weight # +3 weil ersten 3 stellen RGB sind, need only CMYKW values for extrude
)
col[
extr_idx + 3
] = weight # +3 weil ersten 3 stellen RGB sind, need only CMYKW values for extrude
self.color = col

# take RGB values for seg from last comment (above first M163 statement)
Expand Down
9 changes: 5 additions & 4 deletions scripts/addons/fabex/post_processors/iso.py
Original file line number Diff line number Diff line change
Expand Up @@ -694,13 +694,14 @@ def calc_feedrate_hv(self, h, v):
# self.s.set(s, self.SPINDLE_CW(), self.SPINDLE_CCW())
# else:
# self.s.set(s, self.SPINDLE_CCW(), self.SPINDLE_CW())
def spindle(self, s, clockwise): # EXPERIMENTAL -- grbl only
def spindle(self, s, clockwise): # EXPERIMENTAL -- grbl only
# Get machine settings
machine = bpy.context.scene.cam_machine

if (machine.spindle_slow_start_enable and
s > machine.spindle_min + machine.spindle_slow_start_skip_threshold):

if (
machine.spindle_slow_start_enable
and s > machine.spindle_min + machine.spindle_slow_start_skip_threshold
):
# Generate slow start sequence
steps = machine.spindle_slow_start_steps
total_time = machine.spindle_slow_start_total_time
Expand Down
1 change: 0 additions & 1 deletion scripts/addons/fabex/properties/material_props.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@


class CAM_MATERIAL_Properties(PropertyGroup):

wire_color: FloatVectorProperty(
name="Wire Color",
description="Color of the CAM_Material box in the viewport",
Expand Down
1 change: 0 additions & 1 deletion scripts/addons/fabex/properties/name_props.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ def update_name_link(self, context):


class CAM_NAME_Properties(PropertyGroup):

default_export_location: StringProperty(
name="Export Folder",
description="Folder where Fabex will save exported gcode files",
Expand Down
1 change: 0 additions & 1 deletion scripts/addons/fabex/ui/icons/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ def register():


def unregister():

for fabex_icons in preview_collections.values():
bpy.utils.previews.remove(fabex_icons)
preview_collections.clear()
10 changes: 5 additions & 5 deletions scripts/addons/fabex/utilities/image_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,11 +414,11 @@ def build_stroke(start, end, cutterArray):
samplesz = numpy.round(numpy.linspace(start[2], end[2], strokelength))

for i in range(0, len(strokelength)):
strokeArray[samplesx[i] - r : samplesx[i] + r, samplesy[i] - r : samplesy[i] + r] = (
numpy.maximum(
strokeArray[samplesx[i] - r : samplesx[i] + r, samplesy[i] - r : samplesy[i] + r],
cutterArray + samplesz[i],
)
strokeArray[
samplesx[i] - r : samplesx[i] + r, samplesy[i] - r : samplesy[i] + r
] = numpy.maximum(
strokeArray[samplesx[i] - r : samplesx[i] + r, samplesy[i] - r : samplesy[i] + r],
cutterArray + samplesz[i],
)
return strokeArray

Expand Down
2 changes: 1 addition & 1 deletion scripts/addons/fabex/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__=(2,0,1)
__version__ = (2, 0, 1)