From a24aacf399efacce797f0bf0c94add9b667756f1 Mon Sep 17 00:00:00 2001 From: Forrest Erickson Date: Sun, 5 Apr 2026 07:18:08 -0400 Subject: [PATCH 1/3] PWA_REV2.kicad_pcb, Resolved merge conflicts by removing the PWA_REV2 merges on Tac sitches and an unknown path command --- PWA_REV2/PWA_REV2.kicad_pcb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/PWA_REV2/PWA_REV2.kicad_pcb b/PWA_REV2/PWA_REV2.kicad_pcb index b591a381..281e902f 100644 --- a/PWA_REV2/PWA_REV2.kicad_pcb +++ b/PWA_REV2/PWA_REV2.kicad_pcb @@ -2321,13 +2321,8 @@ (property "Distributor 2" "Digikey") (property "Distributor 2 PN" "450-1804-ND") (property "Family" "Tactile Switches") -<<<<<<< HEAD (property "MPN" "TE Connectivity 1825910-7") (property "MPN 2" "") -======= - (property "MPN" "TE Connectivity 1825910-7, Dongguan Guangzhu Industrial ") - (property "MPN 2" "TS6685H-250gf") ->>>>>>> Rev2PWA (property "Manufacturer" "TE Connectivity ALCOSWITCH Switches") (property "Manufacturer 2" "YE") (property "Sheetfile" "PWA_REV2.kicad_sch") @@ -17087,10 +17082,6 @@ (property "Sheetname" "LCD And I2C Interface") (property "ki_description" "Potentiometer") (property "ki_keywords" "resistor variable") -<<<<<<< HEAD -======= - (path "/00000000-0000-0000-0000-000062b871ee/e6b2915e-b2de-400e-841f-313969e9ee14") ->>>>>>> Rev2PWA (attr through_hole) (fp_text reference "RV301" (at -1.651 -3.048 270) (layer "B.SilkS") (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) From 689c1b80a5a25d0826ff7cfe7088bf12d98b1c9c Mon Sep 17 00:00:00 2001 From: Forrest Erickson Date: Sun, 5 Apr 2026 07:30:39 -0400 Subject: [PATCH 2/3] AlarmAudio.kicad_sch, add JLCPCB part number to 1x8 sockets. PWA_REV2.kicad_pcb, offet Mini MP3 player up 7mm. --- PWA_REV2/AlarmAudio.kicad_sch | 4 ++-- PWA_REV2/PWA_REV2.kicad_pcb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PWA_REV2/AlarmAudio.kicad_sch b/PWA_REV2/AlarmAudio.kicad_sch index e5bb8da6..cc4b609c 100644 --- a/PWA_REV2/AlarmAudio.kicad_sch +++ b/PWA_REV2/AlarmAudio.kicad_sch @@ -2065,7 +2065,7 @@ (property "Distributor 1" "JLCPCB" (at 251.46 113.03 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Distributor 1 PN" "JLCPCB" (at 251.46 113.03 0) + (property "Distributor 1 PN" "C27438" (at 251.46 113.03 0) (effects (font (size 1.27 1.27)) hide) ) (property "MPN" "2.54-1*8P母环保" (at 251.46 113.03 0) @@ -2112,7 +2112,7 @@ (property "Distributor 1" "JLCPCB" (at 269.24 115.57 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Distributor 1 PN" "JLCPCB" (at 269.24 115.57 0) + (property "Distributor 1 PN" "C27438" (at 269.24 115.57 0) (effects (font (size 1.27 1.27)) hide) ) (property "MPN" "2.54-1*8P母环保" (at 269.24 115.57 0) diff --git a/PWA_REV2/PWA_REV2.kicad_pcb b/PWA_REV2/PWA_REV2.kicad_pcb index 281e902f..1b3731f3 100644 --- a/PWA_REV2/PWA_REV2.kicad_pcb +++ b/PWA_REV2/PWA_REV2.kicad_pcb @@ -5387,7 +5387,7 @@ (pad "16" thru_hole oval locked (at 17.78 0 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask") (net 145 "Net-(J603-BUSY)") (pinfunction "BUSY") (pintype "output") (tstamp 237c7298-ae7f-4f13-9505-fe6361589819)) (model "${KIPRJMOD}/Parts/DFR0299--3DModel-STEP-56544.STEP" - (offset (xyz 8.89 -8.89 0)) + (offset (xyz 8.89 -8.89 7)) (scale (xyz 1 1 1)) (rotate (xyz -90 0 0)) ) From 8abcdafd05c37865bb23e8a13b449e4d108b0be2 Mon Sep 17 00:00:00 2001 From: Forrest Erickson Date: Sun, 5 Apr 2026 08:24:57 -0400 Subject: [PATCH 3/3] PWA_REV2.kicad_pcb, change footprint for DB9 from KiCAD 6 library to KiCad7 Library. --- PWA_REV2/PWA_REV2.kicad_pcb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWA_REV2/PWA_REV2.kicad_pcb b/PWA_REV2/PWA_REV2.kicad_pcb index 1b3731f3..da57b3a8 100644 --- a/PWA_REV2/PWA_REV2.kicad_pcb +++ b/PWA_REV2/PWA_REV2.kicad_pcb @@ -6396,7 +6396,7 @@ (net 124 "/RS232/DCE_CTS") (pinfunction "8") (pintype "passive") (tstamp 36044b48-0830-4a0b-95b6-990f497601df)) (pad "9" thru_hole circle locked (at -9.695 2.84) (size 1.6 1.6) (drill 1) (layers "*.Cu" "*.Mask") (net 125 "unconnected-(J701-Pad9)") (pinfunction "9") (pintype "passive+no_connect") (tstamp e5851e5e-9e91-44f6-9780-bb042997e9c8)) - (model "${KICAD6_3DMODEL_DIR}/Connector_Dsub.3dshapes/DSUB-9_Female_Horizontal_P2.77x2.84mm_EdgePinOffset9.90mm_Housed_MountingHolesOffset11.32mm.wrl" + (model "${KICAD7_3DMODEL_DIR}/Connector_Dsub.3dshapes/DSUB-9_Female_Horizontal_P2.77x2.84mm_EdgePinOffset9.90mm_Housed_MountingHolesOffset11.32mm.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) (rotate (xyz 0 0 0))