1
0
mirror of https://github.com/nophead/Mendel90.git synced 2025-03-14 15:50:04 +01:00

Fixed fixing block bug introduced when assign was replaced by assigment.

Fixed race condition in bom.py on Win7 with SSD.
This commit is contained in:
Chris Palmer 2016-01-10 15:01:22 +00:00
parent dc5c5af3b8
commit 225b94f1b5
11 changed files with 6 additions and 8 deletions

2
bom.py
View File

@ -6,6 +6,7 @@ import os
import sys
import shutil
import openscad
from time import *
source_dir = "scad"
@ -114,6 +115,7 @@ def boms(machine, assembly = None):
assembly = "machine_assembly"
if os.path.isdir(bom_dir):
shutil.rmtree(bom_dir)
sleep(0.1)
os.makedirs(bom_dir)
f = open("scad/conf/machine.scad","wt")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 497 KiB

After

Width:  |  Height:  |  Size: 497 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 KiB

After

Width:  |  Height:  |  Size: 261 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 156 KiB

View File

@ -492,8 +492,7 @@ module fixing_blocks(holes = false) {
t = sheet_thickness(frame);
right_inside = right_stay_x - sheet_thickness(frame) / 2 - (base_width / 2 - right_w) > w + 2 * base_clearance;
{ // all screws into frame
$upper = true;
for($upper = true, $rear = false) { // all screws into frame
translate([left_stay_x + t / 2, gantry_Y + t, stay_height - base_clearance - h - w / 2]) // top
rotate([0,-90,-90])
children();
@ -510,10 +509,8 @@ module fixing_blocks(holes = false) {
rotate([0,90, 90])
children();
}
{ // one screw in the base
$upper = true;
{
$rear = true;
for($upper = false) { // one screw in the base
for($rear = true) {
translate([left_stay_x + t / 2, base_depth / 2 - base_clearance - w / 2, 0]) // back
rotate([0, 0,-90])
children();
@ -523,8 +520,7 @@ module fixing_blocks(holes = false) {
children();
}
{
$rear = false;
for($rear = false) {
for(x = [-base_width/2 + base_clearance + w /2,
base_width/2 - base_clearance - w /2,
-base_width/2 - base_clearance - w /2 + left_w,