Merge carlosgs' master branch

2013-10-23 12:08:39 +08:00 · 2013-10-23 12:08:39 +08:00 · f289364f5a
parent e58afd5ff8 a5065d03ec
commit f289364f5a
18 changed files with 2450 additions and 2447 deletions
--- a/Hardware/Development/XZ_axis/stl/gears/both_gears.stl
+++ b/Hardware/Development/XZ_axis/stl/gears/both_gears.stl
--- a/Media/Cyclone_render_v0.9.7_full.png
+++ b/Media/Cyclone_render_v0.9.7_full.png
--- a/Media/Cyclone_render_v0.9.7_full_explodedView.png
+++ b/Media/Cyclone_render_v0.9.7_full_explodedView.png
--- a/README.md
+++ b/README.md
@ -27,6 +27,11 @@ Tutorials
 _Work in progress_  
 <http://reprap.org/wiki/Cyclone_PCB_Factory>  

+Also take a look to these branches  
+--  
+<https://github.com/yOPERO/Cyclone-PCB-Factory>  
+<https://github.com/glenchung/Cyclone-PCB-Factory>  
+More: <https://github.com/carlosgs/Cyclone-PCB-Factory/graphs/contributors>  

 To-Do list  
 --  
@ -68,7 +73,9 @@ _Check Hardware, Software and Firmware sections for details regarding authorship

 Render (v0.9.7)  
 --
