From 7d2af468b3159b8037f2c3c2f18461a645ec7654 Mon Sep 17 00:00:00 2001 From: WillardFarmer Date: Fri, 29 Nov 2019 20:56:25 -0700 Subject: [PATCH] Button and LCD Pin changes --- final_project/hw/DAC.sch | 1 - final_project/hw/amp.sch | 1 - final_project/hw/final_project-cache.lib | 160 +++++++++++----------- final_project/hw/final_project-rescue.dcm | 3 + final_project/hw/final_project-rescue.lib | 83 +++++++++++ final_project/hw/final_project.sch | 115 ++++++++-------- final_project/hw/sym-lib-table | 1 + 7 files changed, 224 insertions(+), 140 deletions(-) create mode 100644 final_project/hw/final_project-rescue.dcm create mode 100644 final_project/hw/final_project-rescue.lib diff --git a/final_project/hw/DAC.sch b/final_project/hw/DAC.sch index 8be6da2..8cd5fdf 100644 --- a/final_project/hw/DAC.sch +++ b/final_project/hw/DAC.sch @@ -1,5 +1,4 @@ EESchema Schematic File Version 4 -LIBS:final_project-cache EELAYER 30 0 EELAYER END $Descr A4 11693 8268 diff --git a/final_project/hw/amp.sch b/final_project/hw/amp.sch index 4fb5383..83c5fcd 100644 --- a/final_project/hw/amp.sch +++ b/final_project/hw/amp.sch @@ -1,5 +1,4 @@ EESchema Schematic File Version 4 -LIBS:final_project-cache EELAYER 30 0 EELAYER END $Descr A4 11693 8268 diff --git a/final_project/hw/final_project-cache.lib b/final_project/hw/final_project-cache.lib index bee4bf1..876be8c 100644 --- a/final_project/hw/final_project-cache.lib +++ b/final_project/hw/final_project-cache.lib @@ -150,87 +150,6 @@ X 3 3 0 -150 50 U 50 50 1 1 P ENDDRAW ENDDEF # -# MCU_Microchip_ATmega_ATmega328-PU -# -DEF MCU_Microchip_ATmega_ATmega328-PU U 0 20 Y Y 1 F N -F0 "U" -500 1450 50 H V L BNN -F1 "MCU_Microchip_ATmega_ATmega328-PU" 100 -1450 50 H V L TNN -F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN -F3 "" 0 0 50 H I C CNN -ALIAS ATmega48P-20PU ATmega48A-PU ATmega48PA-PU ATmega88PV-10PU ATmega88P-20PU ATmega88A-PU ATmega88PA-PU ATmega168PV-10PU ATmega168P-20PU ATmega168A-PU ATmega168PA-PU ATmega328-PU ATmega328P-PU -$FPLIST - DIP*W7.62mm* -$ENDFPLIST -DRAW -S -500 -1400 500 1400 0 1 10 f -X ~RESET~/PC6 1 600 -300 100 L 50 50 1 1 T -X XTAL2/PB7 10 600 500 100 L 50 50 1 1 T -X PD5 11 600 -1000 100 L 50 50 1 1 T -X PD6 12 600 -1100 100 L 50 50 1 1 T -X PD7 13 600 -1200 100 L 50 50 1 1 T -X PB0 14 600 1200 100 L 50 50 1 1 T -X PB1 15 600 1100 100 L 50 50 1 1 T -X PB2 16 600 1000 100 L 50 50 1 1 T -X PB3 17 600 900 100 L 50 50 1 1 T -X PB4 18 600 800 100 L 50 50 1 1 T -X PB5 19 600 700 100 L 50 50 1 1 T -X PD0 2 600 -500 100 L 50 50 1 1 T -X AVCC 20 100 1500 100 D 50 50 1 1 W -X AREF 21 -600 1200 100 R 50 50 1 1 P -X GND 22 0 -1500 100 U 50 50 1 1 P N -X PC0 23 600 300 100 L 50 50 1 1 T -X PC1 24 600 200 100 L 50 50 1 1 T -X PC2 25 600 100 100 L 50 50 1 1 T -X PC3 26 600 0 100 L 50 50 1 1 T -X PC4 27 600 -100 100 L 50 50 1 1 T -X PC5 28 600 -200 100 L 50 50 1 1 T -X PD1 3 600 -600 100 L 50 50 1 1 T -X PD2 4 600 -700 100 L 50 50 1 1 T -X PD3 5 600 -800 100 L 50 50 1 1 T -X PD4 6 600 -900 100 L 50 50 1 1 T -X VCC 7 0 1500 100 D 50 50 1 1 W -X GND 8 0 -1500 100 U 50 50 1 1 W -X XTAL1/PB6 9 600 600 100 L 50 50 1 1 T -ENDDRAW -ENDDEF -# -# MCU_Microchip_ATtiny_ATtiny2313-20MU -# -DEF MCU_Microchip_ATtiny_ATtiny2313-20MU U 0 20 Y Y 1 F N -F0 "U" -500 1050 50 H V L BNN -F1 "MCU_Microchip_ATtiny_ATtiny2313-20MU" 100 -1050 50 H V L TNN -F2 "Package_DFN_QFN:MLF-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN -F3 "" 0 0 50 H I C CNN -ALIAS ATtiny2313-20MU ATtiny2313A-MU ATtiny4313-MU -$FPLIST - MLF*1EP*4x4mm*P0.5mm* -$ENDFPLIST -DRAW -S -500 -1000 500 1000 0 1 10 f -X PD1 1 600 -200 100 L 50 50 1 1 T -X PB0 10 600 800 100 L 50 50 1 1 T -X PB1 11 600 700 100 L 50 50 1 1 T -X PB2 12 600 600 100 L 50 50 1 1 T -X PB3 13 600 500 100 L 50 50 1 1 T -X PB4 14 600 400 100 L 50 50 1 1 T -X PB5 15 600 300 100 L 50 50 1 1 T -X PB6 16 600 200 100 L 50 50 1 1 T -X PB7 17 600 100 100 L 50 50 1 1 T -X VCC 18 0 1100 100 D 50 50 1 1 W -X PA2/~RESET 19 -600 800 100 R 50 50 1 1 T -X PA1/XTAL2 2 -600 400 100 R 50 50 1 1 T -X PD0 20 600 -100 100 L 50 50 1 1 T -X GND 21 0 -1100 100 U 50 50 1 1 P N -X PA0/XTAL1 3 -600 600 100 R 50 50 1 1 T -X PD2 4 600 -300 100 L 50 50 1 1 T -X PD3 5 600 -400 100 L 50 50 1 1 T -X PD4 6 600 -500 100 L 50 50 1 1 T -X PD5 7 600 -600 100 L 50 50 1 1 T -X GND 8 0 -1100 100 U 50 50 1 1 W -X PD6 9 600 -700 100 L 50 50 1 1 T -ENDDRAW -ENDDEF -# # Regulator_Linear_AP2112K-3.3 # DEF Regulator_Linear_AP2112K-3.3 U 0 10 Y Y 1 F N @@ -297,6 +216,85 @@ X D2 9 -250 -600 100 R 50 50 1 1 B ENDDRAW ENDDEF # +# final_project-rescue_ATmega328-PU-MCU_Microchip_ATmega +# +DEF final_project-rescue_ATmega328-PU-MCU_Microchip_ATmega U 0 20 Y Y 1 F N +F0 "U" -500 1450 50 H V L BNN +F1 "final_project-rescue_ATmega328-PU-MCU_Microchip_ATmega" 100 -1450 50 H V L TNN +F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN +F3 "" 0 0 50 H I C CNN +$FPLIST + DIP*W7.62mm* +$ENDFPLIST +DRAW +S -500 -1400 500 1400 0 1 10 f +X ~RESET~/PC6 1 600 -300 100 L 50 50 1 1 T +X XTAL2/PB7 10 600 500 100 L 50 50 1 1 T +X PD5 11 600 -1000 100 L 50 50 1 1 T +X PD6 12 600 -1100 100 L 50 50 1 1 T +X PD7 13 600 -1200 100 L 50 50 1 1 T +X PB0 14 600 1200 100 L 50 50 1 1 T +X PB1 15 600 1100 100 L 50 50 1 1 T +X PB2 16 600 1000 100 L 50 50 1 1 T +X PB3 17 600 900 100 L 50 50 1 1 T +X PB4 18 600 800 100 L 50 50 1 1 T +X PB5 19 600 700 100 L 50 50 1 1 T +X PD0 2 600 -500 100 L 50 50 1 1 T +X AVCC 20 100 1500 100 D 50 50 1 1 W +X AREF 21 -600 1200 100 R 50 50 1 1 P +X GND 22 0 -1500 100 U 50 50 1 1 P N +X PC0 23 600 300 100 L 50 50 1 1 T +X PC1 24 600 200 100 L 50 50 1 1 T +X PC2 25 600 100 100 L 50 50 1 1 T +X PC3 26 600 0 100 L 50 50 1 1 T +X PC4 27 600 -100 100 L 50 50 1 1 T +X PC5 28 600 -200 100 L 50 50 1 1 T +X PD1 3 600 -600 100 L 50 50 1 1 T +X PD2 4 600 -700 100 L 50 50 1 1 T +X PD3 5 600 -800 100 L 50 50 1 1 T +X PD4 6 600 -900 100 L 50 50 1 1 T +X VCC 7 0 1500 100 D 50 50 1 1 W +X GND 8 0 -1500 100 U 50 50 1 1 W +X XTAL1/PB6 9 600 600 100 L 50 50 1 1 T +ENDDRAW +ENDDEF +# +# final_project-rescue_ATtiny2313-20MU-MCU_Microchip_ATtiny +# +DEF final_project-rescue_ATtiny2313-20MU-MCU_Microchip_ATtiny U 0 20 Y Y 1 F N +F0 "U" -500 1050 50 H V L BNN +F1 "final_project-rescue_ATtiny2313-20MU-MCU_Microchip_ATtiny" 100 -1050 50 H V L TNN +F2 "Package_DFN_QFN:MLF-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN +F3 "" 0 0 50 H I C CNN +$FPLIST + MLF*1EP*4x4mm*P0.5mm* +$ENDFPLIST +DRAW +S -500 -1000 500 1000 0 1 10 f +X PD1 1 600 -200 100 L 50 50 1 1 T +X PB0 10 600 800 100 L 50 50 1 1 T +X PB1 11 600 700 100 L 50 50 1 1 T +X PB2 12 600 600 100 L 50 50 1 1 T +X PB3 13 600 500 100 L 50 50 1 1 T +X PB4 14 600 400 100 L 50 50 1 1 T +X PB5 15 600 300 100 L 50 50 1 1 T +X PB6 16 600 200 100 L 50 50 1 1 T +X PB7 17 600 100 100 L 50 50 1 1 T +X VCC 18 0 1100 100 D 50 50 1 1 W +X PA2/~RESET 19 -600 800 100 R 50 50 1 1 T +X PA1/XTAL2 2 -600 400 100 R 50 50 1 1 T +X PD0 20 600 -100 100 L 50 50 1 1 T +X GND 21 0 -1100 100 U 50 50 1 1 P N +X PA0/XTAL1 3 -600 600 100 R 50 50 1 1 T +X PD2 4 600 -300 100 L 50 50 1 1 T +X PD3 5 600 -400 100 L 50 50 1 1 T +X PD4 6 600 -500 100 L 50 50 1 1 T +X PD5 7 600 -600 100 L 50 50 1 1 T +X GND 8 0 -1100 100 U 50 50 1 1 W +X PD6 9 600 -700 100 L 50 50 1 1 T +ENDDRAW +ENDDEF +# # power_+3V3 # DEF power_+3V3 #PWR 0 0 Y Y 1 F P diff --git a/final_project/hw/final_project-rescue.dcm b/final_project/hw/final_project-rescue.dcm new file mode 100644 index 0000000..5f3ed79 --- /dev/null +++ b/final_project/hw/final_project-rescue.dcm @@ -0,0 +1,3 @@ +EESchema-DOCLIB Version 2.0 +# +#End Doc Library diff --git a/final_project/hw/final_project-rescue.lib b/final_project/hw/final_project-rescue.lib new file mode 100644 index 0000000..f7fbf5a --- /dev/null +++ b/final_project/hw/final_project-rescue.lib @@ -0,0 +1,83 @@ +EESchema-LIBRARY Version 2.4 +#encoding utf-8 +# +# ATmega328-PU-MCU_Microchip_ATmega +# +DEF ATmega328-PU-MCU_Microchip_ATmega U 0 20 Y Y 1 F N +F0 "U" -500 1450 50 H V L BNN +F1 "ATmega328-PU-MCU_Microchip_ATmega" 100 -1450 50 H V L TNN +F2 "Package_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN +F3 "" 0 0 50 H I C CNN +$FPLIST + DIP*W7.62mm* +$ENDFPLIST +DRAW +S -500 -1400 500 1400 0 1 10 f +X ~RESET~/PC6 1 600 -300 100 L 50 50 1 1 T +X XTAL2/PB7 10 600 500 100 L 50 50 1 1 T +X PD5 11 600 -1000 100 L 50 50 1 1 T +X PD6 12 600 -1100 100 L 50 50 1 1 T +X PD7 13 600 -1200 100 L 50 50 1 1 T +X PB0 14 600 1200 100 L 50 50 1 1 T +X PB1 15 600 1100 100 L 50 50 1 1 T +X PB2 16 600 1000 100 L 50 50 1 1 T +X PB3 17 600 900 100 L 50 50 1 1 T +X PB4 18 600 800 100 L 50 50 1 1 T +X PB5 19 600 700 100 L 50 50 1 1 T +X PD0 2 600 -500 100 L 50 50 1 1 T +X AVCC 20 100 1500 100 D 50 50 1 1 W +X AREF 21 -600 1200 100 R 50 50 1 1 P +X GND 22 0 -1500 100 U 50 50 1 1 P N +X PC0 23 600 300 100 L 50 50 1 1 T +X PC1 24 600 200 100 L 50 50 1 1 T +X PC2 25 600 100 100 L 50 50 1 1 T +X PC3 26 600 0 100 L 50 50 1 1 T +X PC4 27 600 -100 100 L 50 50 1 1 T +X PC5 28 600 -200 100 L 50 50 1 1 T +X PD1 3 600 -600 100 L 50 50 1 1 T +X PD2 4 600 -700 100 L 50 50 1 1 T +X PD3 5 600 -800 100 L 50 50 1 1 T +X PD4 6 600 -900 100 L 50 50 1 1 T +X VCC 7 0 1500 100 D 50 50 1 1 W +X GND 8 0 -1500 100 U 50 50 1 1 W +X XTAL1/PB6 9 600 600 100 L 50 50 1 1 T +ENDDRAW +ENDDEF +# +# ATtiny2313-20MU-MCU_Microchip_ATtiny +# +DEF ATtiny2313-20MU-MCU_Microchip_ATtiny U 0 20 Y Y 1 F N +F0 "U" -500 1050 50 H V L BNN +F1 "ATtiny2313-20MU-MCU_Microchip_ATtiny" 100 -1050 50 H V L TNN +F2 "Package_DFN_QFN:MLF-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" 0 0 50 H I C CIN +F3 "" 0 0 50 H I C CNN +$FPLIST + MLF*1EP*4x4mm*P0.5mm* +$ENDFPLIST +DRAW +S -500 -1000 500 1000 0 1 10 f +X PD1 1 600 -200 100 L 50 50 1 1 T +X PB0 10 600 800 100 L 50 50 1 1 T +X PB1 11 600 700 100 L 50 50 1 1 T +X PB2 12 600 600 100 L 50 50 1 1 T +X PB3 13 600 500 100 L 50 50 1 1 T +X PB4 14 600 400 100 L 50 50 1 1 T +X PB5 15 600 300 100 L 50 50 1 1 T +X PB6 16 600 200 100 L 50 50 1 1 T +X PB7 17 600 100 100 L 50 50 1 1 T +X VCC 18 0 1100 100 D 50 50 1 1 W +X PA2/~RESET 19 -600 800 100 R 50 50 1 1 T +X PA1/XTAL2 2 -600 400 100 R 50 50 1 1 T +X PD0 20 600 -100 100 L 50 50 1 1 T +X GND 21 0 -1100 100 U 50 50 1 1 P N +X PA0/XTAL1 3 -600 600 100 R 50 50 1 1 T +X PD2 4 600 -300 100 L 50 50 1 1 T +X PD3 5 600 -400 100 L 50 50 1 1 T +X PD4 6 600 -500 100 L 50 50 1 1 T +X PD5 7 600 -600 100 L 50 50 1 1 T +X GND 8 0 -1100 100 U 50 50 1 1 W +X PD6 9 600 -700 100 L 50 50 1 1 T +ENDDRAW +ENDDEF +# +#End Library diff --git a/final_project/hw/final_project.sch b/final_project/hw/final_project.sch index c995405..a0cad2e 100644 --- a/final_project/hw/final_project.sch +++ b/final_project/hw/final_project.sch @@ -1,5 +1,4 @@ EESchema Schematic File Version 4 -LIBS:final_project-cache EELAYER 30 0 EELAYER END $Descr A4 11693 8268 @@ -15,7 +14,7 @@ Comment3 "" Comment4 "" $EndDescr $Comp -L MCU_Microchip_ATmega:ATmega328-PU U? +L final_project-rescue:ATmega328-PU-MCU_Microchip_ATmega U? U 1 1 5DDD9932 P 3450 2950 F 0 "U?" H 2806 2996 50 0000 R CNN @@ -25,17 +24,6 @@ F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/ATmega328_P%20AVR%20MCU%20w 1 3450 2950 1 0 0 -1 $EndComp -$Comp -L MCU_Microchip_ATtiny:ATtiny2313-20MU U? -U 1 1 5DDDA525 -P 6650 2550 -F 0 "U?" H 6650 3831 50 0000 C CNN -F 1 "ATtiny2313-20MU" H 6650 3740 50 0000 C CNN -F 2 "Package_DFN_QFN:MLF-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" H 6650 2550 50 0001 C CIN -F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf" H 6650 2550 50 0001 C CNN - 1 6650 2550 - 1 0 0 -1 -$EndComp Wire Wire Line 4050 2250 4250 2250 Wire Wire Line @@ -120,14 +108,6 @@ F 3 "" H 5150 3000 50 0001 C CNN 1 5150 3000 1 0 0 -1 $EndComp -Wire Wire Line - 7250 2650 7450 2650 -Wire Wire Line - 7250 2750 7450 2750 -Text Label 7450 2650 0 50 ~ 0 -TXD -Text Label 7450 2750 0 50 ~ 0 -RXD Wire Wire Line 4050 1750 4500 1750 Wire Wire Line @@ -172,10 +152,6 @@ Wire Wire Line 3450 1450 3450 1300 Wire Wire Line 3450 4450 3450 4600 -Wire Wire Line - 6650 1450 6650 1150 -Wire Wire Line - 6650 3650 6650 3800 $Comp L power:+5V #PWR? U 1 1 5DDEFED6 @@ -188,17 +164,6 @@ F 3 "" H 3450 1300 50 0001 C CNN 1 0 0 -1 $EndComp $Comp -L power:+5V #PWR? -U 1 1 5DDF0261 -P 6650 1150 -F 0 "#PWR?" H 6650 1000 50 0001 C CNN -F 1 "+5V" H 6665 1323 50 0000 C CNN -F 2 "" H 6650 1150 50 0001 C CNN -F 3 "" H 6650 1150 50 0001 C CNN - 1 6650 1150 - 1 0 0 -1 -$EndComp -$Comp L power:GND #PWR? U 1 1 5DDF0E43 P 3450 4600 @@ -220,27 +185,6 @@ F 3 "" H 6650 3800 50 0001 C CNN 1 6650 3800 1 0 0 -1 $EndComp -Text Label 7250 1750 0 50 ~ 0 -LCD_D4 -Text Label 7250 1850 0 50 ~ 0 -LCD_D5 -Text Label 7250 2050 0 50 ~ 0 -LCD_D7 -Text Label 7250 1950 0 50 ~ 0 -LCD_D6 -Text Label 7250 2150 0 50 ~ 0 -LCD_RS -Text Label 7250 2250 0 50 ~ 0 -LCD_RW -Text Label 7250 3050 0 50 ~ 0 -BUT1 -Text Label 7250 2950 0 50 ~ 0 -BUT2 -Text Label 7250 3150 0 50 ~ 0 -BUT0 -NoConn ~ 6050 1750 -NoConn ~ 6050 2150 -NoConn ~ 6050 1950 NoConn ~ 4050 3250 NoConn ~ 2850 1750 NoConn ~ 3550 1450 @@ -784,4 +728,61 @@ F 3 "" H 8050 4100 50 0001 C CNN 1 8050 4100 1 0 0 -1 $EndComp +NoConn ~ 6050 1950 +NoConn ~ 6050 2150 +NoConn ~ 6050 1750 +Text Label 7250 1750 0 50 ~ 0 +LCD_RW +Text Label 7250 3250 0 50 ~ 0 +LCD_RS +Text Label 7250 2350 0 50 ~ 0 +LCD_D6 +Text Label 7250 2450 0 50 ~ 0 +LCD_D7 +Text Label 7250 2250 0 50 ~ 0 +LCD_D5 +Text Label 7250 2150 0 50 ~ 0 +LCD_D4 +$Comp +L power:+5V #PWR? +U 1 1 5DDF0261 +P 6650 1150 +F 0 "#PWR?" H 6650 1000 50 0001 C CNN +F 1 "+5V" H 6665 1323 50 0000 C CNN +F 2 "" H 6650 1150 50 0001 C CNN +F 3 "" H 6650 1150 50 0001 C CNN + 1 6650 1150 + 1 0 0 -1 +$EndComp +Wire Wire Line + 6650 3650 6650 3800 +Wire Wire Line + 6650 1450 6650 1150 +Text Label 7450 2750 0 50 ~ 0 +RXD +Text Label 7450 2650 0 50 ~ 0 +TXD +Wire Wire Line + 7250 2750 7450 2750 +Wire Wire Line + 7250 2650 7450 2650 +$Comp +L final_project-rescue:ATtiny2313-20MU-MCU_Microchip_ATtiny U? +U 1 1 5DDDA525 +P 6650 2550 +F 0 "U?" H 6650 3831 50 0000 C CNN +F 1 "ATtiny2313-20MU" H 6650 3740 50 0000 C CNN +F 2 "Package_DFN_QFN:MLF-20-1EP_4x4mm_P0.5mm_EP2.6x2.6mm" H 6650 2550 50 0001 C CIN +F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2543-AVR-ATtiny2313_Datasheet.pdf" H 6650 2550 50 0001 C CNN + 1 6650 2550 + 1 0 0 -1 +$EndComp +Text Label 7250 1950 0 50 ~ 0 +BUT_RED +Text Label 6050 2150 2 50 ~ 0 +BUT_RIGHT +Text Label 6050 1950 2 50 ~ 0 +BUT_LEFT +Text Label 7250 1850 0 50 ~ 0 +E $EndSCHEMATC diff --git a/final_project/hw/sym-lib-table b/final_project/hw/sym-lib-table index ef56c80..a6b4024 100644 --- a/final_project/hw/sym-lib-table +++ b/final_project/hw/sym-lib-table @@ -1,3 +1,4 @@ (sym_lib_table (lib (name final)(type Legacy)(uri ${KIPRJMOD}/final.lib)(options "")(descr "")) + (lib (name final_project-rescue)(type Legacy)(uri ${KIPRJMOD}/final_project-rescue.lib)(options "")(descr "")) )