Merge branch 'nerdyjan-master'

libtest.scad

@@ -411,10 +411,12 @@ iecs_y = d_connectors_y + 70;
 modules_y = iecs_y + 60;
 ssrs_y = modules_y + 80;
 blowers_y = ssrs_y + 60;
-hot_ends_y = blowers_y + 100;
-batteries_y = hot_ends_y + 55;
+hot_ends_y = blowers_y + 90;
+batteries_y = hot_ends_y + 65;
 panel_meters_y = batteries_y + 70;
 extrusions_y = panel_meters_y + 130;
+box_sections_y = extrusions_y + 70;
+
 
 translate([x3, veroboard_y])
     veroboard_test();
@@ -458,7 +460,7 @@ translate([x3, ssrs_y]) {
 translate([x3, blowers_y])
     blowers();
 
-translate([x3, batteries_y])
+translate([x2, batteries_y])
     batteries();
 
 translate([x3 + 10, hot_ends_y])
@@ -470,6 +472,9 @@ translate([x2, panel_meters_y])
 translate([x2, extrusions_y])
     extrusions();
 
+translate([x2, box_sections_y])
+    box_sections();
+
 translate([370, transformers_y])
     transformers();
 
@@ -486,7 +491,6 @@ extrusion_brackets_y = rails_y + 250;
 sk_brackets_y = extrusion_brackets_y + 80;
 kp_pillow_blocks_y = sk_brackets_y + 60;
 bearing_blocks_y = kp_pillow_blocks_y + 60;
-box_sections_y = batteries_y;
 BLDC_y = bearing_blocks_y + 180;
 pot_y = bearing_blocks_y;
 cable_strip_y = sheets_y + 30;
@@ -538,8 +542,5 @@ translate([x4, BLDC_y])
 translate([x4, pot_y])
     potentiometers();
 
-translate([x2, box_sections_y])
-    box_sections();
-
 translate([x6, 125])
     light_strips();

readme.md

@@ -275,6 +275,7 @@ exposing enough information to make a battery box.
 | `battery_neg_dia(type)` | Negative terminal diameter |
 | `battery_pos_dia(type)` | Positive terminal diameter |
 | `battery_pos_height(type)` | Positive terminal height above the casing |
+| `battery_type(type)` | Battery type |
 | `battery_usb_offset(type)` | USB connector offset from the top |
 | `contact_height(type)` | Height of the flat part |
 | `contact_neg(type)` | Negative spring height above the plate when compressed and the spring type |
@@ -296,8 +297,8 @@ exposing enough information to make a battery box.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   7 | `battery_contact(bcontact, false)` |  Battery negative contact |
-|   7 | `battery_contact(bcontact, true)` |  Battery positive contact |
+|  10 | `battery_contact(bcontact, false)` |  Battery negative contact |
+|  10 | `battery_contact(bcontact, true)` |  Battery positive contact |
 |   1 | `battery(A23CELL)` |  Cell A23 12v |
 |   1 | `battery(AACELL)` |  Cell AA |
 |   1 | `battery(AAACELL)` |  Cell AAA |
@@ -305,6 +306,9 @@ exposing enough information to make a battery box.
 |   1 | `battery(DCELL)` |  Cell D |
 |   1 | `battery(LUMINTOP)` |  Cell LUMINTOP 18650 LION with charger |
 |   1 | `battery(S25R18650)` |  Cell Samsung 25R 18650 LION |
+|   1 | `battery(L16340)` |  Li-Ion/LiFePo4 16340 3.2v |
+|   1 | `battery(L32700)` |  Li-Ion/LiFePo4 32700 3.2v |
+|   1 | `battery(L4680)` |  Li-Ion/LiFePo4 4680 3.2v |
 
 
 <a href="#top">Top</a>

vitamins/batteries.scad

@@ -45,7 +45,10 @@ AAACELL   = ["AAACELL",   "Cell AAA",                                 44.5, 10.5
 CCELL     = ["CCELL",     "Cell C",                                   50,   26.2, 20, 7.5, 1.5, "brown",          [],                      0, bcontact];
 DCELL     = ["DCELL",     "Cell D",                                   61.5, 34.2, 22, 8.2, 2.4, "brown",          [],                      0, bcontact];
 A23CELL   = ["A23CELL",   "Cell A23 12v",                             28.5, 10.3, 5.2,5.2, 1.0, "silver",         [],                      0, bcontact];
+LI4680    = ["L4680",     "Li-Ion/LiFePo4 4680 3.2v",                 80.2, 46.2, 35,35, 0,     "green",          [],                      0, bcontact];
+LI32700   = ["L32700",    "Li-Ion/LiFePo4 32700 3.2v",                70.2, 32.4, 25,13, 0,     "blue",           [],                      0, bcontact];
+LI16340   = ["L16340",    "Li-Ion/LiFePo4 16340 3.2v",                35.2, 16.4, 14,6, 1.0,    "blue",           [],                      0, bcontact];
 
-batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650, A23CELL];
+batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650, A23CELL, LI4680, LI32700, LI16340];
 
 use <battery.scad>

vitamins/battery.scad

@@ -28,7 +28,9 @@
 include <../utils/core/core.scad>
 use <spring.scad>
 use <../utils/rounded_cylinder.scad>
+use <../utils/pcb_utils.scad>
 
+function battery_type(type)          = type[0]; //! Battery type
 function battery_length(type)        = type[2]; //! Total length including terminals
 function battery_diameter(type)      = type[3]; //! Casing diameter
 function battery_neg_dia(type)       = type[4]; //! Negative terminal diameter
@@ -109,6 +111,13 @@ module battery(type) { //! Draw a battery
     battery_led_positions(type)
         color(["red","green","blue"][$i])
             cylinder(d = 1.5, h = eps);
+
+    color(battery_colour(type) == "white" ? "black" : "white")
+        rotate([0, 0, 90])
+             cylindrical_wrap(battery_diameter(type)/2)
+                resize([0, battery_diameter(type)], auto = true)
+                    rotate(90)
+                        text(battery_type(type), halign = "center", valign = "center");
 }
 
 function contact_width(type)      = type[1]; //! Width of the flat part