From 7d74d262d7aa018e1d34e1d5f48ec81e36d1fb3f Mon Sep 17 00:00:00 2001
From: Thomas Kolb <cfr34k-git@tkolb.de>
Date: Mon, 18 Nov 2019 22:51:52 +0100
Subject: [PATCH] Changed wood thickness; enlarged bottom nut hole; finer
 circle resolution

---
 Lampe.scad           |  2 +-
 Lampe_2DFormen.scad  |  4 +++-
 Lampe_2DPanel.scad   | 10 ++++++----
 Lampe_Parameter.scad | 13 +++++++------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Lampe.scad b/Lampe.scad
index 4c957d9..4eed4e1 100644
--- a/Lampe.scad
+++ b/Lampe.scad
@@ -25,7 +25,7 @@ for(angle = [0:45:7*45]) {
 
 translate([0,0,-inner_height/2-bottom_box_height-2.5*wood_thickness]) linear_extrude(wood_thickness, center=true) base_plate();
 
-color("green")
+%color("green", 0.5)
 for(angle = [0:45:7*45]) {
 	rotate([0, 0, angle])
 		translate([0, bottom_box_wall_offset, -inner_height/2-bottom_box_height/2-2*wood_thickness]) rotate([90, 0, 0]) linear_extrude(wood_thickness, center=true) box_wall();
diff --git a/Lampe_2DFormen.scad b/Lampe_2DFormen.scad
index 3b6be01..453d376 100644
--- a/Lampe_2DFormen.scad
+++ b/Lampe_2DFormen.scad
@@ -52,7 +52,9 @@ module bottom_inner_plate() {
 
 module bottom_outer_plate() {
 	difference() {
-		top_outer_plate();
+		//top_outer_plate();
+		circle(d=lamp_dia);
+		circle(r=nut_inset_radius);
 		cable_holes();
 		box_wall_tooth_holes();
 	}
diff --git a/Lampe_2DPanel.scad b/Lampe_2DPanel.scad
index 5bcbc8e..6b2f542 100644
--- a/Lampe_2DPanel.scad
+++ b/Lampe_2DPanel.scad
@@ -3,7 +3,7 @@ include <Lampe_2DFormen.scad>;
 
 spacing = 2;
 
-%color([0.0, 0.0, 0.8], 0.5) translate([0, 0, -1]) square([600, 300]);
+%color([0.0, 0.0, 0.8], 0.5) translate([0, 0, -1]) square([600, 400]);
 
 base_offset = [60, 60];
 second_offset = [lamp_dia/2, -lamp_dia/6+4*spacing];
@@ -14,14 +14,14 @@ translate(base_offset + [2*(lamp_dia+spacing), 0]) bottom_inner_plate();
 translate(base_offset + second_offset + [0, lamp_dia+spacing]) bottom_outer_plate();
 translate(base_offset + second_offset + [1*(lamp_dia+spacing), lamp_dia+spacing]) base_plate();
 
-ledstrip_holder_base_pos = [350, -50] + [
+ledstrip_holder_base_pos = [250, 0] + [
 	inner_height/2 + tooth_height - lamp_dia/2,
 	1.5*lamp_dia + spacing - holder_width/2];
 
 
 for(i = [1:8]) {
-	translate(ledstrip_holder_base_pos + [0, i*(spacing + holder_width)])
-		rotate(90) ledstrip_holder();
+	translate(ledstrip_holder_base_pos + [i*(spacing + holder_width), 0])
+		rotate(0) ledstrip_holder();
 }
 
 translate([310, 200])
@@ -36,6 +36,7 @@ for(x = [1:1]) {
 translate([30, 145])
 	rotate(0) box_wall_with_holes();
 
+/*
 translate([-20, 190])
 for(x = [0:3]) {
 	for(y = [0:1]) {
@@ -43,3 +44,4 @@ for(x = [0:3]) {
 			foot_piece();
 	}
 }
+*/
diff --git a/Lampe_Parameter.scad b/Lampe_Parameter.scad
index 8b58594..d8a3318 100644
--- a/Lampe_Parameter.scad
+++ b/Lampe_Parameter.scad
@@ -1,19 +1,20 @@
-wood_thickness = 3;
+wood_thickness = 4;
 
 acryl_thickness=5;
-acryl_tolerance = 0.5;
+acryl_tolerance = 1.00;
 acryl_outer_dia = 100;
 acryl_inner_dia = 94;
 lamp_dia = acryl_outer_dia + 10;
-screw_dia = 4.5;
+screw_dia = 4.4;
 
 nut_outer_radius = 7/2 * 2 / sqrt(3) + 0.2;
+nut_inset_radius = nut_outer_radius + 4;
 
 acryl_height = 300;
 inner_height = acryl_height - 10;
 
 bottom_box_height = 50;
-bottom_box_wall_width = 39.2;
+bottom_box_wall_width = 38.7;
 bottom_box_wall_offset = 49;
 
 tooth_height = wood_thickness;
@@ -24,7 +25,7 @@ tooth_hole_tolerance = 0.2;
 
 holder_width = 20;
 
-holder_offset = holder_width+wood_thickness*2;
+holder_offset = holder_width+wood_thickness*1.7;
 
 cable_hole_spacing = tooth_width;
 
@@ -35,5 +36,5 @@ foot_angle = 22.5;
 dc_conn_dia = 8;
 dc_conn_offset = bottom_box_height/2 - 10;
 
-$fn=50;
+$fn=200;