Skip to content

Fix more variable names with digits, add upgrade script #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeroenrnl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix more variable names with digits, add upgrade script #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/EnviroPlus/scad/main.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ assembly("RPI") {
pcb_grid(rpi, 9.5, 0.5, -0.6)
rotate(180)
explode(20)
pin_header(2p54header, 20, 2, right_angle = true);
pin_header(header2p54, 20, 2, right_angle = true);
}

//! 1. Solvent weld or glue the bulkhead into the recess in the bottom of the case.
Expand Down
4 changes: 2 additions & 2 deletions examples/PT_camera/PT_camera.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use <../../vitamins/pcb.scad>
module ptc(ang2) {
rotate([180,0,0])
union(){
geared_stepper(28BYJ_48,ang2);
geared_stepper(step_28BYJ_48,ang2);
rotate([90,0,180-ang2])
translate([9.8,-16.5,1.7])
rotate([0,0,90])
Expand All @@ -15,7 +15,7 @@ module ptc(ang2) {
}

module pt(ang,ang2) {
rotate([180,0,0]) geared_stepper(28BYJ_48,ang);
rotate([180,0,0]) geared_stepper(step_28BYJ_48,ang);
rotate([0,0,ang]) rotate([270,0,0]) translate([0,-29.0,-1.5]) ptc(ang2);
}

Expand Down
44 changes: 44 additions & 0 deletions scripts/update_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/bin/bash

if [ "$1" = "--for-real" ]
then
command='sed -i'
extra=''
elif [ "$1" = "--help" ]
then
echo "Update variable names in your project"
echo "defaults to dry run, use --for-real to run for real"
echo "it is not safe to run twice on the same project. Make backups"
exit
else
command='sed -n '
extra='p'
fi

replacements=(
"s/02352A/disp_02352A/g"
"s/02531A/disp_02531A/g"
"s/10mm_disc/disc_10m/g"
"s/28BYJ_48/step_28BYJ_48/g"
"s/2p54boxhdr/boxhdr2p54/g"
"s/2p54header/header2p54/g"
"s/2p54joiner/joiner2p54/g"
"s/2p54socket/socket2p54/g"
"s/35BYGHJ75/step_35BYGHJ75/g"
"s/5_160430_7/faston_5_160430_7/g"
"s/6p4mm_disc/disc_6p4mm/g"
"s/7_segment_\([^\.]\)/disp_7_segment\1/g"
"s/7_segments\([^\.]\)/disp_7_segments\1/g"
"s/80ST_faceplate/faceplate_80ST/g"
)

find . -name '*.scad' | while read file
do
echo $file
echo "-------------------------------------"
for r in ${replacements[*]}
do
$command "${r}${extra}" $file
done
done

10 changes: 5 additions & 5 deletions tests/7_segments.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ use <../utils/layout.scad>

include <../vitamins/7_segments.scad>

function digits(s) = 7_segment_digits(s) < 2 ? 2 : 1;
function digits(s) = disp_7_segment_digits(s) < 2 ? 2 : 1;

module 7_segments()
layout([for(s = 7_segments) 7_segment_size(s).x * digits(s)], 3) let(s = 7_segments[$i])
7_segment_digits(s, digits(s));
module disp_7_segments()
layout([for(s = disp_7_segments) disp_7_segment_size(s).x * digits(s)], 3) let(s = disp_7_segments[$i])
disp_7_segment_digits(s, digits(s));

if($preview)
7_segments();
disp_7_segments();
22 changes: 11 additions & 11 deletions tests/PCB.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ TMC2130HeatSinkColor = "DeepSkyBlue";
TMC2130 = ["TMC2130", "TMC2130",
20, 14, 1.6, 0, 3, 0, "white", false, [],
[
[ 10, 1, 0, "-2p54header", 8, 1 ,undef, "blue" ],
[ 10, 13, 0, "-2p54header", 8, 1],
[ 10, 1, 0, "-header2p54", 8, 1 ,undef, "blue" ],
[ 10, 13, 0, "-header2p54", 8, 1],
[ 12, 7, 0, "-chip", 6, 4, 1, grey(20) ],
// mock up a heat sink
[ 10, 7, 0, "block", 9, 9, 2, TMC2130HeatSinkColor ],
Expand Down Expand Up @@ -89,13 +89,13 @@ test_pcb = ["test_pcb", "Test PCB",

[ 30, 30, -90, "smd_qfp", QFP50P1200X1200X160_64N, "ATSAM4S4BA"],

[ 45, 35, 0, "2p54header", 4, 1],
[ 60, 35, 0, "2p54header", 5, 1, false, "blue" ],
[ 60, 40, 180, "2p54header", 5, 1, false, undef, true],
[ 80, 33, 0, "2p54boxhdr", 4, 2],
[ 80, 40, 0, "2p54boxhdr", 4, 2, false, true, true],
[ 45, 30, 0, "2p54socket", 4, 1, false, 0, false, "red" ],
[ 60, 30, 0, "2p54socket", 6, 1],
[ 45, 35, 0, "header2p54", 4, 1],
[ 60, 35, 0, "header2p54", 5, 1, false, "blue" ],
[ 60, 40, 180, "header2p54", 5, 1, false, undef, true],
[ 80, 33, 0, "boxhdr2p54", 4, 2],
[ 80, 40, 0, "boxhdr2p54", 4, 2, false, true, true],
[ 45, 30, 0, "socket2p54", 4, 1, false, 0, false, "red" ],
[ 60, 30, 0, "socket2p54", 6, 1],

[ 59, 60, 180, "led", LED3mm, "red"],
[ 66, 60, 180, "led", LED5mm, "orange"],
Expand Down Expand Up @@ -201,8 +201,8 @@ test_pcb = ["test_pcb", "Test PCB",
[ 90, 140, -90, "relay", HF33F, "012-HSL-3F"],


[ 52, 206, 0, "2p54socket", 8, 1 ],
[ 52, 194, 0, "2p54socket", 8, 1, false, 0, false, "red" ],
[ 52, 206, 0, "socket2p54", 8, 1 ],
[ 52, 194, 0, "socket2p54", 8, 1, false, 0, false, "red" ],
[ 55, 220, 0, "standoff", 5, 4.5, 12.5, 2.54],
[ 60, 240, 0, "potentiometer"],
[ 75, 240, 0, "potentiometer", KY_040_encoder, 8],
Expand Down
2 changes: 1 addition & 1 deletion tests/PCB_mount.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PI_IO = ["PI_IO", "PI_IO V2", 35.56, 25.4, 1.6, 0, 0, 0, "green", tru
[[(3.015 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.685) * 25.4, 90, "term35", 2],
[(3.46 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69) * 25.4, 90, "term35", 2],
[(3.91 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69) * 25.4, 90, "term35", 2],
[(3.4 - 2.7) * 25.4, (4.5 - 4.15) * 25.4, 0, "2p54socket", 13, 2],
[(3.4 - 2.7) * 25.4, (4.5 - 4.15) * 25.4, 0, "socket2p54", 13, 2],
], []];

module pcb_mounts()
Expand Down
28 changes: 14 additions & 14 deletions vitamins/7_segment.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ include <../utils/core/core.scad>
use <../utils/pcb_utils.scad>


function 7_segment_size(type) = type[1]; //! Size of the body
function 7_segment_digit_size(type) = type[2]; //! Size of the actual digit and segment width and angle
function 7_segment_pins(type) = type[3]; //! [x, y] array of pins
function 7_segment_pin_pitch(type) = type[4]; //! x and y pin pitches and pin diameter
function disp_7_segment_size(type) = type[1]; //! Size of the body
function disp_7_segment_digit_size(type) = type[2]; //! Size of the actual digit and segment width and angle
function disp_7_segment_pins(type) = type[3]; //! [x, y] array of pins
function disp_7_segment_pin_pitch(type) = type[4]; //! x and y pin pitches and pin diameter

function 7_segment_digits(type) = let(d = 7_segment_digit_size(type)) floor(7_segment_size(type).x / (d.x + d.y * tan(d[3])));
function disp_7_segment_digits(type) = let(d = disp_7_segment_digit_size(type)) floor(disp_7_segment_size(type).x / (d.x + d.y * tan(d[3])));

module 7_segment_digit(type, colour = grey(95), pin_length = 6.4) { //! Draw the specified 7 segment digit
size = 7_segment_size(type);
digit = 7_segment_digit_size(type);
pins = 7_segment_pins(type);
pin_pitch = 7_segment_pin_pitch(type);
module disp_7_segment_digit(type, colour = grey(95), pin_length = 6.4) { //! Draw the specified 7 segment digit
size = disp_7_segment_size(type);
digit = disp_7_segment_digit_size(type);
pins = disp_7_segment_pins(type);
pin_pitch = disp_7_segment_pin_pitch(type);

t = digit[2];
a = digit[3];
digits = 7_segment_digits(type);
digits = disp_7_segment_digits(type);
pitch = size.x / digits;
has_dp = (pins.x * pins.y) > 7 + digits;

Expand Down Expand Up @@ -108,14 +108,14 @@ module 7_segment_digit(type, colour = grey(95), pin_length = 6.4) { //! Draw the
}
}

module 7_segment_digits(type, n, colour = grey(70), pin_length = 6.4, cutout = false) { //! Draw n digits side by side
size = 7_segment_size(type);
module disp_7_segment_digits(type, n, colour = grey(70), pin_length = 6.4, cutout = false) { //! Draw n digits side by side
size = disp_7_segment_size(type);

if(cutout)
linear_extrude(100)
square([n * size.x, size.y], center = true);
else
for(i = [0 : 1 : n - 1])
translate([(i - (n - 1) / 2) * size.x, 0])
7_segment_digit(type, colour, pin_length);
disp_7_segment_digit(type, colour, pin_length);
}
6 changes: 3 additions & 3 deletions vitamins/7_segments.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
//! 7 Segment displays
//

02531A = ["02531A", [15.0, 8, 4.0], [3.5, 6.2, 0.7, 5], [5, 2], [inch(0.1), inch(0.1), 0.45]];
02352A = ["02352A", [15.0, 8, 4.0], [3.5, 6.2, 0.6, 5], [6, 2], [inch(0.1), 5.52, 0.45]];
disp_02531A = ["disp_02531A", [15.0, 8, 4.0], [3.5, 6.2, 0.7, 5], [5, 2], [inch(0.1), inch(0.1), 0.45]];
disp_02352A = ["disp_02352A", [15.0, 8, 4.0], [3.5, 6.2, 0.6, 5], [6, 2], [inch(0.1), 5.52, 0.45]];
WT5011BSR = ["WT5011BSR", [12.7, 19, 8.2], [7.2, 12.7, 1.2, 10], [5, 2], [inch(0.1), inch(0.6), 0.4]];

7_segments = [02531A, 02352A, WT5011BSR];
disp_7_segments = [disp_02531A, disp_02352A, WT5011BSR];

use <7_segment.scad>
2 changes: 1 addition & 1 deletion vitamins/cameras.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ESP32_module = ["", "", 18, 26, 0.8, 0, 0.7, [1.1, 1.1, 0, gold], grey(18), f
ESP32_CAM_pcb = ["", "", 27, 40, 1.7, 2.5, 0, 0, grey(15), false, [],
[
[27 / 2, 26 / 2, 0, "-pcb", 0, ESP32_module],
for(side = [-1, 1]) [side * inch(0.45) + 27 / 2, -(4.2 + inch(.35)), 0, "-2p54joiner", 1, 8],
for(side = [-1, 1]) [side * inch(0.45) + 27 / 2, -(4.2 + inch(.35)), 0, "-joiner2p54", 1, 8],
[ 27 / 2, -8, 90, "uSD", [14.85, 14.65, 1.8]],
[ 27 / 2 + 1, 15, 0, "flat_flex", false],
[ 27 / 2 + inch(0.45), 10.5, 0, "block", 3, 3, 0.8, grey(90)],
Expand Down
22 changes: 11 additions & 11 deletions vitamins/displays.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ HDMI5PCB = pcb("", "", [121.11, 77.93, 1.65], hole_d = 2.2, colour = "mediumblu
[ 47.245,-2.5, 90, "usb_uA"],
[-53.14, -4.4, 90, "hdmi"],
[ 53.7, 40.6, 0, "chip", 14, 14, 1],
[ 59.8, 25.2, 0, "2p54socket", 13, 2, false, 13.71],
[ 59.8, 10.12, 0, "2p54header", 13, 2, true],
[ 59.8, 25.2, 0, "socket2p54", 13, 2, false, 13.71],
[ 59.8, 10.12, 0, "header2p54", 13, 2, true],
]
);

Expand All @@ -41,7 +41,7 @@ HDMI5 = ["HDMI5", "HDMI display 5\"", 121, 76, 2.85, HDMI5PCB,
LCD1602APCB = pcb("", "", [80, 36, 1.65], hole_d = 2.9, land_d = 5, colour = "green",
holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
components = [
[-27.05, - 2.5, 0, "2p54header", 16, 1]
[-27.05, - 2.5, 0, "header2p54", 16, 1]
],
grid = [
52.95 - inch(0.75), 36 - 2.5, 16, 1, silver, inch(0.1), inch(0.1),
Expand All @@ -51,7 +51,7 @@ LCD1602APCB = pcb("", "", [80, 36, 1.65], hole_d = 2.9, land_d = 5, colour = "gr
LCD1602APCBI2C = pcb("", "", [80, 36, 1.65], hole_d = 2.9, land_d = 5, colour = "green",
holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
components = [
[-27.05, - 2.5, 0, "2p54header", 16, 1],
[-27.05, - 2.5, 0, "header2p54", 16, 1],
[ -27.05, -10.0, 0, "pcb", 3, I2C_LCD_Backpack],
],
grid = [
Expand All @@ -78,7 +78,7 @@ LCD1602AI2C = ["LCD1602A", "LCD display 1602A", 71.3, 24.3, 7.0, LCD1602APCBI2C,
LCD2004APCB = pcb("", "", [98, 60, 1.65], hole_d = 2.9, land_d = 5, colour = "green",
holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
components = [
[49+19.05, - 2.5, 0, "2p54header", 16, 1]
[49+19.05, - 2.5, 0, "header2p54", 16, 1]
],
grid = [
49, 60 - 2.5, 16, 1, silver, inch(0.1), inch(0.1),
Expand All @@ -96,7 +96,7 @@ LCD2004A = ["LCD2004A", "LCD display 2004A", 97, 39.5, 9.0, LCD2004APCB,
LCDS7282BPCB = pcb("", "", [85, 36, 1.65], hole_d = 2.56, colour = "green",
holes = [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
components = [
[3.5, 18, 0, "2p54header", 2, 7]
[3.5, 18, 0, "header2p54", 2, 7]
],
grid = [3.5 - inch(0.05), 18 - inch(0.3), 2, 7, silver, inch(0.1), inch(0.1)]
);
Expand All @@ -111,7 +111,7 @@ LCDS7282B = ["LCDS7282B", "LCD display S-7282B", 73.6, 28.7, 9.6, LCDS7282BPCB,

SSD1963_4p3PCB = pcb("", "", [120, 74, 1.65], corner_r = 3, hole_d = 3, colour = "mediumblue",
holes = [[3, 3], [-3, 3], [-3, -3], [3, -3]],
components = [ [2.75 + 1.27, 37, 90, "2p54header", 20, 2] ],
components = [ [2.75 + 1.27, 37, 90, "header2p54", 20, 2] ],
grid = [2.75, 37 - inch(0.95), 2, 20, silver, inch(0.1), inch(0.1)]
);

Expand Down Expand Up @@ -160,11 +160,11 @@ BigTreeTech_TFT35v3_0_PCB = ["", "",
[ (6.84 + 12.85)/2, -(45.73 + 51.73)/2, 0, "-button_6mm" ],
[ 102, (15.57 + 42.07)/2, 0, "uSD", [26.5, 16, 3] ],
[ 8, -( 6.76 + 18.76)/2, 180, "usb_A" ],
[ 23, (23.32 + 33.64)/2, 90, "2p54socket", 4, 2 ], // ESP-8266
[ 23, (23.32 + 33.64)/2, 90, "socket2p54", 4, 2 ], // ESP-8266

[ 16.5, 5.9, 0, "2p54boxhdr", 5, 2 ],
[ 36.5, 5.9, 0, "2p54boxhdr", 5, 2 ],
[ 56.5, 5.9, 0, "2p54boxhdr", 5, 2 ],
[ 16.5, 5.9, 0, "boxhdr2p54", 5, 2 ],
[ 36.5, 5.9, 0, "boxhdr2p54", 5, 2 ],
[ 56.5, 5.9, 0, "boxhdr2p54", 5, 2 ],
[ 82.5, 4, 0, "jst_xh", 5 ],
[ 26.5, 52.8, 180, "jst_xh", 2 ],
[ 39.5, 52.8, 180, "jst_xh", 3 ],
Expand Down
4 changes: 2 additions & 2 deletions vitamins/fastons.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
//! Faston receptacles to mate with spade connectors
//

5_160430_7 = ["5_160430_7", 4.75, [5.6, 2.56, 6.3], 2.25, 1.13, 0.32, 3.2, 1.64, [1.64, 3.09, 9], 0.5, 0.96, 1.7, 3.53, [2.08, 4.47, 13.3], -0.4];
faston_5_160430_7 = ["faston_5_160430_7", 4.75, [5.6, 2.56, 6.3], 2.25, 1.13, 0.32, 3.2, 1.64, [1.64, 3.09, 9], 0.5, 0.96, 1.7, 3.53, [2.08, 4.47, 13.3], -0.4];

fastons = [5_160430_7];
fastons = [faston_5_160430_7];

use <faston.scad>
6 changes: 3 additions & 3 deletions vitamins/geared_steppers.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
// h u r h w t e t t e e
// t s d t d h w l 2 d
// d h r d l w d h z w d h
28BYJ_48 = ["28BYJ_48", "28BYJ-48 5V", 28, 19, 1, [ 0, 0, 0], 35, 7, 0.85, 4.2, 8, 9, 1.5, 5,-3.0, 10, 6, [14.7, 17, 16.5, 0], [17.7, 15.5, 13.8], 1, [["yellow", "orange", "red", "pink", "blue"]] ];
35BYGHJ75 = ["35BYGHJ75", "35BYGHJ75 0.4A",37, 37, -2, [35, 22, 1], 27, 0, 0, 3.0, 7, 12, 3.0, 5, 4.5, 17, 10, [ 7.7, 20.7, 9.25, 21], [ 0, 0, 0], 1.3,[["brown", "red"], ["yellow", "green"]] ];
step_28BYJ_48 = ["step_28BYJ_48", "28BYJ-48 5V", 28, 19, 1, [ 0, 0, 0], 35, 7, 0.85, 4.2, 8, 9, 1.5, 5,-3.0, 10, 6, [14.7, 17, 16.5, 0], [17.7, 15.5, 13.8], 1, [["yellow", "orange", "red", "pink", "blue"]] ];
step_35BYGHJ75 = ["step_35BYGHJ75", "35BYGHJ75 0.4A",37, 37, -2, [35, 22, 1], 27, 0, 0, 3.0, 7, 12, 3.0, 5, 4.5, 17, 10, [ 7.7, 20.7, 9.25, 21], [ 0, 0, 0], 1.3,[["brown", "red"], ["yellow", "green"]] ];

geared_steppers = [28BYJ_48, 35BYGHJ75];
geared_steppers = [step_28BYJ_48, step_35BYGHJ75];

use <geared_stepper.scad>
2 changes: 1 addition & 1 deletion vitamins/microview.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ module microview(cutout = false) { //! Draw microview or generate a panel cutou

for(side = [-1, 1], i = [0 : 7])
translate([side * inch(0.35), (i - 3.5) * inch(0.1)])
pin(2p54header);
pin(header2p54);
}
}
2 changes: 1 addition & 1 deletion vitamins/opengrab.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pcb = ["", "", width, width, 0.8, 0, 3.5, 0, "darkgreen", false, [],
[ [ 3.475, 19.05, 0, "button_4p5mm"],
[ 2.2, 24.125, 0, "smd_led", LED0805, "green"],
[ 2.375, 27.9, 0, "smd_led", LED0805, "red"],
[ 28.4, 13.345, 0, "2p54header", 3, 1, false, undef, true],
[ 28.4, 13.345, 0, "header2p54", 3, 1, false, undef, true],
]];

module opengrab_hole_positions() //! Position children at the screw positions
Expand Down
16 changes: 8 additions & 8 deletions vitamins/pcb.scad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,12 +1166,12 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
function param(n, default = 0) = len(comp) > n && !is_undef(comp[n]) ? comp[n] : default;
rotate(comp.z) {
// Components that have a cutout parameter go in this section
if(show(comp, "2p54header")) let($show_plugs = show_plugs && param(9, true))
pin_header(2p54header, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
if(show(comp, "2p54joiner")) pin_header(2p54joiner, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
if(show(comp, "2p54boxhdr")) let($show_plugs = show_plugs && param(7, true))
box_header(2p54header, comp[4], comp[5], param(6, false), cutouts, param(8, false));
if(show(comp, "2p54socket")) pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7, 0), param(8, false), cutouts, param(9, undef));
if(show(comp, "header2p54")) let($show_plugs = show_plugs && param(9, true))
pin_header(header2p54, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
if(show(comp, "joiner2p54")) pin_header(joiner2p54, comp[4], comp[5], param(6, false), param(8, false), cutouts, colour = param(7, undef));
if(show(comp, "boxhdr2p54")) let($show_plugs = show_plugs && param(7, true))
box_header(header2p54, comp[4], comp[5], param(6, false), cutouts, param(8, false));
if(show(comp, "socket2p54")) pin_socket(header2p54, comp[4], comp[5], param(6, false), param(7, 0), param(8, false), cutouts, param(9, undef));
if(show(comp, "chip")) chip(comp[4], comp[5], comp[6], param(7, grey(30)), cutouts);
if(show(comp, "rj45")) rj45(cutouts);
if(show(comp, "usb_A")) usb_Ax1(cutouts);
Expand All @@ -1194,7 +1194,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
if(show(comp, "molex_usb_Ax2")) molex_usb_Ax2(cutouts);
if(show(comp, "molex_usb_Ax1")) molex_usb_Ax1(cutouts);
if(show(comp, "smd_led")) smd_led(comp[4], comp[5], cutouts);
if(show(comp, "7seg")) let(z = param(6, 0)) translate_z(z) 7_segment_digits(comp[4], comp[5], pin_length = z + 3, cutout = cutouts);
if(show(comp, "7seg")) let(z = param(6, 0)) translate_z(z) disp_7_segment_digits(comp[4], comp[5], pin_length = z + 3, cutout = cutouts);
if(show(comp, "block")) block(size = [comp[4], comp[5], comp[6]], colour = comp[7], makes_cutout = param(8), r = param(9, 0), rtop = param(10, 0));
if(!cutouts) {
// Components that don't have a cutout parameter go in this section
Expand All @@ -1210,7 +1210,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
if(show(comp, "gterm508")) green_terminal(gt_5p08, comp[4], comp[5], param(6,"lime"));
if(show(comp, "gterm635")) green_terminal(gt_6p35, comp[4], comp[5], param(6,"lime"));
if(show(comp, "term35")) terminal_35(comp[4], param(5,"blue"));
if(show(comp, "transition")) idc_transition(2p54header, comp[4], comp[5]);
if(show(comp, "transition")) idc_transition(header2p54, comp[4], comp[5]);
if(show(comp, "led")) let(z = param(6, 0)) translate_z(z + eps) led(comp[4], comp[5], 2.6 + z, param(7, 0));
if(show(comp, "pdip")) pdip(comp[4], comp[5], param(6, false), param(7, inch(0.3)));
if(show(comp, "ax_res")) ax_res(comp[4], comp[5], param(6, 5), param(7, 0));
Expand Down
Loading