Fixed fixing block bug introduced when assign was replaced by assigment.
Fixed race condition in bom.py on Win7 with SSD.
2
bom.py
@@ -6,6 +6,7 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
import shutil
|
import shutil
|
||||||
import openscad
|
import openscad
|
||||||
|
from time import *
|
||||||
|
|
||||||
source_dir = "scad"
|
source_dir = "scad"
|
||||||
|
|
||||||
@@ -114,6 +115,7 @@ def boms(machine, assembly = None):
|
|||||||
assembly = "machine_assembly"
|
assembly = "machine_assembly"
|
||||||
if os.path.isdir(bom_dir):
|
if os.path.isdir(bom_dir):
|
||||||
shutil.rmtree(bom_dir)
|
shutil.rmtree(bom_dir)
|
||||||
|
sleep(0.1)
|
||||||
os.makedirs(bom_dir)
|
os.makedirs(bom_dir)
|
||||||
|
|
||||||
f = open("scad/conf/machine.scad","wt")
|
f = open("scad/conf/machine.scad","wt")
|
||||||
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
Before Width: | Height: | Size: 497 KiB After Width: | Height: | Size: 497 KiB |
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Before Width: | Height: | Size: 208 KiB After Width: | Height: | Size: 208 KiB |
Before Width: | Height: | Size: 261 KiB After Width: | Height: | Size: 261 KiB |
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 114 KiB |
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 156 KiB |
@@ -492,8 +492,7 @@ module fixing_blocks(holes = false) {
|
|||||||
t = sheet_thickness(frame);
|
t = sheet_thickness(frame);
|
||||||
right_inside = right_stay_x - sheet_thickness(frame) / 2 - (base_width / 2 - right_w) > w + 2 * base_clearance;
|
right_inside = right_stay_x - sheet_thickness(frame) / 2 - (base_width / 2 - right_w) > w + 2 * base_clearance;
|
||||||
|
|
||||||
{ // all screws into frame
|
for($upper = true, $rear = false) { // all screws into frame
|
||||||
$upper = true;
|
|
||||||
translate([left_stay_x + t / 2, gantry_Y + t, stay_height - base_clearance - h - w / 2]) // top
|
translate([left_stay_x + t / 2, gantry_Y + t, stay_height - base_clearance - h - w / 2]) // top
|
||||||
rotate([0,-90,-90])
|
rotate([0,-90,-90])
|
||||||
children();
|
children();
|
||||||
@@ -510,10 +509,8 @@ module fixing_blocks(holes = false) {
|
|||||||
rotate([0,90, 90])
|
rotate([0,90, 90])
|
||||||
children();
|
children();
|
||||||
}
|
}
|
||||||
{ // one screw in the base
|
for($upper = false) { // one screw in the base
|
||||||
$upper = true;
|
for($rear = true) {
|
||||||
{
|
|
||||||
$rear = true;
|
|
||||||
translate([left_stay_x + t / 2, base_depth / 2 - base_clearance - w / 2, 0]) // back
|
translate([left_stay_x + t / 2, base_depth / 2 - base_clearance - w / 2, 0]) // back
|
||||||
rotate([0, 0,-90])
|
rotate([0, 0,-90])
|
||||||
children();
|
children();
|
||||||
@@ -523,8 +520,7 @@ module fixing_blocks(holes = false) {
|
|||||||
children();
|
children();
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
for($rear = false) {
|
||||||
$rear = false;
|
|
||||||
for(x = [-base_width/2 + base_clearance + w /2,
|
for(x = [-base_width/2 + base_clearance + w /2,
|
||||||
base_width/2 - base_clearance - w /2,
|
base_width/2 - base_clearance - w /2,
|
||||||
-base_width/2 - base_clearance - w /2 + left_w,
|
-base_width/2 - base_clearance - w /2 + left_w,
|
||||||
|