From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Thu, 4 Dec 2014 12:01:31 +0000 (+0100)
Subject: Merge branch 'master' of /home/kas/html/git/heater
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=heater.git;a=commitdiff_plain;h=3019ff6b696fef6dcad9ad3529b0598074202f94;hp=--cc

Merge branch 'master' of /home/kas/html/git/heater
---

3019ff6b696fef6dcad9ad3529b0598074202f94
diff --cc case.scad
index bc4fd31,43583c4..14efba2
--- a/case.scad
+++ b/case.scad
@@@ -230,26 -202,7 +202,17 @@@ module case() 
  		for (x=[-1, 1]) scale([x, 1, 1])
  		translate([sw_xoff + sw_diam/2 + wall, batt_diam/2-pcb_width/2-wall/2, -batt_diam/2-pcb_thick-pcb_comp_h-pcb_comp_h2-wall-eps])
  			cube([plus_width, wall, wall/2]);
 +		// rounded top
 +		for (x=[-1, 1]) scale([x, 1, 1])
 +		translate([batt_len/2 + wall + cable_sep, -infty/2, body_top_h - 2*wall])
 +		rotate([-90, 0, 0])
 +			scale([1, -2, 1])
 +			difference() {
 +				cube([wall+eps, wall+eps, infty]);
 +				translate([0, 0, -eps])
 +				cylinder(r=wall, h=infty+2*eps);
 +			}
  	};
- 	// clip barrier
- 	for (x = [-1, 1]) scale([x, 1, 1]) hull () {
- 		translate([batt_len/2+wall+cable_sep-eps, batt_diam/2-pcb_width+wall/2+lid_sep,
- 			-batt_diam/2-pcb_thick-pcb_comp_h + wall + lid_sep])
- 			cube([wall+eps, pcb_width-2*wall-2*lid_sep, wall]);
- 		translate([batt_len/2+wall+cable_sep-eps, batt_diam/2-pcb_width+3*wall/2+lid_sep,
- 			-batt_diam/2-pcb_thick-pcb_comp_h + 3*wall + lid_sep])
- 			cube([eps, pcb_width-4*wall-2*lid_sep, eps]);
- 	};
  };
  
  module lid_body() {