use openscad open source hardware logo

for caster and deck holder, use openscad version of open source
hardware logo.  this allows for precise sizing

diff --git a/3d-printables/caster-standoff-data.scad b/3d-printables/caster-standoff-data.scad
index 8b39e1ddff8b56dafe50dbe881ae3b6c6c17eae6..9b851d6c05dc99af786b6112d67f3d19bc495abd 100644 (file)
--- a/3d-printables/caster-standoff-data.scad
+++ b/3d-printables/caster-standoff-data.scad
@@ -7,7 +7,7 @@
 // project available here:
 // https://challenge-bot.com/
 
-use <oshw.scad>
+include <open-source-hardware-logo.scad>
 
 // use 10 ish for development, 60 or so for printing
 $fn = 100;
@@ -50,9 +50,7 @@ module deck_flange() {
   deck_pitch_diagonal = sqrt(2 * pow(deck_pitch, 2));
   cylinder(h = deck_flange_height, r = holder_radius + 2);
   difference() {
-    scale([0.40, 0.40, 1]) {
-      linear_extrude(height = deck_flange_height) {
-        oshw(); } }
+    open_source_hardware_logo(26, deck_flange_height);
     for (ii = [-1, 1]) {
       translate([deck_pitch_diagonal / 2 * ii, 0, -.1])
       cylinder(h = deck_flange_height * 1.1,

diff --git a/3d-printables/deck-holder-data.scad b/3d-printables/deck-holder-data.scad
index a032658a72af0d078939e5ba64660cc04826f0f1..3a28dc4edc1333fe2df237c77d182af46089d383 100644 (file)
--- a/3d-printables/deck-holder-data.scad
+++ b/3d-printables/deck-holder-data.scad
@@ -17,7 +17,7 @@
 
 $fn = 60;
 
-include <oshw-data.scad>
+include <open-source-hardware-logo-data.scad>
 
 // 3/16 inch in mm deck_depth = 4.7625;
 // 1/4 inch in mm = 6.35
@@ -58,20 +58,20 @@ module deck_holder() {
       translate([deck_holder_height, sonar_holder_depth - 0.3]) {
         square([deck_holder_length - (deck_holder_height),
                 deck_depth + 0.6]); } } }
-  translate([deck_holder_length - oshw_dy * 0.05, 0, deck_holder_width / 2])
-  scale([0.1, 1, 0.1])
-  rotate(v = [1, 0, 0], a = 90)
-  rotate(90)
-  linear_extrude(height = 0.5)
-  oshw();
-  translate([deck_holder_length - oshw_dy * 0.05,
-             deck_holder_height + 0.5,
-             deck_holder_width / 2])
-  rotate(v = [1, 0, 0], a = 90)
-  rotate(90)
-  scale([0.1, 0.1, 1])
-  linear_extrude(height = 0.5)
-  oshw(); }
+  translate([deck_holder_length - deck_holder_width / 2,
+             0,
+             deck_holder_width / 2]) {
+    rotate(v = [1, 0, 0], a = 90) {
+      rotate(90) {
+        open_source_hardware_logo(deck_holder_width / 2,
+                                  oshw_height); } } }
+  translate([deck_holder_length - deck_holder_width / 2,
+             deck_holder_height + oshw_height,
+             deck_holder_width / 2]) {
+    rotate(v = [1, 0, 0], a = 90) {
+      rotate(90) {
+        open_source_hardware_logo(deck_holder_width / 2,
+                                  oshw_height); } } } }
 
 /*
   This file is part of challenge-bot.

diff --git a/3d-printables/oshw-data.scad b/3d-printables/oshw-data.scad
deleted file mode 100644 (file)
index a42361e..0000000
--- a/3d-printables/oshw-data.scad
+++ /dev/null
@@ -1,7 +0,0 @@
-oshw_dx = 133.888;
-oshw_dy = 120.366;
-module oshw() {
-  x_center_offset = 66.9175;
-  y_center_offset = 53.2655;
-  translate([-x_center_offset, -y_center_offset]) {
-    import("oshw.dxf"); } }

diff --git a/3d-printables/oshw.dxf b/3d-printables/oshw.dxf
deleted file mode 100644 (file)
index abe58c7..0000000
--- a/3d-printables/oshw.dxf
+++ /dev/null
@@ -1,1654 +0,0 @@
-  0
-SECTION
-  2
-HEADER
-  9
-$ACADVER
-  1
-AC1014
-  9
-$HANDSEED
-  5
-FFFF
-  9
-$MEASUREMENT
- 70
-     1
-  0
-ENDSEC
-  0
-SECTION
-  2
-TABLES
-  0
-TABLE
-  2
-VPORT
-  5
-8
-330
-0
-100
-AcDbSymbolTable
- 70
-     4
-  0
-VPORT
-  5
-2E
-330
-8
-100
-AcDbSymbolTableRecord
-100
-AcDbViewportTableRecord
-  2
-*ACTIVE
- 70
-     0
- 10
-0.0
- 20
-0.0
- 11
-1.0
- 21
-1.0
- 12
-210.0
- 22
-148.5
- 13
-0.0
- 23
-0.0
- 14
-10.0
- 24
-10.0
- 15
-10.0
- 25
-10.0
- 16
-0.0
- 26
-0.0
- 36
-1.0
- 17
-0.0
- 27
-0.0
- 37
-0.0
- 40
-341.0
- 41
-1.24
- 42
-50.0
- 43
-0.0
- 44
-0.0
- 50
-0.0
- 51
-0.0
- 71
-     0
- 72
-   100
- 73
-     1
- 74
-     3
- 75
-     0
- 76
-     0
- 77
-     0
- 78
-     0
-  0
-ENDTAB
-  0
-TABLE
-  2
-LTYPE
-  5
-5
-330
-0
-100
-AcDbSymbolTable
- 70
-     1
-  0
-LTYPE
-  5
-14
-330
-5
-100
-AcDbSymbolTableRecord
-100
-AcDbLinetypeTableRecord
-  2
-BYBLOCK
- 70
-     0
-  3
-
- 72
-    65
- 73
-     0
- 40
-0.0
-  0
-LTYPE
-  5
-15
-330
-5
-100
-AcDbSymbolTableRecord
-100
-AcDbLinetypeTableRecord
-  2
-BYLAYER
- 70
-     0
-  3
-
- 72
-    65
- 73
-     0
- 40
-0.0
-  0
-LTYPE
-  5
-16
-330
-5
-100
-AcDbSymbolTableRecord
-100
-AcDbLinetypeTableRecord
-  2
-CONTINUOUS
- 70
-     0
-  3
-Solid line
- 72
-    65
- 73
-     0
- 40
-0.0
-  0
-ENDTAB
-  0
-TABLE
-  2
-LAYER
-  5
-2
-100
-AcDbSymbolTable
- 70
-2
-  0
-LAYER
-  5
-50
-100
-AcDbSymbolTableRecord
-100
-AcDbLayerTableRecord
-  2
-0
- 70
-0
-  6
-CONTINUOUS
-  0
-LAYER
-  5
-51
-100
-AcDbSymbolTableRecord
-100
-AcDbLayerTableRecord
-  2
-Layer_1
- 70
-0
-  6
-CONTINUOUS
-  0
-ENDTAB
-  0
-TABLE
-  2
-STYLE
-  5
-3
-330
-0
-100
-AcDbSymbolTable
- 70
-     1
-  0
-STYLE
-  5
-11
-330
-3
-100
-AcDbSymbolTableRecord
-100
-AcDbTextStyleTableRecord
-  2
-STANDARD
- 70
-     0
- 40
-0.0
- 41
-1.0
- 50
-0.0
- 71
-     0
- 42
-2.5
-  3
-txt
-  4
-
-  0
-ENDTAB
-  0
-TABLE
-  2
-VIEW
-  5
-6
-330
-0
-100
-AcDbSymbolTable
- 70
-     0
-  0
-ENDTAB
-  0
-TABLE
-  2
-UCS
-  5
-7
-330
-0
-100
-AcDbSymbolTable
- 70
-     0
-  0
-ENDTAB
-  0
-TABLE
-  2
-APPID
-  5
-9
-330
-0
-100
-AcDbSymbolTable
- 70
-     2
-  0
-APPID
-  5
-12
-330
-9
-100
-AcDbSymbolTableRecord
-100
-AcDbRegAppTableRecord
-  2
-ACAD
- 70
-     0
-  0
-ENDTAB
-  0
-TABLE
-  2
-DIMSTYLE
-  5
-A
-330
-0
-100
-AcDbSymbolTable
- 70
-     1
-  0
-DIMSTYLE
-105
-27
-330
-A
-100
-AcDbSymbolTableRecord
-100
-AcDbDimStyleTableRecord
-  2
-ISO-25
- 70
-     0
-  3
-
-  4
-
-  5
-
-  6
-
-  7
-
- 40
-1.0
- 41
-2.5
- 42
-0.625
- 43
-3.75
- 44
-1.25
- 45
-0.0
- 46
-0.0
- 47
-0.0
- 48
-0.0
-140
-2.5
-141
-2.5
-142
-0.0
-143
-0.03937007874016
-144
-1.0
-145
-0.0
-146
-1.0
-147
-0.625
- 71
-     0
- 72
-     0
- 73
-     0
- 74
-     0
- 75
-     0
- 76
-     0
- 77
-     1
- 78
-     8
-170
-     0
-171
-     3
-172
-     1
-173
-     0
-174
-     0
-175
-     0
-176
-     0
-177
-     0
-178
-     0
-270
-     2
-271
-     2
-272
-     2
-273
-     2
-274
-     3
-340
-11
-275
-     0
-280
-     0
-281
-     0
-282
-     0
-283
-     0
-284
-     8
-285
-     0
-286
-     0
-287
-     3
-288
-     0
-  0
-ENDTAB
-  0
-TABLE
-  2
-BLOCK_RECORD
-  5
-1
-330
-0
-100
-AcDbSymbolTable
- 70
-     1
-  0
-BLOCK_RECORD
-  5
-1F
-330
-1
-100
-AcDbSymbolTableRecord
-100
-AcDbBlockTableRecord
-  2
-*MODEL_SPACE
-  0
-BLOCK_RECORD
-  5
-1B
-330
-1
-100
-AcDbSymbolTableRecord
-100
-AcDbBlockTableRecord
-  2
-*PAPER_SPACE
-  0
-ENDTAB
-  0
-ENDSEC
-  0
-SECTION
-  2
-BLOCKS
-  0
-BLOCK
-  5
-20
-330
-1F
-100
-AcDbEntity
-  8
-0
-100
-AcDbBlockBegin
-  2
-*MODEL_SPACE
- 70
-     0
- 10
-0.0
- 20
-0.0
- 30
-0.0
-  3
-*MODEL_SPACE
-  1
-
-  0
-ENDBLK
-  5
-21
-330
-1F
-100
-AcDbEntity
-  8
-0
-100
-AcDbBlockEnd
-  0
-BLOCK
-  5
-1C
-330
-1B
-100
-AcDbEntity
- 67
-     1
-  8
-0
-100
-AcDbBlockBegin
-  2
-*PAPER_SPACE
-  1
-
-  0
-ENDBLK
-  5
-1D
-330
-1B
-100
-AcDbEntity
- 67
-     1
-  8
-0
-100
-AcDbBlockEnd
-  0
-ENDSEC
-  0
-SECTION
-  2
-ENTITIES
-  0
-LWPOLYLINE
-  5
-100
-100
-AcDbEntity
-  8
-Layer_1
- 62
-7
-100
-AcDbPolyline
- 90
-164
- 70
-0
- 10
-133.134940
- 20
-62.700480
- 30
-0.0
- 10
-116.695940
- 20
-65.757480
- 30
-0.0
- 10
-115.722940
- 20
-66.594480
- 30
-0.0
- 10
-110.683940
- 20
-78.350480
- 30
-0.0
- 10
-110.763940
- 20
-79.621480
- 30
-0.0
- 10
-120.341940
- 20
-93.581480
- 30
-0.0
- 10
-120.236940
- 20
-94.717480
- 30
-0.0
- 10
-108.273940
- 20
-106.680432
- 30
-0.0
- 10
-107.138940
- 20
-106.785432
- 30
-0.0
- 10
-92.933941
- 20
-97.037480
- 30
-0.0
- 10
-91.656941
- 20
-96.945480
- 30
-0.0
- 10
-80.260941
- 20
-101.610432
- 30
-0.0
- 10
-79.420941
- 20
-102.572432
- 30
-0.0
- 10
-76.255941
- 20
-119.575472
- 30
-0.0
- 10
-75.378941
- 20
-120.304472
- 30
-0.0
- 10
-58.458941
- 20
-120.304472
- 30
-0.0
- 10
-57.582941
- 20
-119.575472
- 30
-0.0
- 10
-54.418941
- 20
-102.572432
- 30
-0.0
- 10
-53.578941
- 20
-101.610432
- 30
-0.0
- 10
-42.181941
- 20
-96.945480
- 30
-0.0
- 10
-40.904941
- 20
-97.037480
- 30
-0.0
- 10
-26.700946
- 20
-106.785432
- 30
-0.0
- 10
-25.564946
- 20
-106.680432
- 30
-0.0
- 10
-13.600946
- 20
-94.717480
- 30
-0.0
- 10
-13.495946
- 20
-93.581480
- 30
-0.0
- 10
-23.074946
- 20
-79.621480
- 30
-0.0
- 10
-23.153946
- 20
-78.350480
- 30
-0.0
- 10
-18.113946
- 20
-66.594480
- 30
-0.0
- 10
-17.140946
- 20
-65.757480
- 30
-0.0
- 10
-0.702946
- 20
-62.700480
- 30
-0.0
- 10
--0.026054
- 20
-61.822480
- 30
-0.0
- 10
--0.025054
- 20
-44.903480
- 30
-0.0
- 10
-0.703946
- 20
-44.025480
- 30
-0.0
- 10
-16.738946
- 20
-41.041480
- 30
-0.0
- 10
-17.690946
- 20
-40.198480
- 30
-0.0
- 10
-22.696946
- 20
-27.693480
- 30
-0.0
- 10
-22.601946
- 20
-26.416480
- 30
-0.0
- 10
-13.493946
- 20
-13.143480
- 30
-0.0
- 10
-13.598946
- 20
-12.006480
- 30
-0.0
- 10
-25.563946
- 20
-0.043480
- 30
-0.0
- 10
-26.699946
- 20
--0.061520
- 30
-0.0
- 10
-39.737941
- 20
-8.887480
- 30
-0.0
- 10
-40.987941
- 20
-8.930480
- 30
-0.0
- 10
-46.737941
- 20
-5.860480
- 30
-0.0
- 10
-47.682941
- 20
-6.208480
- 30
-0.0
- 10
-59.538941
- 20
-34.855480
- 30
-0.0
- 10
-59.190941
- 20
-35.926480
- 30
-0.0
- 10
-57.751941
- 20
-36.807480
- 30
-0.0
- 10
-56.841941
- 20
-37.504480
- 30
-0.0
- 10
-55.889515
- 20
-38.156510
- 30
-0.0
- 10
-54.980521
- 20
-38.864460
- 30
-0.0
- 10
-54.117444
- 20
-39.625860
- 30
-0.0
- 10
-53.302769
- 20
-40.438230
- 30
-0.0
- 10
-52.538983
- 20
-41.299130
- 30
-0.0
- 10
-51.828572
- 20
-42.206070
- 30
-0.0
- 10
-51.174021
- 20
-43.156590
- 30
-0.0
- 10
-50.577816
- 20
-44.148230
- 30
-0.0
- 10
-50.042443
- 20
-45.178520
- 30
-0.0
- 10
-49.570388
- 20
-46.244990
- 30
-0.0
- 10
-49.164137
- 20
-47.345180
- 30
-0.0
- 10
-48.826175
- 20
-48.476610
- 30
-0.0
- 10
-48.558989
- 20
-49.636820
- 30
-0.0
- 10
-48.365064
- 20
-50.823350
- 30
-0.0
- 10
-48.246886
- 20
-52.033730
- 30
-0.0
- 10
-48.206936
- 20
-53.265480
- 30
-0.0
- 10
-48.231286
- 20
-54.228370
- 30
-0.0
- 10
-48.303546
- 20
-55.178610
- 30
-0.0
- 10
-48.422546
- 20
-56.115030
- 30
-0.0
- 10
-48.587108
- 20
-57.036460
- 30
-0.0
- 10
-48.796055
- 20
-57.941720
- 30
-0.0
- 10
-49.048212
- 20
-58.829630
- 30
-0.0
- 10
-49.342402
- 20
-59.699030
- 30
-0.0
- 10
-49.677450
- 20
-60.548730
- 30
-0.0
- 10
-50.052178
- 20
-61.377560
- 30
-0.0
- 10
-50.465412
- 20
-62.184340
- 30
-0.0
- 10
-50.915974
- 20
-62.967900
- 30
-0.0
- 10
-51.402690
- 20
-63.727070
- 30
-0.0
- 10
-51.924382
- 20
-64.460660
- 30
-0.0
- 10
-52.479875
- 20
-65.167500
- 30
-0.0
- 10
-53.067993
- 20
-65.846410
- 30
-0.0
- 10
-53.687559
- 20
-66.496230
- 30
-0.0
- 10
-54.337398
- 20
-67.115770
- 30
-0.0
- 10
-55.016333
- 20
-67.703860
- 30
-0.0
- 10
-55.723188
- 20
-68.259330
- 30
-0.0
- 10
-56.456788
- 20
-68.780990
- 30
-0.0
- 10
-57.215955
- 20
-69.267670
- 30
-0.0
- 10
-57.999515
- 20
-69.718200
- 30
-0.0
- 10
-58.806290
- 20
-70.131410
- 30
-0.0
- 10
-59.635106
- 20
-70.506110
- 30
-0.0
- 10
-60.484785
- 20
-70.841120
- 30
-0.0
- 10
-61.354152
- 20
-71.135290
- 30
-0.0
- 10
-62.242031
- 20
-71.387420
- 30
-0.0
- 10
-63.147245
- 20
-71.596350
- 30
-0.0
- 10
-64.068618
- 20
-71.760890
- 30
-0.0
- 10
-65.004975
- 20
-71.879880
- 30
-0.0
- 10
-65.955139
- 20
-71.952180
- 30
-0.0
- 10
-66.917934
- 20
-71.976480
- 30
-0.0
- 10
-67.880726
- 20
-71.952180
- 30
-0.0
- 10
-68.830882
- 20
-71.879880
- 30
-0.0
- 10
-69.767225
- 20
-71.760890
- 30
-0.0
- 10
-70.688580
- 20
-71.596350
- 30
-0.0
- 10
-71.593772
- 20
-71.387420
- 30
-0.0
- 10
-72.481624
- 20
-71.135290
- 30
-0.0
- 10
-73.350960
- 20
-70.841120
- 30
-0.0
- 10
-74.200606
- 20
-70.506110
- 30
-0.0
- 10
-75.029385
- 20
-70.131410
- 30
-0.0
- 10
-75.836121
- 20
-69.718200
- 30
-0.0
- 10
-76.619640
- 20
-69.267670
- 30
-0.0
- 10
-77.378764
- 20
-68.780990
- 30
-0.0
- 10
-78.112319
- 20
-68.259330
- 30
-0.0
- 10
-78.819129
- 20
-67.703860
- 30
-0.0
- 10
-79.498017
- 20
-67.115770
- 30
-0.0
- 10
-80.147809
- 20
-66.496230
- 30
-0.0
- 10
-80.767328
- 20
-65.846410
- 30
-0.0
- 10
-81.355400
- 20
-65.167500
- 30
-0.0
- 10
-81.910847
- 20
-64.460660
- 30
-0.0
- 10
-82.432495
- 20
-63.727070
- 30
-0.0
- 10
-82.919167
- 20
-62.967900
- 30
-0.0
- 10
-83.369688
- 20
-62.184340
- 30
-0.0
- 10
-83.782883
- 20
-61.377560
- 30
-0.0
- 10
-84.157575
- 20
-60.548730
- 30
-0.0
- 10
-84.492588
- 20
-59.699030
- 30
-0.0
- 10
-84.786748
- 20
-58.829630
- 30
-0.0
- 10
-85.038878
- 20
-57.941720
- 30
-0.0
- 10
-85.247803
- 20
-57.036460
- 30
-0.0
- 10
-85.412347
- 20
-56.115030
- 30
-0.0
- 10
-85.531334
- 20
-55.178610
- 30
-0.0
- 10
-85.603584
- 20
-54.228370
- 30
-0.0
- 10
-85.627934
- 20
-53.265480
- 30
-0.0
- 10
-85.588004
- 20
-52.033730
- 30
-0.0
- 10
-85.469856
- 20
-50.823350
- 30
-0.0
- 10
-85.275976
- 20
-49.636820
- 30
-0.0
- 10
-85.008844
- 20
-48.476610
- 30
-0.0
- 10
-84.670943
- 20
-47.345180
- 30
-0.0
- 10
-84.264754
- 20
-46.244990
- 30
-0.0
- 10
-83.792759
- 20
-45.178520
- 30
-0.0
- 10
-83.257438
- 20
-44.148230
- 30
-0.0
- 10
-82.661273
- 20
-43.156590
- 30
-0.0
- 10
-82.006747
- 20
-42.206070
- 30
-0.0
- 10
-81.296339
- 20
-41.299130
- 30
-0.0
- 10
-80.532532
- 20
-40.438230
- 30
-0.0
- 10
-79.717807
- 20
-39.625860
- 30
-0.0
- 10
-78.854645
- 20
-38.864460
- 30
-0.0
- 10
-77.945528
- 20
-38.156510
- 30
-0.0
- 10
-76.992938
- 20
-37.504480
- 30
-0.0
- 10
-76.084938
- 20
-36.807480
- 30
-0.0
- 10
-74.645938
- 20
-35.926480
- 30
-0.0
- 10
-74.297938
- 20
-34.855480
- 30
-0.0
- 10
-86.152938
- 20
-6.207480
- 30
-0.0
- 10
-87.097938
- 20
-5.859480
- 30
-0.0
- 10
-92.847938
- 20
-8.929480
- 30
-0.0
- 10
-94.097940
- 20
-8.886480
- 30
-0.0
- 10
-107.136940
- 20
--0.062520
- 30
-0.0
- 10
-108.271940
- 20
-0.042480
- 30
-0.0
- 10
-120.236940
- 20
-12.005480
- 30
-0.0
- 10
-120.341940
- 20
-13.142480
- 30
-0.0
- 10
-111.232940
- 20
-26.415480
- 30
-0.0
- 10
-111.138940
- 20
-27.692480
- 30
-0.0
- 10
-116.144940
- 20
-40.197480
- 30
-0.0
- 10
-117.095940
- 20
-41.040480
- 30
-0.0
- 10
-133.130940
- 20
-44.024480
- 30
-0.0
- 10
-133.859940
- 20
-44.902480
- 30
-0.0
- 10
-133.861940
- 20
-61.821480
- 30
-0.0
- 10
-133.134940
- 20
-62.700480
- 30
-0.0
-  0
-ENDSEC
-  0
-SECTION
-  2
-OBJECTS
-  0
-DICTIONARY
-  5
-C
-330
-0
-100
-AcDbDictionary
-  3
-ACAD_GROUP
-350
-D
-  3
-ACAD_MLINESTYLE
-350
-17
-  0
-DICTIONARY
-  5
-D
-330
-C
-100
-AcDbDictionary
-  0
-DICTIONARY
-  5
-1A
-330
-C
-100
-AcDbDictionary
-  0
-DICTIONARY
-  5
-17
-330
-C
-100
-AcDbDictionary
-  3
-STANDARD
-350
-18
-  0
-DICTIONARY
-  5
-19
-330
-C
-100
-AcDbDictionary
-  0
-ENDSEC
-  0
-EOF

diff --git a/3d-printables/oshw.scad b/3d-printables/oshw.scad
deleted file mode 100644 (file)
index 57d9ab0..0000000
--- a/3d-printables/oshw.scad
+++ /dev/null
@@ -1,4 +0,0 @@
-
-include <oshw-data.scad>
-
-oshw();