-![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_render_v0.9.7.png)
+![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_render_v0.9.7_full.png)  
+![ScreenShot](https://github.com/carlosgs/Cyclone-PCB-Factory/raw/master/Media/Cyclone_render_v0.9.7_full_explodedView.png)  
+**Thanks a lot to Glen Chung for the fully assembled renders**  

 Disclaimer  
 --
--- a/Software/1_GenerateGcode.py
+++ b/Software/1_GenerateGcode.py
@ -26,8 +26,8 @@ import os
 from subprocess import call
 original_dir = os.getcwd()
 os.chdir("./GcodeGenerators/pyGerber2Gcode_CUI/")
-call(["python","./pygerber2gcode_cui_MOD.py"])
-# call(["pypy","./pygerber2gcode_cui_MOD.py"]) # If you have "pypy" installed go ahead!
+#call(["python","./pygerber2gcode_cui_MOD.py"])
+call(["pypy","./pygerber2gcode_cui_MOD.py"]) # If you have "pypy" installed go ahead!
 os.chdir(original_dir)


@ -41,8 +41,8 @@ gcodeviewer = pltNewFig() # Define a new figure, this doesnt open a window by it



-filePath = "./GcodeGenerators/pyGerber2Gcode_CUI/out/"
-fileName = "GNBoard" # sys.argv[1]
+#filePath = "./GcodeGenerators/pyGerber2Gcode_CUI/out/"
+#fileName = "GNBoard" # sys.argv[1]

 (etch_moves, travel_moves, gcode_minXY_global, gcode_maxXY_global) = gcv.view(filePath,fileName,showAll=1)

--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_drill.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_drill.gcode
@ -1,46 +1,46 @@
 (Generated by ./pygerber2gcode_cui_MOD.py )
-( 2013-06-18 10:00:09 )
+( 2013-10-19 12:20:24 )
 (Initialize)

 (Start form here)
 G0 Z0.500000 F40.000000
-G0 X125.229159 Y17.085080
+G0 X103.229159 Y47.085080
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X125.229159 Y11.263400
+G0 X103.229159 Y41.263400
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X123.430839 Y18.883400
+G0 X101.430839 Y48.883400
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X123.430839 Y9.465080
+G0 X101.430839 Y39.465080
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X116.339159 Y18.883400
+G0 X94.339159 Y48.883400
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X116.339159 Y9.465080
+G0 X94.339159 Y39.465080
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X114.540839 Y17.085080
+G0 X92.540839 Y47.085080
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X114.540839 Y11.263400
+G0 X92.540839 Y41.263400
 G0 Z-2.000000 F40.000000 D0.609600
 G0 Z0.500000
-G0 X119.884999 Y19.254240
+G0 X97.884999 Y49.254240
 G0 Z-2.000000 F40.000000 D1.016000
 G0 Z0.500000
-G0 X119.884999 Y16.714240
+G0 X97.884999 Y46.714240
 G0 Z-2.000000 F40.000000 D1.016000
 G0 Z0.500000
-G0 X119.884999 Y14.174240
+G0 X97.884999 Y44.174240
 G0 Z-2.000000 F40.000000 D1.016000
 G0 Z0.500000
-G0 X119.884999 Y11.634240
+G0 X97.884999 Y41.634240
 G0 Z-2.000000 F40.000000 D1.016000
 G0 Z0.500000
-G0 X119.884999 Y9.094240
+G0 X97.884999 Y39.094240
 G0 Z-2.000000 F40.000000 D1.016000
 G0 Z0.500000

--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_edge.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_edge.gcode
@ -1,80 +1,30 @@
 (Generated by ./pygerber2gcode_cui_MOD.py )
-( 2013-06-18 10:00:09 )
+( 2013-10-19 12:20:24 )
 (Initialize)

 (Start form here)
 G0 Z0.500000
-G0 X130.044999 Y13.539240
-G1 Z-0.285714 F20.000000
-G1 Y20.524240 F30.000000
-G1 X125.599999 Y24.969240 F30.000000
-G1 X114.169999 F30.000000
-G1 X109.724999 Y20.524240 F30.000000
-G1 Y7.824240 F30.000000
-G1 X114.169999 Y3.379240 F30.000000
-G1 X125.599999 F30.000000
-G1 X130.044999 Y7.824240 F30.000000
-G1 Y13.539240 F30.000000
-G1 Z-0.571429 F20.000000
-G1 Y20.524240 F30.000000
-G1 X125.599999 Y24.969240 F30.000000
-G1 X114.169999 F30.000000
-G1 X109.724999 Y20.524240 F30.000000
-G1 Y7.824240 F30.000000
-G1 X114.169999 Y3.379240 F30.000000
-G1 X125.599999 F30.000000
-G1 X130.044999 Y7.824240 F30.000000
-G1 Y13.539240 F30.000000
-G1 Z-0.857143 F20.000000
-G1 Y20.524240 F30.000000
-G1 X125.599999 Y24.969240 F30.000000
-G1 X114.169999 F30.000000
-G1 X109.724999 Y20.524240 F30.000000
-G1 Y7.824240 F30.000000
-G1 X114.169999 Y3.379240 F30.000000
-G1 X125.599999 F30.000000
-G1 X130.044999 Y7.824240 F30.000000
-G1 Y13.539240 F30.000000
-G1 Z-1.142857 F20.000000
-G1 Y20.524240 F30.000000
-G1 X125.599999 Y24.969240 F30.000000
-G1 X114.169999 F30.000000
-G1 X109.724999 Y20.524240 F30.000000
-G1 Y7.824240 F30.000000
-G1 X114.169999 Y3.379240 F30.000000
-G1 X125.599999 F30.000000
-G1 X130.044999 Y7.824240 F30.000000
-G1 Y13.539240 F30.000000
-G1 Z-1.428571 F20.000000
-G1 Y20.524240 F30.000000
-G1 X125.599999 Y24.969240 F30.000000
-G1 X114.169999 F30.000000
-G1 X109.724999 Y20.524240 F30.000000
-G1 Y7.824240 F30.000000
-G1 X114.169999 Y3.379240 F30.000000
-G1 X125.599999 F30.000000
-G1 X130.044999 Y7.824240 F30.000000
-G1 Y13.539240 F30.000000
-G1 Z-1.714286 F20.000000
-G1 Y20.524240 F30.000000
-G1 X125.599999 Y24.969240 F30.000000
-G1 X114.169999 F30.000000
-G1 X109.724999 Y20.524240 F30.000000
-G1 Y7.824240 F30.000000
-G1 X114.169999 Y3.379240 F30.000000
-G1 X125.599999 F30.000000
-G1 X130.044999 Y7.824240 F30.000000
-G1 Y13.539240 F30.000000
-G1 Z-2.000000 F20.000000
-G1 Y20.524240 F30.000000
-G1 X125.599999 Y24.969240 F30.000000
-G1 X114.169999 F30.000000
-G1 X109.724999 Y20.524240 F30.000000
-G1 Y7.824240 F30.000000
-G1 X114.169999 Y3.379240 F30.000000
-G1 X125.599999 F30.000000
-G1 X130.044999 Y7.824240 F30.000000
-G1 Y13.539240 F30.000000
+G0 X108.044999 Y43.539240
+G1 Z-0.850000 F10.000000
+G1 Y50.524240 F20.000000
+G1 X103.599999 Y54.969240 F20.000000
+G1 X92.169999 F20.000000
+G1 X87.724999 Y50.524240 F20.000000
+G1 Y37.824240 F20.000000
+G1 X92.169999 Y33.379240 F20.000000
+G1 X103.599999 F20.000000
+G1 X108.044999 Y37.824240 F20.000000
+G1 Y43.539240 F20.000000
+G1 Z-1.700000 F10.000000
+G1 Y50.524240 F20.000000
+G1 X103.599999 Y54.969240 F20.000000
+G1 X92.169999 F20.000000
+G1 X87.724999 Y50.524240 F20.000000
+G1 Y37.824240 F20.000000
+G1 X92.169999 Y33.379240 F20.000000
+G1 X103.599999 F20.000000
+G1 X108.044999 Y37.824240 F20.000000
+G1 Y43.539240 F20.000000

 (Goto to Initial position)
 G0 Z0.500000
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_etch.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_etch.gcode
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_etch2pass.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_etch2pass.gcode
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_etch3pass.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/4LDR_Board_etch3pass.gcode
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_drill.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_drill.gcode
@ -1,5 +1,5 @@
 (Generated by ./pygerber2gcode_cui_MOD.py )
-( 2013-07-28 13:51:51 )
+( 2013-10-19 10:59:36 )
 (Initialize)

 (Start form here)
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_edge.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_edge.gcode
@ -1,5 +1,5 @@
 (Generated by ./pygerber2gcode_cui_MOD.py )
-( 2013-07-28 13:51:51 )
+( 2013-10-19 10:59:36 )
 (Initialize)

 (Start form here)
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_etch.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_etch.gcode
@ -1,5 +1,5 @@
 (Generated by ./pygerber2gcode_cui_MOD.py )
-( 2013-07-28 13:51:51 )
+( 2013-10-19 10:59:36 )
 (Initialize)

 (Start form here)
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_etch2pass.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_etch2pass.gcode
@ -1,5 +1,5 @@
 (Generated by ./pygerber2gcode_cui_MOD.py )
-( 2013-07-28 13:51:51 )
+( 2013-10-19 10:59:36 )
 (Initialize)

 (Start form here)
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_etch3pass.gcode
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/out/GNBoard_etch3pass.gcode
@ -1,5 +1,5 @@
 (Generated by ./pygerber2gcode_cui_MOD.py )
-( 2013-07-28 13:51:51 )
+( 2013-10-19 10:59:36 )
 (Initialize)

 (Start form here)
--- a/Software/GcodeGenerators/pyGerber2Gcode_CUI/pygerber2gcode_cui_MOD.conf
+++ b/Software/GcodeGenerators/pyGerber2Gcode_CUI/pygerber2gcode_cui_MOD.conf
@ -1,8 +1,8 @@
 GERBER_DIR = "./in"
 FRONT_FILE = ""
-BACK_FILE = "GNBoard-B_Cu.gbl"
-DRILL_FILE = "GNBoard.drl"
-EDGE_FILE = "GNBoard-Edge_Cuts.gbr"
+BACK_FILE = "4LDR_Board-B_Cu.gbl"
+DRILL_FILE = "4LDR_Board.drl"
+EDGE_FILE = "4LDR_Board-Edge_Cuts.gbr"
 MIRROR_FRONT = 0
 MIRROR_BACK = 1
 MIRROR_DRILL = 1
@ -10,13 +10,13 @@ MIRROR_EDGE = 1
 ROT_ANG = 0
 OUT_DIR = "./out"
 OUT_FRONT_FILE = ""
-OUT_BACK_FILE = "GNBoard_etch.gcode"
+OUT_BACK_FILE = "4LDR_Board_etch.gcode"
 OUT_FRONT_2PASS_FILE = ""
-OUT_BACK_2PASS_FILE = "GNBoard_etch2pass.gcode"
+OUT_BACK_2PASS_FILE = "4LDR_Board_etch2pass.gcode"
 OUT_FRONT_3PASS_FILE = ""
-OUT_BACK_3PASS_FILE = "GNBoard_etch3pass.gcode"
-OUT_DRILL_FILE = "GNBoard_drill.gcode"
-OUT_EDGE_FILE = "GNBoard_edge.gcode"
+OUT_BACK_3PASS_FILE = "4LDR_Board_etch3pass.gcode"
+OUT_DRILL_FILE = "4LDR_Board_drill.gcode"
+OUT_EDGE_FILE = "4LDR_Board_edge.gcode"

 INI_X=0.0
 INI_Y=0.0
@ -27,12 +27,12 @@ OUT_INCH_FLAG=0
 MCODE_FLAG=0
 XY_SPEED=200
 Z_SPEED=60
-LEFT_X=5.0
-LOWER_Y=5.0
+LEFT_X=90.0
+LOWER_Y=35.0
 DRILL_SPEED=40
 DRILL_DEPTH=-2
 CUT_DEPTH=-0.04
-TOOL_D=0.4
+TOOL_D=0.2
 TOOL_2PASS_D=0.68
 TOOL_3PASS_D=1
 DRILL_D=0.1
@ -41,11 +41,11 @@ DRILL_UNIT=0.00254
 EDGE_UNIT=0.00254
 EDGE_TOOL_D=2.4
 EDGE_DEPTH=-1.7
-EDGE_SPEED=30
-EDGE_Z_SPEED=20
+EDGE_SPEED=20
+EDGE_Z_SPEED=10
 MERGE_DRILL_DATA=0
 Z_STEP_DRILL=-0.1
-Z_STEP_EDGE=-0.425
+Z_STEP_EDGE=-1.7
 GERBER_COLOR=BLACK
 DRILL_COLOR=BLUE
 EDGE_COLOR=GREEN YELLOW
--- a/Software/Z_probing_data.p
+++ b/Software/Z_probing_data.p
--- a/Software/configuration.py
+++ b/Software/configuration.py
@ -1,11 +1,11 @@
 # Begin configuration
 BAUDRATE = 115200
 DEVICE = "/dev/ttyUSB0"
-Emulate = True # Won't connect to the machine, will emulate the commands!
+Emulate = False # Won't connect to the machine, will emulate the commands!

 # For GenerateGcode and Send
 filePath = "./GcodeGenerators/pyGerber2Gcode_CUI/out/"
-fileName = "GNBoard"
+fileName = "4LDR_Board"
 # Note: Don't forget to edit ./GcodeGenerators/pyGerber2Gcode_CUI/pygerber2gcode_cui_MOD.conf to match the name and board files

 # For Zprobe
@ -17,8 +17,8 @@ F_fastMove = 70000 # mm/s
 F_slowMove = 20000 # mm/s
 initial_Z_lowering_distance = -5 # Warning: Do not lower too much or you will potentially cause damage!

-N_copies_X = 2 # Panelizing options!
-N_copies_Y = 2
+N_copies_X = 1 # Panelizing options!
+N_copies_Y = 1
 margin_copies_X = 5 # mm
 margin_copies_Y = 5 # mm

@ -31,7 +31,7 @@ showDrill=0
 showEdge=0 # Caution, buggy!

 Zlift_milling = 1.0 # mm
-Z_global_offset = 0 #-0.018 go deeper!
+Z_global_offset = -0.02 #-0.018 go deeper!

 maxDistance = 1**2 # [mm^2] 2mm (longer moves will be split to regulate Z)
 minDistance = 0.001**2 # [mm^2] 0.001mm is the smallest distance that will be sent