Skip to content

Commit dbb8455

Browse files
authored
Merge pull request #163 from Neotron-Compute/update_common_hardware
Update to Neotron Common Hardware release candidate for 1.0.0
2 parents ccb823d + fdddac8 commit dbb8455

7 files changed

Lines changed: 225 additions & 328 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
# Unreleased Changes
44

5-
# None
5+
* Updated Neotron Common Hardware (the library of symbols and footprints we use) to v1.0.0
6+
67

78
# [Version v1.1.0](https://github.com/Neotron-Compute/Neotron-Pico/releases/tag/v1.1.0)
89

Kicad/Neotron-Common-Hardware

Kicad/bmc.kicad_sch

Lines changed: 213 additions & 213 deletions
Large diffs are not rendered by default.

Kicad/expansion_slots.kicad_sch

Lines changed: 4 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
(property "Datasheet" "" (id 3) (at 11.43 10.16 0)
383383
(effects (font (size 1.27 1.27)) hide)
384384
)
385-
(property "ki_description" "Expansion slot for Neotron Motherboards" (id 4) (at 0 0 0)
385+
(property "ki_description" "Expansion slot for Neotron Mainboards" (id 4) (at 0 0 0)
386386
(effects (font (size 1.27 1.27)) hide)
387387
)
388388
(symbol "Neotron-Expansion-Slot_0_0"
@@ -487,7 +487,7 @@
487487
(property "Datasheet" "" (id 3) (at 11.43 10.16 0)
488488
(effects (font (size 1.27 1.27)) hide)
489489
)
490-
(property "ki_description" "Expansion slot for Neotron Motherboards" (id 4) (at 0 0 0)
490+
(property "ki_description" "Expansion slot for Neotron Mainboards" (id 4) (at 0 0 0)
491491
(effects (font (size 1.27 1.27)) hide)
492492
)
493493
(symbol "Neotron-Expansion-Slot_1_0_0"
@@ -592,7 +592,7 @@
592592
(property "Datasheet" "" (id 3) (at 11.43 10.16 0)
593593
(effects (font (size 1.27 1.27)) hide)
594594
)
595-
(property "ki_description" "Expansion slot for Neotron Motherboards" (id 4) (at 0 0 0)
595+
(property "ki_description" "Expansion slot for Neotron Mainboards" (id 4) (at 0 0 0)
596596
(effects (font (size 1.27 1.27)) hide)
597597
)
598598
(symbol "Neotron-Expansion-Slot_2_0_0"
@@ -684,111 +684,6 @@
684684
)
685685
)
686686
)
687-
(symbol "Neotron-Expansion-Slot_3" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
688-
(property "Reference" "J" (id 0) (at 0 -20.32 0)
689-
(effects (font (size 1.27 1.27)))
690-
)
691-
(property "Value" "Neotron-Expansion-Slot_3" (id 1) (at -1.27 15.24 0)
692-
(effects (font (size 1.27 1.27)))
693-
)
694-
(property "Footprint" "Neotron-Common-Hardware:Neotron-Expansion-Slot" (id 2) (at 0 17.78 0)
695-
(effects (font (size 1.27 1.27)) hide)
696-
)
697-
(property "Datasheet" "" (id 3) (at 11.43 10.16 0)
698-
(effects (font (size 1.27 1.27)) hide)
699-
)
700-
(property "ki_description" "Expansion slot for Neotron Motherboards" (id 4) (at 0 0 0)
701-
(effects (font (size 1.27 1.27)) hide)
702-
)
703-
(symbol "Neotron-Expansion-Slot_3_0_0"
704-
(pin input line (at -15.24 11.43 0) (length 2.54)
705-
(name "SPI_COPI" (effects (font (size 1.27 1.27))))
706-
(number "1" (effects (font (size 1.27 1.27))))
707-
)
708-
(pin bidirectional line (at 13.97 11.43 180) (length 2.54)
709-
(name "I2C_SCL" (effects (font (size 1.27 1.27))))
710-
(number "10" (effects (font (size 1.27 1.27))))
711-
)
712-
(pin input line (at 13.97 -8.89 180) (length 2.54)
713-
(name "EEPROM_ADDR0" (effects (font (size 1.27 1.27))))
714-
(number "11" (effects (font (size 1.27 1.27))))
715-
)
716-
(pin input line (at 13.97 -11.43 180) (length 2.54)
717-
(name "EEPROM_ADDR1" (effects (font (size 1.27 1.27))))
718-
(number "12" (effects (font (size 1.27 1.27))))
719-
)
720-
(pin input line (at 13.97 -13.97 180) (length 2.54)
721-
(name "EEPROM_ADDR2" (effects (font (size 1.27 1.27))))
722-
(number "13" (effects (font (size 1.27 1.27))))
723-
)
724-
(pin input line (at -15.24 -1.27 0) (length 2.54)
725-
(name "~{RESET}" (effects (font (size 1.27 1.27))))
726-
(number "14" (effects (font (size 1.27 1.27))))
727-
)
728-
(pin power_in line (at 13.97 3.81 180) (length 2.54)
729-
(name "5V" (effects (font (size 1.27 1.27))))
730-
(number "15" (effects (font (size 1.27 1.27))))
731-
)
732-
(pin power_in line (at 13.97 1.27 180) (length 2.54)
733-
(name "5V" (effects (font (size 1.27 1.27))))
734-
(number "16" (effects (font (size 1.27 1.27))))
735-
)
736-
(pin power_in line (at 13.97 -1.27 180) (length 2.54)
737-
(name "3V3" (effects (font (size 1.27 1.27))))
738-
(number "17" (effects (font (size 1.27 1.27))))
739-
)
740-
(pin power_in line (at 13.97 -3.81 180) (length 2.54)
741-
(name "3V3" (effects (font (size 1.27 1.27))))
742-
(number "18" (effects (font (size 1.27 1.27))))
743-
)
744-
(pin power_in line (at -15.24 -13.97 0) (length 2.54)
745-
(name "GND" (effects (font (size 1.27 1.27))))
746-
(number "19" (effects (font (size 1.27 1.27))))
747-
)
748-
(pin power_in line (at -15.24 -6.35 0) (length 2.54)
749-
(name "GND" (effects (font (size 1.27 1.27))))
750-
(number "2" (effects (font (size 1.27 1.27))))
751-
)
752-
(pin power_in line (at -15.24 -16.51 0) (length 2.54)
753-
(name "GND" (effects (font (size 1.27 1.27))))
754-
(number "20" (effects (font (size 1.27 1.27))))
755-
)
756-
(pin tri_state line (at -15.24 8.89 0) (length 2.54)
757-
(name "SPI_CIPO" (effects (font (size 1.27 1.27))))
758-
(number "3" (effects (font (size 1.27 1.27))))
759-
)
760-
(pin power_in line (at -15.24 -8.89 0) (length 2.54)
761-
(name "GND" (effects (font (size 1.27 1.27))))
762-
(number "4" (effects (font (size 1.27 1.27))))
763-
)
764-
(pin input line (at -15.24 6.35 0) (length 2.54)
765-
(name "SPI_CLK" (effects (font (size 1.27 1.27))))
766-
(number "5" (effects (font (size 1.27 1.27))))
767-
)
768-
(pin power_in line (at -15.24 -11.43 0) (length 2.54)
769-
(name "GND" (effects (font (size 1.27 1.27))))
770-
(number "6" (effects (font (size 1.27 1.27))))
771-
)
772-
(pin input line (at -15.24 3.81 0) (length 2.54)
773-
(name "~{SPI_CS}" (effects (font (size 1.27 1.27))))
774-
(number "7" (effects (font (size 1.27 1.27))))
775-
)
776-
(pin output line (at -15.24 1.27 0) (length 2.54)
777-
(name "~{IRQ}" (effects (font (size 1.27 1.27))))
778-
(number "8" (effects (font (size 1.27 1.27))))
779-
)
780-
(pin bidirectional line (at 13.97 8.89 180) (length 2.54)
781-
(name "I2C_SDA" (effects (font (size 1.27 1.27))))
782-
(number "9" (effects (font (size 1.27 1.27))))
783-
)
784-
)
785-
(symbol "Neotron-Expansion-Slot_3_0_1"
786-
(rectangle (start -12.7 13.97) (end 11.43 -19.05)
787-
(stroke (width 0) (type default) (color 0 0 0 0))
788-
(fill (type background))
789-
)
790-
)
791-
)
792687
(symbol "power:+3V3" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
793688
(property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
794689
(effects (font (size 1.27 1.27)) hide)
@@ -2990,7 +2885,7 @@
29902885
(pin "1" (uuid e03e9f6d-f2b9-4ae3-aab6-5815d5a33602))
29912886
)
29922887
2993-
(symbol (lib_name "Neotron-Expansion-Slot_3") (lib_id "Neotron-Common-Hardware:Neotron-Expansion-Slot") (at 117.475 97.155 0) (unit 1)
2888+
(symbol (lib_id "Neotron-Common-Hardware:Neotron-Expansion-Slot") (at 117.475 97.155 0) (unit 1)
29942889
(in_bom yes) (on_board yes)
29952890
(uuid 1232369c-b7f9-4f81-bf22-dce5c62eaebc)
29962891
(property "Reference" "J903" (id 0) (at 116.84 78.994 0))

Kicad/fp-lib-table

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
(fp_lib_table
22
(lib (name "neotron-pico")(type "KiCad")(uri "${KIPRJMOD}/neotron-pico.pretty")(options "")(descr ""))
3+
(lib (name "Neotron-Common-Hardware")(type "KiCad")(uri "${KIPRJMOD}/Neotron-Common-Hardware/Kicad/Neotron-Common-Hardware.pretty")(options "")(descr ""))
34
)

Kicad/neotron-pico.kicad_pro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
]
515515
],
516516
"text_variables": {
517-
"date": "2000-01-01",
518-
"version": "Uncontrolled"
517+
"date": "2022-12-26",
518+
"version": "398ac1a"
519519
}
520-
}
520+
}

Kicad/sym-lib-table

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
(sym_lib_table
2-
(lib (name "Neotron-Common-Hardware")(type "Legacy")(uri "${KIPRJMOD}/Neotron-Common-Hardware/Kicad/Neotron-Common-Hardware.lib")(options "")(descr ""))
32
(lib (name "neotron-pico")(type "KiCad")(uri "${KIPRJMOD}/neotron-pico.kicad_sym")(options "")(descr ""))
3+
(lib (name "Neotron-Common-Hardware")(type "KiCad")(uri "${KIPRJMOD}/Neotron-Common-Hardware/Kicad/Neotron-Common-Hardware.kicad_sym")(options "")(descr ""))
44
)

0 commit comments

Comments
 (0)