add 3d model to prototype pcb

.github/workflows/docs.yml

@@ -64,12 +64,6 @@ jobs:
           curl -sSL $url | tar -xz --directory=./mdbook
           echo `pwd`/mdbook >> $GITHUB_PATH
 
-      - name: Generate Plots
-        run: pcb/generate_plot.sh
-
-      - name: Render STLs
-        run: 3dprint/generate_stls.sh
-
       - name: Build Book
         run: docs/generate_docs.sh build
 

README.md

@@ -42,6 +42,10 @@ You can find the [documentation here on GitHub pages](https://xythobuz.github.io
 The docs are built using [mdbook](https://github.com/rust-lang/mdBook), licensed as `MPL-2.0`.
 Get the [latest release from GitHub](https://github.com/rust-lang/mdBook/releases) for a pre-built binary if you want to test changes to the docs locally.
 
+    ./pcb/generate_plot.sh
+    ./pcb2/generate_plot.sh
+    ./3dprint/generate_stls.sh
+
     ./docs/generate_docs.sh serve
 
 This will open your browser to a local development instance of the docs.
@@ -106,6 +110,8 @@ Some code in `docs/src/js/3d.js` is derived from [a blog post of Michal Jirků](
 The schematic and PCB design of this project is licensed under the [CERN Open Hardware Licence Version 2 - Strongly Reciprocal (CERN-OHL-S-2.0+)](https://ohwr.org/cern_ohl_s_v2.txt) or any later version.
 A copy of the license can be found in `LICENSE`.
 
+The PCB designs use a [KiCad-RP-Pico based](https://github.com/ncarandini/KiCad-RP-Pico) symbol and footprint library, licensed as `CC-BY-SA 4.0`.
+
      ------------------------------------------------------------------------------
     | This source describes Open Hardware and is licensed under the CERN-OHL-S v2  |
     | or any later version.                                                        |

docs/generate_docs.sh

@@ -31,22 +31,26 @@ INPCB="../pcb/drumkit.kicad_pcb ../pcb2/lars2.kicad_pcb"
 
 cd "$(dirname "$0")"
 
-#echo "Generating plots"
+if [ "$1" = "build" ] ; then
+    echo "Generating plots"
+    ../pcb/generate_plot.sh
+    echo
+
+    echo "Generating plots 2"
+    ../pcb2/generate_plot.sh
+    echo
+
+    echo "Generating stls"
+    ../3dprint/generate_stls.sh
+    echo
+fi
+
 rm -rf src/plot
-#../pcb/generate_plot.sh
 cp -r ../pcb/plot src
-#echo
-
-#echo "Generating plots 2"
-#../pcb/generate_plot.sh
 cp -r ../pcb2/plot/* src/plot/
-#echo
 
-#echo "Generating stls"
 rm -rf src/stl
-#../3dprint/generate_stls.sh
 cp -r ../3dprint/stl src
-#echo
 
 INSTL=`ls ../3dprint/stl/*.stl`
 

pcb/drumkit.kicad_pro

@@ -3,14 +3,17 @@
     "3dviewports": [],
     "design_settings": {
       "defaults": {
-        "board_outline_line_width": 0.09999999999999999,
-        "copper_line_width": 0.19999999999999998,
+        "apply_defaults_to_fp_fields": false,
+        "apply_defaults_to_fp_shapes": false,
+        "apply_defaults_to_fp_text": false,
+        "board_outline_line_width": 0.1,
+        "copper_line_width": 0.2,
         "copper_text_italic": false,
         "copper_text_size_h": 1.5,
         "copper_text_size_v": 1.5,
         "copper_text_thickness": 0.3,
         "copper_text_upright": false,
-        "courtyard_line_width": 0.049999999999999996,
+        "courtyard_line_width": 0.05,
         "dimension_precision": 4,
         "dimension_units": 3,
         "dimensions": {
@@ -21,7 +24,7 @@
           "text_position": 0,
           "units_format": 1
         },
-        "fab_line_width": 0.09999999999999999,
+        "fab_line_width": 0.1,
         "fab_text_italic": false,
         "fab_text_size_h": 1.0,
         "fab_text_size_v": 1.0,
@@ -72,6 +75,7 @@
         "duplicate_footprints": "warning",
         "extra_footprint": "warning",
         "footprint": "error",
+        "footprint_symbol_mismatch": "warning",
         "footprint_type_mismatch": "ignore",
         "hole_clearance": "error",
         "hole_near_hole": "error",
@@ -116,15 +120,15 @@
         "min_copper_edge_clearance": 0.0,
         "min_hole_clearance": 0.25,
         "min_hole_to_hole": 0.25,
-        "min_microvia_diameter": 0.19999999999999998,
-        "min_microvia_drill": 0.09999999999999999,
+        "min_microvia_diameter": 0.2,
+        "min_microvia_drill": 0.1,
         "min_resolved_spokes": 2,
         "min_silk_clearance": 0.0,
-        "min_text_height": 0.7999999999999999,
+        "min_text_height": 0.8,
         "min_text_thickness": 0.08,
         "min_through_hole_diameter": 0.3,
         "min_track_width": 0.0,
-        "min_via_annular_width": 0.09999999999999999,
+        "min_via_annular_width": 0.1,
         "min_via_diameter": 0.5,
         "solder_mask_clearance": 0.0,
         "solder_mask_min_width": 0.0,
@@ -133,9 +137,6 @@
       },
       "teardrop_options": [
         {
-          "td_allow_use_two_tracks": true,
-          "td_curve_segcount": 5,
-          "td_on_pad_in_zone": false,
           "td_onpadsmd": true,
           "td_onroundshapesonly": false,
           "td_ontrackend": false,
@@ -144,29 +145,35 @@
       ],
       "teardrop_parameters": [
         {
+          "td_allow_use_two_tracks": true,
           "td_curve_segcount": 0,
           "td_height_ratio": 1.0,
           "td_length_ratio": 0.5,
           "td_maxheight": 2.0,
           "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
           "td_target_name": "td_round_shape",
           "td_width_to_size_filter_ratio": 0.9
         },
         {
+          "td_allow_use_two_tracks": true,
           "td_curve_segcount": 0,
           "td_height_ratio": 1.0,
           "td_length_ratio": 0.5,
           "td_maxheight": 2.0,
           "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
           "td_target_name": "td_rect_shape",
           "td_width_to_size_filter_ratio": 0.9
         },
         {
+          "td_allow_use_two_tracks": true,
           "td_curve_segcount": 0,
           "td_height_ratio": 1.0,
           "td_length_ratio": 0.5,
           "td_maxheight": 2.0,
           "td_maxlen": 1.0,
+          "td_on_pad_in_zone": false,
           "td_target_name": "td_track_end",
           "td_width_to_size_filter_ratio": 0.9
         }
@@ -176,6 +183,32 @@
         1.0,
         2.0
       ],
+      "tuning_pattern_settings": {
+        "diff_pair_defaults": {
+          "corner_radius_percentage": 80,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.2,
+          "single_sided": false,
+          "spacing": 1.0
+        },
+        "diff_pair_skew_defaults": {
+          "corner_radius_percentage": 80,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.2,
+          "single_sided": false,
+          "spacing": 0.6
+        },
+        "single_track_defaults": {
+          "corner_radius_percentage": 80,
+          "corner_style": 1,
+          "max_amplitude": 1.0,
+          "min_amplitude": 0.2,
+          "single_sided": false,
+          "spacing": 0.6
+        }
+      },
       "via_dimensions": [
         {
           "diameter": 0.0,
@@ -460,6 +493,64 @@
   },
   "schematic": {
     "annotate_start_num": 0,
+    "bom_fmt_presets": [],
+    "bom_fmt_settings": {
+      "field_delimiter": ",",
+      "keep_line_breaks": false,
+      "keep_tabs": false,
+      "name": "CSV",
+      "ref_delimiter": ",",
+      "ref_range_delimiter": "",
+      "string_delimiter": "\""
+    },
+    "bom_presets": [],
+    "bom_settings": {
+      "exclude_dnp": false,
+      "fields_ordered": [
+        {
+          "group_by": false,
+          "label": "Reference",
+          "name": "Reference",
+          "show": true
+        },
+        {
+          "group_by": true,
+          "label": "Value",
+          "name": "Value",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Datasheet",
+          "name": "Datasheet",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Footprint",
+          "name": "Footprint",
+          "show": true
+        },
+        {
+          "group_by": false,
+          "label": "Qty",
+          "name": "${QUANTITY}",
+          "show": true
+        },
+        {
+          "group_by": true,
+          "label": "DNP",
+          "name": "${DNP}",
+          "show": true
+        }
+      ],
+      "filter_string": "",
+      "group_symbols": true,
+      "name": "Grouped By Value",
+      "sort_asc": true,
+      "sort_field": "Reference"
+    },
+    "connection_grid_size": 50.0,
     "drawing": {
       "dashed_lines_dash_length_ratio": 12.0,
       "dashed_lines_gap_length_ratio": 3.0,
@@ -473,6 +564,11 @@
       "intersheets_ref_suffix": "",
       "junction_size_choice": 3,
       "label_size_ratio": 0.375,
+      "operating_point_overlay_i_precision": 3,
+      "operating_point_overlay_i_range": "~A",
+      "operating_point_overlay_v_precision": 3,
+      "operating_point_overlay_v_range": "~V",
+      "overbar_offset_ratio": 1.23,
       "pin_symbol_size": 25.0,
       "text_offset_ratio": 0.15
     },
@@ -488,6 +584,7 @@
     "spice_external_command": "spice \"%I\"",
     "spice_model_current_sheet_as_root": true,
     "spice_save_all_currents": false,
+    "spice_save_all_dissipations": false,
     "spice_save_all_voltages": false,
     "subpart_first_id": 65,
     "subpart_id_separator": 0
@@ -495,7 +592,7 @@
   "sheets": [
     [
       "13d14c25-8baa-4714-9b30-86acf6c3cb37",
-      ""
+      "Root"
     ]
   ],
   "text_variables": {}

pcb/fp-lib-table

@@ -1,4 +1,5 @@
 (fp_lib_table
   (version 7)
   (lib (name "chinese_modules")(type "KiCad")(uri "${KIPRJMOD}/chinese_modules.pretty")(options "")(descr ""))
+  (lib (name "KiCad-RP-Pico")(type "KiCad")(uri "${KIPRJMOD}/../pcb2/KiCad-RP-Pico/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty")(options "")(descr ""))
 )

pcb/sym-lib-table

@@ -1,4 +1,5 @@
 (sym_lib_table
   (version 7)
   (lib (name "chinese_modules")(type "KiCad")(uri "${KIPRJMOD}/chinese_modules.kicad_sym")(options "")(descr ""))
+  (lib (name "KiCad-RP-Pico")(type "KiCad")(uri "${KIPRJMOD}/../pcb2/KiCad-RP-Pico/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.kicad_sym")(options "")(descr ""))
 )

pcb2/KiCad-RP-Pico

@@ -1 +1 @@
-Subproject commit 2ad50bdb5813614a2bb7c51d5f8d98d08ba826eb
+Subproject commit 4b791699a977e4be4238a71f178a97b15453aca6

pcb2/lars2.kicad_pcb

@@ -7,6 +7,14 @@
 		(legacy_teardrops no)
 	)
 	(paper "A4")
+	(title_block
+		(title "LARS V2")
+		(date "2024-04-01")
+		(rev "1")
+		(comment 1 "https://git.xythobuz.de/thomas/drumkit")
+		(comment 2 "Licensed under the CERN-OHL-S-2.0+")
+		(comment 4 "Copyright (c) 2024 Kauzerei, Thomas Buck")
+	)
 	(layers
 		(0 "F.Cu" signal)
 		(31 "B.Cu" signal)

pcb2/lars2.kicad_sch

@@ -4,6 +4,14 @@
 	(generator_version "8.0")
 	(uuid "a25473f4-1652-4b35-af21-cda37f55b27b")
 	(paper "A4")
+	(title_block
+		(title "LARS V2")
+		(date "2024-04-01")
+		(rev "1")
+		(comment 1 "https://git.xythobuz.de/thomas/drumkit")
+		(comment 2 "Licensed under the CERN-OHL-S-2.0+")
+		(comment 4 "Copyright (c) 2024 Kauzerei, Thomas Buck")
+	)
 	(lib_symbols
 		(symbol "KiCad-RP-Pico:Pico"
 			(exclude_from_sim no)