From 47dd9e3715ee4492246acab8f757bdc8d67cf6f3 Mon Sep 17 00:00:00 2001 From: Juan Pablo Caram Date: Mon, 17 Nov 2014 19:27:17 -0500 Subject: [PATCH] Fixed zdownrate bug preventing gcode generation. --- camlib.py | 2 ++ defaults.json | 2 +- recent.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/camlib.py b/camlib.py index 79e9fdd0..e642404b 100644 --- a/camlib.py +++ b/camlib.py @@ -1921,6 +1921,8 @@ class CNCjob(Geometry): self.zdownrate = float(zdownrate) elif CNCjob.defaults["zdownrate"] is not None: self.zdownrate = float(CNCjob.defaults["zdownrate"]) + else: + self.zdownrate = None # Attributes to be included in serialization diff --git a/defaults.json b/defaults.json index b97181ec..6c4ba8d1 100644 --- a/defaults.json +++ b/defaults.json @@ -1 +1 @@ -{"cncjob_append": "", "gerber_noncopperrounded": false, "geometry_paintoverlap": 0.15, "geometry_plot": true, "zoom_ratio": 1.5, "shell_at_startup": "1", "gerber_isotooldia": 0.016, "serial": "nuaxe92x4v5f2jeft4kr", "shell_shape": [500, 300], "zoom_in_key": "3", "zoom_out_key": "2", "stats": {"on_toggle_units": 6, "on_options_app2project": 32, "save_defaults": 4569, "on_delete": 29, "on_file_openproject": 1, "on_fileopengerber": 10, "obj_on_scale_button": 5, "on_file_saveproject": 2, "geometry_on_generatecnc_button": 2, "on_file_new": 32, "gerber_on_iso_button": 1, "exec_command": 4, "on_fileopenexcellon": 12}, "recent_limit": 10, "gerber_plot": true, "defaults_save_period_ms": 20000, "gerber_cutoutgapsize": 0.15, "geometry_feedrate": 3.0, "units": "IN", "excellon_travelz": 0.1, "gerber_multicolored": false, "gerber_solid": true, "gerber_isopasses": 1, "fit_key": "1", "excellon_plot": true, "excellon_feedrate": 3.0, "cncjob_tooldia": 0.016, "geometry_travelz": 0.1, "gerber_cutoutmargin": 0.1, "excellon_solid": false, "geometry_paintmargin": 0.0, "geometry_cutz": -0.002, "gerber_noncoppermargin": 0.0, "gerber_cutouttooldia": 0.07, "gerber_gaps": "4", "gerber_bboxmargin": 0.0, "point_clipboard_format": "(%.4f, %.4f)", "cncjob_plot": true, "excellon_drillz": -0.1, "gerber_isooverlap": 0.15, "gerber_bboxrounded": false, "geometry_cnctooldia": 0.016, "geometry_painttooldia": 0.07} \ No newline at end of file +{"geometry_plot": true, "zoom_ratio": 1.5, "shell_at_startup": "1", "gerber_plot": true, "defaults_save_period_ms": 20000, "geometry_feedrate": 3.0, "excellon_travelz": 0.1, "gerber_multicolored": false, "gerber_solid": true, "gerber_isopasses": 1, "excellon_plot": true, "excellon_feedrate": 3.0, "geometry_travelz": 0.1, "excellon_solid": false, "geometry_paintmargin": 0.0, "zdownrate": "1", "gerber_gaps": "4", "gerber_bboxmargin": 0.0, "point_clipboard_format": "(%.4f, %.4f)", "excellon_drillz": -0.1, "geometry_cnctooldia": 0.016, "geometry_painttooldia": 0.07, "gerber_noncopperrounded": false, "geometry_paintoverlap": 0.15, "cncjob_append": "", "serial": "nuaxe92x4v5f2jeft4kr", "shell_shape": [500, 300], "zoom_in_key": "3", "zoom_out_key": "2", "stats": {"on_toggle_units": 6, "on_options_app2project": 48, "save_defaults": 13480, "on_delete": 33, "cncjob_on_exportgcode_button": 2, "on_fileopengerber": 13, "obj_on_scale_button": 7, "on_file_openproject": 1, "on_file_saveproject": 2, "geometry_on_generatecnc_button": 17, "on_file_new": 48, "on_about": 1, "exec_command": 6, "obj_on_offset_button": 1, "gerber_on_iso_button": 6, "on_fileopenexcellon": 13}, "recent_limit": 10, "gerber_cutoutgapsize": 0.15, "units": "IN", "fit_key": "1", "gerber_isotooldia": 0.016, "cncjob_tooldia": 0.016, "gerber_cutoutmargin": 0.1, "geometry_cutz": -0.002, "gerber_cutouttooldia": 0.07, "cncjob_plot": true, "gerber_isooverlap": 0.15, "gerber_bboxrounded": false, "gerber_noncoppermargin": 0.0} \ No newline at end of file diff --git a/recent.json b/recent.json index 0ca579f4..0c50451b 100644 --- a/recent.json +++ b/recent.json @@ -1 +1 @@ -[{"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/PlacaReles.drl"}, {"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/bedini 7 coils capacitor discharge.gbr"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/LockController_v1.0_pcb-RoundHoles.TXT/LockController_v1.0_pcb-RoundHoles.TXT"}, {"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/Gerbers/AVR_Transistor_Tester.DRL"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/Excellon_Planck/X-Y CONTROLLER - Drill Data - Through Hole.drl"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/FlatCam_Drilling_Test/FlatCam_Drilling_Test.drl"}, {"kind": "project", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/easy_eda_test/easy_eda.fc"}, {"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/easy_eda_test/GTL"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/easy_eda_test/DRL"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/holes.drl"}] \ No newline at end of file +[{"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/Top.gbr"}, {"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/Gerbers/AVR_Transistor_Tester_copper_top.GTL"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/drill_alignment_problem/rfduino dip.drl"}, {"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/drill_alignment_problem/rfduino dip-F_Cu.gtl"}, {"kind": "cncjob", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/gcode_cutom_zspeed.gcode"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/PlacaReles.drl"}, {"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/bedini 7 coils capacitor discharge.gbr"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/LockController_v1.0_pcb-RoundHoles.TXT/LockController_v1.0_pcb-RoundHoles.TXT"}, {"kind": "gerber", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/Gerbers/AVR_Transistor_Tester.DRL"}, {"kind": "excellon", "filename": "C:/Users/jpcaram/Dropbox/CNC/pcbcam/test_files/Excellon_Planck/X-Y CONTROLLER - Drill Data - Through Hole.drl"}] \ No newline at end of file