From f6b96ed5b5da4dc92364c91e17af0d21e33df26a Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Fri, 5 Jul 2024 18:52:36 +0200 Subject: [PATCH 1/2] Update examples after typo and RackBox fixes --- examples/BrickSorter.svg | 4 ++-- examples/Console2.svg | 4 ++-- examples/Matrix.svg | 4 ++-- examples/RackBox.svg | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/BrickSorter.svg b/examples/BrickSorter.svg index 49b62ab1..b329b596 100644 --- a/examples/BrickSorter.svg +++ b/examples/BrickSorter.svg @@ -10,7 +10,7 @@ You will need to export all 5 levels, to get a full sieve. If you feel you do not need the upper levels, just do not export them. x,y,h are the dimensions for the largest sieve, they will be the outer dimensions of the box, -the smaller sieves will be nested inside, therefor smaller. +the smaller sieves will be nested inside, therefore smaller. Of course 256mm or 384mm (base plate size) are recommended values for x and y, but you can use any value you like. @@ -46,7 +46,7 @@ You will need to export all 5 levels, to get a full sieve. If you feel you do not need the upper levels, just do not export them. x,y,h are the dimensions for the largest sieve, they will be the outer dimensions of the box, -the smaller sieves will be nested inside, therefor smaller. +the smaller sieves will be nested inside, therefore smaller. Of course 256mm or 384mm (base plate size) are recommended values for x and y, but you can use any value you like. diff --git a/examples/Console2.svg b/examples/Console2.svg index ed025cc0..accb8ca1 100644 --- a/examples/Console2.svg +++ b/examples/Console2.svg @@ -8,7 +8,7 @@ Console2 - Console with slanted panel and service hatches This box is designed as a housing for electronic projects. It has hatches that can be re-opened with simple tools. It intentionally cannot be opened with bare hands - if build with thin enough material. #### Caution -There is a chance that the latches of the back wall or the back wall itself interfere with the front panel or it's mounting frame/lips. The generator does not check for this. So depending on the variant chosen you might need to make the box deeper (increase y parameter) or the panel angle steeper (increase angle parameter) until there is enough room. +There is a chance that the latches of the back wall or the back wall itself interfere with the front panel or its mounting frame/lips. The generator does not check for this. So depending on the variant chosen you might need to make the box deeper (increase y parameter) or the panel angle steeper (increase angle parameter) until there is enough room. It's also possible that the frame of the panel interferes with the floor if the hi parameter is too small. @@ -49,7 +49,7 @@ Command line (remove spaces between dashes): boxes Console2 This box is designed as a housing for electronic projects. It has hatches that can be re-opened with simple tools. It intentionally cannot be opened with bare hands - if build with thin enough material. #### Caution -There is a chance that the latches of the back wall or the back wall itself interfere with the front panel or it's mounting frame/lips. The generator does not check for this. So depending on the variant chosen you might need to make the box deeper (increase y parameter) or the panel angle steeper (increase angle parameter) until there is enough room. +There is a chance that the latches of the back wall or the back wall itself interfere with the front panel or its mounting frame/lips. The generator does not check for this. So depending on the variant chosen you might need to make the box deeper (increase y parameter) or the panel angle steeper (increase angle parameter) until there is enough room. It's also possible that the frame of the panel interferes with the floor if the hi parameter is too small. diff --git a/examples/Matrix.svg b/examples/Matrix.svg index b375037b..ea3da5da 100644 --- a/examples/Matrix.svg +++ b/examples/Matrix.svg @@ -33,7 +33,7 @@ Matrix - WS2812b matrix enclosure you can add the layout parameters, so that the inner frame adjusts accordingly. Please Note: if you are creating a large matrix build of multiple individual modules, - you need to enter absolut values across all modules for all parameters. + you need to enter absolute values across all modules for all parameters. Please cut the plane labeled "Plexiglass" out of plexiglass :) You can use a different thickness for the plexiglass, but make sure to adjust the settings accordingly. @@ -78,7 +78,7 @@ Command line (remove spaces between dashes): boxes Matrix you can add the layout parameters, so that the inner frame adjusts accordingly. Please Note: if you are creating a large matrix build of multiple individual modules, - you need to enter absolut values across all modules for all parameters. + you need to enter absolute values across all modules for all parameters. Please cut the plane labeled "Plexiglass" out of plexiglass :) You can use a different thickness for the plexiglass, but make sure to adjust the settings accordingly. diff --git a/examples/RackBox.svg b/examples/RackBox.svg index c22b49d2..f9a4f7f0 100644 --- a/examples/RackBox.svg +++ b/examples/RackBox.svg @@ -39,7 +39,7 @@ Command line short: boxes RackBox - + From 3f8549b9e49aeb288acbda056b6edb4f43fe063a Mon Sep 17 00:00:00 2001 From: foosinn Date: Tue, 2 Jul 2024 23:02:41 +0200 Subject: [PATCH 2/2] Add USB-C support to MakitaPowerSupply --- boxes/generators/makitapowersupply.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/boxes/generators/makitapowersupply.py b/boxes/generators/makitapowersupply.py index 949ce066..cb495b8a 100644 --- a/boxes/generators/makitapowersupply.py +++ b/boxes/generators/makitapowersupply.py @@ -38,7 +38,12 @@ def __init__(self) -> None: self.argparser.add_argument("--flipswitch_diameter", action="store", type=float, default=6.3, - help="diameter of the flipswitch mounting hole") + help="diameter of the flipswitch mounting hole (disabled of no secondary power)") + + self.argparser.add_argument("--secondary_power", action="store", + default="ibm-barrel", + choices=["ibm-barrel", "usb-c", "none"], + help="style of secondary power input") def side(self, l, h=14, move=None): @@ -86,12 +91,17 @@ def bottom(self): def front(self): d_b = self.banana_socket_diameter d_f = self.flipswitch_diameter + secondary_power_style = self.secondary_power self.hole(10, self.h/2, d=d_b) self.hole(30, self.h/2, d=d_b) - self.hole(50, self.h/2, d=d_f) - self.rectangularHole(76, 6.4, 12.4, 12.4) + if secondary_power_style == "ibm-barrel": + self.hole(50, self.h/2, d=d_f) + self.rectangularHole(76, 6.4, 12.4, 12.4) + if secondary_power_style == "usb-c": + self.hole(50, self.h/2, d=d_f) + self.rectangularHole(75, 2.6, 9.2, 3.2, r=1) def back(self): n = int((self.h-2*self.thickness) // 8)