1
0
mirror of https://github.com/nophead/Mendel90.git synced 2025-08-29 16:00:35 +02:00

Fixed missing cross hairs on sheet drawing of RPi mounting holes on Huxley.

Sheets.py can now do specified sheet.
This commit is contained in:
Chris Palmer
2016-02-20 00:05:03 +00:00
parent 368d34815e
commit 47941ce4b1
14 changed files with 62186 additions and 60858 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -146,50 +146,42 @@
<text x="8mm" y="96mm" font-size="24"> <text x="8mm" y="96mm" font-size="24">
3.3 3.3
</text> </text>
<line x1="19.055800mm" y1="101.010000mm" x2="19.055800mm" y2="101.010000mm" />
<line x1="19.055800mm" y1="101.010000mm" x2="18.328600mm" y2="99.500000mm" />
<line x1="18.328600mm" y1="99.500000mm" x2="19.055800mm" y2="97.990000mm" />
<line x1="19.055800mm" y1="97.990000mm" x2="20.689800mm" y2="97.617100mm" />
<line x1="20.689800mm" y1="97.617100mm" x2="22.000100mm" y2="98.662000mm" />
<line x1="22.000100mm" y1="98.662000mm" x2="22.000100mm" y2="100.338000mm" />
<line x1="22.000100mm" y1="100.338000mm" x2="20.689800mm" y2="101.383000mm" />
<line x1="20.689800mm" y1="101.383000mm" x2="19.055800mm" y2="101.010000mm" />
<line x1="19.055800mm" y1="27.010000mm" x2="19.055800mm" y2="27.010000mm" />
<line x1="19.055800mm" y1="27.010000mm" x2="18.328600mm" y2="25.500000mm" />
<line x1="18.328600mm" y1="25.500000mm" x2="19.055800mm" y2="23.990000mm" />
<line x1="19.055800mm" y1="23.990000mm" x2="20.689800mm" y2="23.617100mm" />
<line x1="20.689800mm" y1="23.617100mm" x2="22.000100mm" y2="24.662000mm" />
<line x1="22.000100mm" y1="24.662000mm" x2="22.000100mm" y2="26.338000mm" />
<line x1="22.000100mm" y1="26.338000mm" x2="20.689800mm" y2="27.382900mm" />
<line x1="20.689800mm" y1="27.382900mm" x2="19.055800mm" y2="27.010000mm" />
<circle cx="20.200002mm" cy="6.650001mm" r="1.650004mm" fill="none"/> <circle cx="20.200002mm" cy="6.650001mm" r="1.650004mm" fill="none"/>
<line x1="23.500010mm" y1="6.650001mm" x2="16.899995mm" y2="6.650001mm" /> <line x1="23.500010mm" y1="6.650001mm" x2="16.899995mm" y2="6.650001mm" />
<line x1="20.200002mm" y1="3.349993mm" x2="20.200002mm" y2="9.950008mm" /> <line x1="20.200002mm" y1="3.349993mm" x2="20.200002mm" y2="9.950008mm" />
<text x="21mm" y="4mm" font-size="24"> <text x="21mm" y="4mm" font-size="24">
3.3 3.3
</text> </text>
<circle cx="20.259895mm" cy="99.499912mm" r="1.649917mm" fill="none"/>
<line x1="23.559728mm" y1="99.499912mm" x2="16.960062mm" y2="99.499912mm" />
<line x1="20.259895mm" y1="96.200079mm" x2="20.259895mm" y2="102.799746mm" />
<text x="21mm" y="97mm" font-size="24">
3.3
</text>
<circle cx="20.259995mm" cy="25.500005mm" r="1.649985mm" fill="none"/>
<line x1="23.559964mm" y1="25.500005mm" x2="16.960025mm" y2="25.500005mm" />
<line x1="20.259995mm" y1="22.200036mm" x2="20.259995mm" y2="28.799974mm" />
<text x="21mm" y="23mm" font-size="24">
3.3
</text>
<circle cx="37.420002mm" cy="6.650001mm" r="1.650004mm" fill="none"/> <circle cx="37.420002mm" cy="6.650001mm" r="1.650004mm" fill="none"/>
<line x1="40.720010mm" y1="6.650001mm" x2="34.119995mm" y2="6.650001mm" /> <line x1="40.720010mm" y1="6.650001mm" x2="34.119995mm" y2="6.650001mm" />
<line x1="37.420002mm" y1="3.349993mm" x2="37.420002mm" y2="9.950008mm" /> <line x1="37.420002mm" y1="3.349993mm" x2="37.420002mm" y2="9.950008mm" />
<text x="39mm" y="4mm" font-size="24"> <text x="39mm" y="4mm" font-size="24">
3.3 3.3
</text> </text>
<line x1="64.055800mm" y1="96.010000mm" x2="64.055800mm" y2="96.010000mm" /> <circle cx="65.259995mm" cy="94.500005mm" r="1.649985mm" fill="none"/>
<line x1="64.055800mm" y1="96.010000mm" x2="63.328600mm" y2="94.500000mm" /> <line x1="68.559964mm" y1="94.500005mm" x2="61.960025mm" y2="94.500005mm" />
<line x1="63.328600mm" y1="94.500000mm" x2="64.055800mm" y2="92.990000mm" /> <line x1="65.259995mm" y1="91.200036mm" x2="65.259995mm" y2="97.799974mm" />
<line x1="64.055800mm" y1="92.990000mm" x2="65.689800mm" y2="92.617100mm" /> <text x="66mm" y="92mm" font-size="24">
<line x1="65.689800mm" y1="92.617100mm" x2="67.000100mm" y2="93.662000mm" /> 3.3
<line x1="67.000100mm" y1="93.662000mm" x2="67.000100mm" y2="95.338000mm" /> </text>
<line x1="67.000100mm" y1="95.338000mm" x2="65.689800mm" y2="96.382900mm" /> <circle cx="65.259995mm" cy="25.500005mm" r="1.649985mm" fill="none"/>
<line x1="65.689800mm" y1="96.382900mm" x2="64.055800mm" y2="96.010000mm" /> <line x1="68.559964mm" y1="25.500005mm" x2="61.960025mm" y2="25.500005mm" />
<line x1="64.055800mm" y1="27.010000mm" x2="64.055800mm" y2="27.010000mm" /> <line x1="65.259995mm" y1="22.200036mm" x2="65.259995mm" y2="28.799974mm" />
<line x1="64.055800mm" y1="27.010000mm" x2="63.328600mm" y2="25.500000mm" /> <text x="66mm" y="23mm" font-size="24">
<line x1="63.328600mm" y1="25.500000mm" x2="64.055800mm" y2="23.990000mm" /> 3.3
<line x1="64.055800mm" y1="23.990000mm" x2="65.689800mm" y2="23.617100mm" /> </text>
<line x1="65.689800mm" y1="23.617100mm" x2="67.000100mm" y2="24.662000mm" />
<line x1="67.000100mm" y1="24.662000mm" x2="67.000100mm" y2="26.338000mm" />
<line x1="67.000100mm" y1="26.338000mm" x2="65.689800mm" y2="27.382900mm" />
<line x1="65.689800mm" y1="27.382900mm" x2="64.055800mm" y2="27.010000mm" />
<circle cx="92.820034mm" cy="81.894976mm" r="1.649997mm" fill="none"/> <circle cx="92.820034mm" cy="81.894976mm" r="1.649997mm" fill="none"/>
<line x1="96.120028mm" y1="81.894976mm" x2="89.520040mm" y2="81.894976mm" /> <line x1="96.120028mm" y1="81.894976mm" x2="89.520040mm" y2="81.894976mm" />
<line x1="92.820034mm" y1="78.594982mm" x2="92.820034mm" y2="85.194970mm" /> <line x1="92.820034mm" y1="78.594982mm" x2="92.820034mm" y2="85.194970mm" />

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -289,22 +289,18 @@
<text x="298mm" y="130mm" font-size="24"> <text x="298mm" y="130mm" font-size="24">
3.3 3.3
</text> </text>
<line x1="20.689800mm" y1="153.262900mm" x2="20.689800mm" y2="153.262900mm" /> <circle cx="20.259988mm" cy="151.380003mm" r="1.650009mm" fill="none"/>
<line x1="20.689800mm" y1="153.262900mm" x2="19.055800mm" y2="152.890000mm" /> <line x1="23.560007mm" y1="151.380003mm" x2="16.959970mm" y2="151.380003mm" />
<line x1="19.055800mm" y1="152.890000mm" x2="18.328600mm" y2="151.380000mm" /> <line x1="20.259988mm" y1="148.079984mm" x2="20.259988mm" y2="154.680022mm" />
<line x1="18.328600mm" y1="151.380000mm" x2="19.055800mm" y2="149.870000mm" /> <text x="21mm" y="149mm" font-size="24">
<line x1="19.055800mm" y1="149.870000mm" x2="20.689800mm" y2="149.497100mm" /> 3.3
<line x1="20.689800mm" y1="149.497100mm" x2="22.000100mm" y2="150.542000mm" /> </text>
<line x1="22.000100mm" y1="150.542000mm" x2="22.000100mm" y2="152.218000mm" /> <circle cx="65.259988mm" cy="151.380003mm" r="1.650009mm" fill="none"/>
<line x1="22.000100mm" y1="152.218000mm" x2="20.689800mm" y2="153.262900mm" /> <line x1="68.560007mm" y1="151.380003mm" x2="61.959970mm" y2="151.380003mm" />
<line x1="65.689800mm" y1="153.262900mm" x2="65.689800mm" y2="153.262900mm" /> <line x1="65.259988mm" y1="148.079984mm" x2="65.259988mm" y2="154.680022mm" />
<line x1="65.689800mm" y1="153.262900mm" x2="64.055800mm" y2="152.890000mm" /> <text x="66mm" y="149mm" font-size="24">
<line x1="64.055800mm" y1="152.890000mm" x2="63.328600mm" y2="151.380000mm" /> 3.3
<line x1="63.328600mm" y1="151.380000mm" x2="64.055800mm" y2="149.870000mm" /> </text>
<line x1="64.055800mm" y1="149.870000mm" x2="65.689800mm" y2="149.497100mm" />
<line x1="65.689800mm" y1="149.497100mm" x2="67.000100mm" y2="150.542000mm" />
<line x1="67.000100mm" y1="150.542000mm" x2="67.000100mm" y2="152.218000mm" />
<line x1="67.000100mm" y1="152.218000mm" x2="65.689800mm" y2="153.262900mm" />
<circle cx="209.922343mm" cy="158.179977mm" r="1.650039mm" fill="none"/> <circle cx="209.922343mm" cy="158.179977mm" r="1.650039mm" fill="none"/>
<line x1="213.222421mm" y1="158.179977mm" x2="206.622264mm" y2="158.179977mm" /> <line x1="213.222421mm" y1="158.179977mm" x2="206.622264mm" y2="158.179977mm" />
<line x1="209.922343mm" y1="154.879898mm" x2="209.922343mm" y2="161.480056mm" /> <line x1="209.922343mm" y1="154.879898mm" x2="209.922343mm" y2="161.480056mm" />
@@ -335,28 +331,24 @@
<text x="295mm" y="206mm" font-size="24"> <text x="295mm" y="206mm" font-size="24">
3.3 3.3
</text> </text>
<line x1="65.689800mm" y1="222.263000mm" x2="65.689800mm" y2="222.263000mm" /> <circle cx="65.260008mm" cy="220.379738mm" r="1.649877mm" fill="none"/>
<line x1="65.689800mm" y1="222.263000mm" x2="64.055800mm" y2="221.890000mm" /> <line x1="68.559761mm" y1="220.379738mm" x2="61.960255mm" y2="220.379738mm" />
<line x1="64.055800mm" y1="221.890000mm" x2="63.328600mm" y2="220.380000mm" /> <line x1="65.260008mm" y1="217.079985mm" x2="65.260008mm" y2="223.679491mm" />
<line x1="63.328600mm" y1="220.380000mm" x2="64.055800mm" y2="218.870000mm" /> <text x="66mm" y="218mm" font-size="24">
<line x1="64.055800mm" y1="218.870000mm" x2="65.689800mm" y2="218.497100mm" /> 3.3
<line x1="65.689800mm" y1="218.497100mm" x2="67.000100mm" y2="219.542000mm" /> </text>
<line x1="67.000100mm" y1="219.542000mm" x2="67.000100mm" y2="221.218000mm" />
<line x1="67.000100mm" y1="221.218000mm" x2="65.689800mm" y2="222.263000mm" />
<circle cx="6.650067mm" cy="223.640195mm" r="1.650219mm" fill="none"/> <circle cx="6.650067mm" cy="223.640195mm" r="1.650219mm" fill="none"/>
<line x1="9.950504mm" y1="223.640195mm" x2="3.349629mm" y2="223.640195mm" /> <line x1="9.950504mm" y1="223.640195mm" x2="3.349629mm" y2="223.640195mm" />
<line x1="6.650067mm" y1="220.339757mm" x2="6.650067mm" y2="226.940632mm" /> <line x1="6.650067mm" y1="220.339757mm" x2="6.650067mm" y2="226.940632mm" />
<text x="8mm" y="221mm" font-size="24"> <text x="8mm" y="221mm" font-size="24">
3.3 3.3
</text> </text>
<line x1="20.689800mm" y1="227.263000mm" x2="20.689800mm" y2="227.263000mm" /> <circle cx="20.260189mm" cy="225.379831mm" r="1.649797mm" fill="none"/>
<line x1="20.689800mm" y1="227.263000mm" x2="19.055800mm" y2="226.890000mm" /> <line x1="23.559784mm" y1="225.379831mm" x2="16.960595mm" y2="225.379831mm" />
<line x1="19.055800mm" y1="226.890000mm" x2="18.328600mm" y2="225.380000mm" /> <line x1="20.260189mm" y1="222.080237mm" x2="20.260189mm" y2="228.679425mm" />
<line x1="18.328600mm" y1="225.380000mm" x2="19.055800mm" y2="223.870000mm" /> <text x="21mm" y="223mm" font-size="24">
<line x1="19.055800mm" y1="223.870000mm" x2="20.689800mm" y2="223.497000mm" /> 3.3
<line x1="20.689800mm" y1="223.497000mm" x2="22.000100mm" y2="224.542000mm" /> </text>
<line x1="22.000100mm" y1="224.542000mm" x2="22.000100mm" y2="226.218000mm" />
<line x1="22.000100mm" y1="226.218000mm" x2="20.689800mm" y2="227.263000mm" />
<circle cx="6.650067mm" cy="240.860195mm" r="1.650219mm" fill="none"/> <circle cx="6.650067mm" cy="240.860195mm" r="1.650219mm" fill="none"/>
<line x1="9.950504mm" y1="240.860195mm" x2="3.349629mm" y2="240.860195mm" /> <line x1="9.950504mm" y1="240.860195mm" x2="3.349629mm" y2="240.860195mm" />
<line x1="6.650067mm" y1="237.559757mm" x2="6.650067mm" y2="244.160632mm" /> <line x1="6.650067mm" y1="237.559757mm" x2="6.650067mm" y2="244.160632mm" />

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 23 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -750,7 +750,7 @@ module frame_stay(left) {
if(!pi_on_psu()) if(!pi_on_psu())
rpi_position() rpi_position()
rpi_bracket_holes() rpi_bracket_holes()
poly_cylinder(r = M3_clearance_radius, h = 100, center = true); cylinder(r = M3_clearance_radius, h = 100, center = true);
// //
// Wiring holes // Wiring holes

View File

@@ -11,7 +11,7 @@ from time import *
source_dir = "scad" source_dir = "scad"
def sheets(machine): def sheets(machine, parts):
# #
# Make the target directory # Make the target directory
# #
@@ -38,9 +38,9 @@ def sheets(machine):
# #
for line in open(source_dir + "/" + filename, "r").readlines(): for line in open(source_dir + "/" + filename, "r").readlines():
words = line.split() words = line.split()
if(len(words) and words[0] == "module"): if len(words) and words[0] == "module":
module = words[1].split('(')[0] module = words[1].split('(')[0]
if module[-4:] == "_dxf": if module[-4:] == "_dxf" and (not parts or (module[:-4] + ".dxf") in parts):
# #
# make a file to use the module # make a file to use the module
# #
@@ -67,7 +67,7 @@ def sheets(machine):
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) > 1: if len(sys.argv) > 1:
sheets(sys.argv[1]) sheets(sys.argv[1], sys.argv[2:])
else: else:
print("usage: sheets dibond|mendel|sturdy|huxley|your_machine") print("usage: sheets dibond|mendel|sturdy|huxley|your_machine [part.dxf ...]")
sys.exit(1) sys.exit(1)