From 2159112fd4989f5192067fd8fa4039718006b005 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Thu, 30 Jul 2015 14:06:41 +1000
Subject: [PATCH 01/12] Added PIC18F25K80-I/ML series of microcontroller

28-pin QFN package

PIC18F25K80-I/ML
PIC18F26K80-I/ML
PIC18LF25K80-I/ML
PIC18LF26K80-I/ML
---
 library/microchip_pic18mcu.dcm | 12 ++++++++++
 library/microchip_pic18mcu.lib | 42 ++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index e19b2509..bc5478d8 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -264,6 +264,12 @@ K Flash Based 8-Bit Microcontroller ECAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
+$CMP PIC18F25K80_I/ML
+D PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN28 package
+K microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
 $CMP PIC18F66J60-I/PT
 D PIC18F66J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
@@ -318,4 +324,10 @@ K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
+$CMP PIC18LF25K80_I/ML
+D 28-Pin QFN Flash Microcontroller with ECAN and nanoWatt XLP Technology
+K microcontroller microchip CAN USB UART QFN SPI I2C FLASH EEPROM
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index a9f0914d..7061268f 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1272,6 +1272,48 @@ X RD1/C1INB/PSP1 39 -1400 600 150 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# PIC18F25K80_I/ML
+#
+DEF PIC18F25K80_I/ML U 0 40 Y Y 1 F N
+F0 "U" -700 950 50 H V L CNN
+F1 "PIC18F25K80_I/ML" 700 950 50 H V R CNN
+F2 "QFN28" 0 -250 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+ALIAS PIC18F26K80_I/ML PIC18LF25K80_I/ML PIC18LF26K80_I/ML
+DRAW
+S -700 900 700 -900 0 1 10 f
+X RA2/Vref-AN2 1 -800 600 100 R 50 50 1 1 I
+X RA3/Vref+AN3 2 -800 500 100 R 50 50 1 1 I
+X Vcap 3 -800 -400 100 R 50 50 1 1 I
+X RA5/AN4 4 -800 400 100 R 50 50 1 1 I
+X Vss 5 -800 -700 100 R 50 50 1 1 W
+X OSC1/CLKIN 6 -800 -100 100 R 50 50 1 1 I
+X OSC2/CLKOUT 7 -800 0 100 R 50 50 1 1 I
+X SOSCO/RC0 8 800 -100 100 L 50 50 1 1 I
+X SOSC1/RC1 9 800 -200 100 L 50 50 1 1 I
+X CCP2/RC2 10 800 -300 100 L 50 50 1 1 I
+X CANTX/INT2/RB2 20 800 600 100 L 50 50 1 1 I
+X SCL/SCK/RC3 11 800 -400 100 L 50 50 1 1 I
+X CANRX/INT3/RB3 21 800 500 100 L 50 50 1 1 I
+X SDA/SDI/RC4 12 800 -500 100 L 50 50 1 1 I
+X AN9/ECCP1/RB4 22 800 400 100 L 50 50 1 1 I
+X SDO/RC5 13 800 -600 100 L 50 50 1 1 I
+X CCP5/RB5 23 800 300 100 L 50 50 1 1 I
+X CANTX/TX1/CCP3/RC6 14 800 -700 100 L 50 50 1 1 I
+X PGC/TX2/RB6 24 800 200 100 L 50 50 1 1 I
+X CANRX/RX1/CCP4/RC7 15 800 -800 100 L 50 50 1 1 I
+X PGD/RX2/RB7 25 800 100 100 L 50 50 1 1 I
+X Vss 16 -800 -600 100 R 50 50 1 1 W
+X ~MCLR~/RE3 26 -800 200 100 R 50 50 1 1 I
+X Vdd 17 -800 -300 100 R 50 50 1 1 W
+X RA0/AN0 27 -800 800 100 R 50 50 1 1 I
+X AN10/INT0/RB0 18 800 800 100 L 50 50 1 1 I
+X RA1/AN1 28 -800 700 100 R 50 50 1 1 I
+X AN8/INT1/RB1 19 800 700 100 L 50 50 1 1 I
+X PAD 29 -800 -800 100 R 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # PIC18F66J60-I/PT
 #
 DEF PIC18F66J60-I/PT U 0 50 Y Y 1 F N

From b0d806120b6ee897c79b9d6dc84419c7810def24 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Thu, 30 Jul 2015 14:24:47 +1000
Subject: [PATCH 02/12] Added symbol for the PIC18(L)F2xK0 microcontrollers in
 SSOP-28 footprint

---
 library/microchip_pic18mcu.dcm |  6 +++++
 library/microchip_pic18mcu.lib | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index bc5478d8..8490be8e 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -270,6 +270,12 @@ K microcontroller PIC18 flash ECAN XLP nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
+$CMP PIC18F25K80_I/SS
+D PIC18 Microcontroller ADC PWM CAN SPI I2C USART in SSOP28 package
+K microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
 $CMP PIC18F66J60-I/PT
 D PIC18F66J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 7061268f..c7f987da 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1314,6 +1314,47 @@ X PAD 29 -800 -800 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# PIC18F25K80_I/SS
+#
+DEF PIC18F25K80_I/SS U 0 40 Y Y 1 F N
+F0 "U" -700 950 50 H V L CNN
+F1 "PIC18F25K80_I/SS" 700 950 50 H V R CNN
+F2 "SSOP28" 0 -250 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+ALIAS PIC18F26K80_I/SS PIC18LF25K80_I/SS PIC18LF26K80_I/SS
+DRAW
+S -700 900 700 -900 0 1 10 f
+X ~MCLR~/RE3 1 -800 200 100 R 50 50 1 1 I
+X RA0/AN0 2 -800 800 100 R 50 50 1 1 I
+X RA1/AN1 3 -800 700 100 R 50 50 1 1 I
+X RA2/Vref-AN2 4 -800 600 100 R 50 50 1 1 I
+X RA3/Vref+AN3 5 -800 500 100 R 50 50 1 1 I
+X Vcap 6 -800 -400 100 R 50 50 1 1 I
+X RA5/AN4 7 -800 400 100 R 50 50 1 1 I
+X Vss 8 -800 -600 100 R 50 50 1 1 W
+X OSC1/CLKIN 9 -800 -100 100 R 50 50 1 1 I
+X OSC2/CLKOUT 10 -800 0 100 R 50 50 1 1 I
+X SOSCO/RC0 11 800 -100 100 L 50 50 1 1 I
+X AN10/INT0/RB0 21 800 800 100 L 50 50 1 1 I
+X SOSC1/RC1 12 800 -200 100 L 50 50 1 1 I
+X AN8/INT1/RB1 22 800 700 100 L 50 50 1 1 I
+X CCP2/RC2 13 800 -300 100 L 50 50 1 1 I
+X CANTX/INT2/RB2 23 800 600 100 L 50 50 1 1 I
+X SCL/SCK/RC3 14 800 -400 100 L 50 50 1 1 I
+X CANRX/INT3/RB3 24 800 500 100 L 50 50 1 1 I
+X SDA/SDI/RC4 15 800 -500 100 L 50 50 1 1 I
+X AN9/ECCP1/RB4 25 800 400 100 L 50 50 1 1 I
+X SDO/RC5 16 800 -600 100 L 50 50 1 1 I
+X CCP5/RB5 26 800 300 100 L 50 50 1 1 I
+X CANTX/TX1/CCP3/RC6 17 800 -700 100 L 50 50 1 1 I
+X Vdd 17 -800 -300 100 R 50 50 1 1 W
+X PGC/TX2/RB6 27 800 200 100 L 50 50 1 1 I
+X CANRX/RX1/CCP4/RC7 18 800 -800 100 L 50 50 1 1 I
+X PGD/RX2/RB7 28 800 100 100 L 50 50 1 1 I
+X Vss 19 -800 -700 100 R 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # PIC18F66J60-I/PT
 #
 DEF PIC18F66J60-I/PT U 0 50 Y Y 1 F N

From 79218791887ea01b234fb7ee2ff969ecd720bc0a Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Thu, 30 Jul 2015 14:51:29 +1000
Subject: [PATCH 03/12] Added QFN-44 chips in the PIC18(L)F4XK80 series

PIC18F45K80-I/ML
PIC18F46K80-I/ML (alias)
PIC18LF45K80-I/ML (alias)
PIC18LF46K80-I/ML (alias)
---
 library/microchip_pic18mcu.dcm |  6 ++++
 library/microchip_pic18mcu.lib | 54 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 8490be8e..a9f33f1e 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -276,6 +276,12 @@ K microcontroller PIC18 flash ECAN XLP nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
+$CMP PIC18F45K80-I/ML
+D Microchip PIC18F series enhanced flash microcontroller with ECAN and nanoWatt XLP Technology in QFN-44 package
+K microcontroller Flash EEPROM SPI I2C CAN UART USART ADC
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
 $CMP PIC18F66J60-I/PT
 D PIC18F66J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index c7f987da..a45f327e 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1355,6 +1355,60 @@ X Vss 19 -800 -700 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# PIC18F45K80-I/ML
+#
+DEF PIC18F45K80-I/ML U 0 40 Y Y 1 F N
+F0 "U" -900 1150 50 H V L CNN
+F1 "PIC18F45K80-I/ML" -900 -1150 50 H V L CNN
+F2 "QFN44" 0 -800 50 H V C CNN
+F3 "" -650 -100 50 H V C CNN
+ALIAS PIC18F46K80-I/ML PIC18LF45K80-I/ML PIC18LF26K80-I/ML
+DRAW
+S -900 1100 900 -1100 0 1 10 f
+X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 I
+X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 I
+X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 I
+X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 I
+X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 I
+X Vss 6 -50 -1200 100 U 50 50 1 1 W
+X Vdd 7 100 1200 100 D 50 50 1 1 W
+X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 I
+X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 I
+X RB2/CANTX/INT2 10 -1000 200 100 R 50 50 1 1 I
+X RA1/AN1 20 -1000 900 100 R 50 50 1 1 I
+X OSC1/CLKIN/RA7 30 -1000 -500 100 R 50 50 1 1 I
+X C2INA/PSP2/RD2 40 1000 -100 100 L 50 50 1 1 I
+X RB3/CANRX/INT3 11 -1000 100 100 R 50 50 1 1 I
+X RA2/Vref-/AN2 21 -1000 800 100 R 50 50 1 1 I
+X OSC2/CLKOUT/RA6 31 -1000 -600 100 R 50 50 1 1 I
+X C2INB/PSP3/RD3 41 1000 -200 100 L 50 50 1 1 I
+X RA3/Vref+/AN3 22 -1000 700 100 R 50 50 1 1 I
+X RC0 32 1000 1000 100 L 50 50 1 1 I
+X SDA/SDI/RC4 42 1000 600 100 L 50 50 1 1 I
+X Vddcore/Vcap 23 -1000 -1000 100 R 50 50 1 1 I
+X SDO/RC5 43 1000 500 100 L 50 50 1 1 I
+X RB4/AN9 14 -1000 0 100 R 50 50 1 1 I
+X RA5/AN4 24 -1000 600 100 R 50 50 1 1 I
+X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 I
+X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 I
+X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 I
+X RC1 35 1000 900 100 L 50 50 1 1 I
+X PAD 45 250 -1200 100 U 50 50 1 1 W
+X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 I
+X RE1/AN6 26 1000 -900 100 L 50 50 1 1 I
+X CCP2/RC2 36 1000 800 100 L 50 50 1 1 I
+X RB7/PGD 17 -1000 -300 100 R 50 50 1 1 I
+X RE2/AN7 27 1000 -800 100 L 50 50 1 1 I
+X SCL/SCK/RC3 37 1000 700 100 L 50 50 1 1 I
+X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 I
+X Vdd 28 0 1200 100 D 50 50 1 1 W
+X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 I
+X RA0/CVrefAN0 19 -1000 1000 100 R 50 50 1 1 I
+X Vss 29 50 -1200 100 U 50 50 1 1 W
+X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # PIC18F66J60-I/PT
 #
 DEF PIC18F66J60-I/PT U 0 50 Y Y 1 F N

From 17dc95051cd58d2e6be19367c1ef9bcef12a402e Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Thu, 30 Jul 2015 14:57:45 +1000
Subject: [PATCH 04/12] Added symbols for the TQFP-44 microcontrollers in the
 PIC18(L)F4xK80-I/PT range

PIC18F45K80-I/PT
PIC18F46K80-I/PT  (alias)
PIC18LF45K80-I/PT (alias)
PIC18LF46K80-I/PT (alias)
---
 library/microchip_pic18mcu.dcm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index a9f33f1e..dd448840 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -282,6 +282,12 @@ K microcontroller Flash EEPROM SPI I2C CAN UART USART ADC
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
+$CMP PIC18F45K80-I/PT
+D Microchip PIC18F series enhanced flash microcontroller with ECAN and nanoWatt XLP Technology in TQFP-44 package
+K microcontroller Flash EEPROM SPI I2C CAN UART USART ADC TQFP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
 $CMP PIC18F66J60-I/PT
 D PIC18F66J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY

From 7507414613f427147e69f4dfe53bedc0a11163b3 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Thu, 30 Jul 2015 15:18:27 +1000
Subject: [PATCH 05/12] Fixed commit for library/microchip_pic18mcu.lib

(Missed the file in previous commit)
---
 library/microchip_pic18mcu.lib | 53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index a45f327e..63eea035 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1409,6 +1409,59 @@ X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# PIC18F45K80-I/PT
+#
+DEF PIC18F45K80-I/PT U 0 40 Y Y 1 F N
+F0 "U" -900 1150 50 H V L CNN
+F1 "PIC18F45K80-I/PT" -900 -1150 50 H V L CNN
+F2 "TQFP44" 0 -800 50 H V C CNN
+F3 "" -650 -100 50 H V C CNN
+ALIAS PIC18F46K80-I/PT PIC18LF45K80-I/PT PIC18LF46K80-I/PT
+DRAW
+S -900 1100 900 -1100 0 1 10 f
+X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 I
+X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 I
+X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 I
+X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 I
+X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 I
+X Vss 6 -50 -1200 100 U 50 50 1 1 W
+X Vdd 7 100 1200 100 D 50 50 1 1 W
+X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 I
+X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 I
+X RB2/CANTX/INT2 10 -1000 200 100 R 50 50 1 1 I
+X RA1/AN1 20 -1000 900 100 R 50 50 1 1 I
+X OSC1/CLKIN/RA7 30 -1000 -500 100 R 50 50 1 1 I
+X C2INA/PSP2/RD2 40 1000 -100 100 L 50 50 1 1 I
+X RB3/CANRX/INT3 11 -1000 100 100 R 50 50 1 1 I
+X RA2/Vref-/AN2 21 -1000 800 100 R 50 50 1 1 I
+X OSC2/CLKOUT/RA6 31 -1000 -600 100 R 50 50 1 1 I
+X C2INB/PSP3/RD3 41 1000 -200 100 L 50 50 1 1 I
+X RA3/Vref+/AN3 22 -1000 700 100 R 50 50 1 1 I
+X RC0 32 1000 1000 100 L 50 50 1 1 I
+X SDA/SDI/RC4 42 1000 600 100 L 50 50 1 1 I
+X Vddcore/Vcap 23 -1000 -1000 100 R 50 50 1 1 I
+X SDO/RC5 43 1000 500 100 L 50 50 1 1 I
+X RB4/AN9 14 -1000 0 100 R 50 50 1 1 I
+X RA5/AN4 24 -1000 600 100 R 50 50 1 1 I
+X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 I
+X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 I
+X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 I
+X RC1 35 1000 900 100 L 50 50 1 1 I
+X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 I
+X RE1/AN6 26 1000 -900 100 L 50 50 1 1 I
+X CCP2/RC2 36 1000 800 100 L 50 50 1 1 I
+X RB7/PGD 17 -1000 -300 100 R 50 50 1 1 I
+X RE2/AN7 27 1000 -800 100 L 50 50 1 1 I
+X SCL/SCK/RC3 37 1000 700 100 L 50 50 1 1 I
+X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 I
+X Vdd 28 0 1200 100 D 50 50 1 1 W
+X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 I
+X RA0/CVrefAN0 19 -1000 1000 100 R 50 50 1 1 I
+X Vss 29 50 -1200 100 U 50 50 1 1 W
+X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # PIC18F66J60-I/PT
 #
 DEF PIC18F66J60-I/PT U 0 50 Y Y 1 F N

From 6174dd93e969306d0e96ada31eddf5cd1a617028 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Mon, 3 Aug 2015 14:37:21 +1000
Subject: [PATCH 06/12] Fixed alias for PIC18(L)FxxK80 series - Added
 documentation for aliases - Added description for aliases - Added keywords
 for aliases

---
 library/microchip_pic18mcu.dcm | 76 +++++++++++++++++++++++++++++++---
 library/microchip_pic18mcu.lib |  2 +-
 2 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index dd448840..0efd1ff7 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -265,29 +265,53 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F25K80_I/ML
-D PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN28 package
+D 32K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN28 package
 K microcontroller PIC18 flash ECAN XLP nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
 $CMP PIC18F25K80_I/SS
-D PIC18 Microcontroller ADC PWM CAN SPI I2C USART in SSOP28 package
+D 32K Flash, 3.5K RAM, 1K EEPROM, PIC18 Microcontroller ADC PWM CAN SPI I2C USART in SSOP28 package
+K microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18F26K80_I/ML
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN28 package
+K microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18F26K80_I/SS
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in SSOP28 package
 K microcontroller PIC18 flash ECAN XLP nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
 $CMP PIC18F45K80-I/ML
-D Microchip PIC18F series enhanced flash microcontroller with ECAN and nanoWatt XLP Technology in QFN-44 package
+D 32K Flash, 3.5K RAM, 1K EEPROM, Microchip PIC18F series enhanced flash microcontroller with ECAN and nanoWatt XLP Technology in QFN-44 package
 K microcontroller Flash EEPROM SPI I2C CAN UART USART ADC
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
 $CMP PIC18F45K80-I/PT
-D Microchip PIC18F series enhanced flash microcontroller with ECAN and nanoWatt XLP Technology in TQFP-44 package
+D 32K Flash, 3.5K RAM, 1K EEPROM, Microchip PIC18F series enhanced flash microcontroller with ECAN and nanoWatt XLP Technology in TQFP-44 package
 K microcontroller Flash EEPROM SPI I2C CAN UART USART ADC TQFP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
+$CMP PIC18F46K80-I/ML
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN44 package
+K microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18F46K80-I/PT
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in TQFP44 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
 $CMP PIC18F66J60-I/PT
 D PIC18F66J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
@@ -343,9 +367,51 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18LF25K80_I/ML
-D 28-Pin QFN Flash Microcontroller with ECAN and nanoWatt XLP Technology
+D 32K Flash, 3.5K RAM, 1K EEPROM 28-Pin QFN Flash Microcontroller with ECAN and nanoWatt XLP Technology
 K microcontroller microchip CAN USB UART QFN SPI I2C FLASH EEPROM
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
+$CMP PIC18LF25K80_I/SS
+D 32K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in SSOP28 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18LF26K80_I/ML
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN28 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18LF26K80_I/SS
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in SSOP28 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18LF45K80-I/ML
+D 32K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN44 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18LF45K80-I/PT
+D 32K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in TQFP44 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18LF46K80-I/ML
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN44 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
+$CMP PIC18LF46K80-I/PT
+D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in TQFP44 package
+K microchip microcontroller PIC18 flash ECAN XLP nanoWatt
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
+$ENDCMP
+#
 #End Doc Library
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 63eea035..d73ed079 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1362,7 +1362,7 @@ F0 "U" -900 1150 50 H V L CNN
 F1 "PIC18F45K80-I/ML" -900 -1150 50 H V L CNN
 F2 "QFN44" 0 -800 50 H V C CNN
 F3 "" -650 -100 50 H V C CNN
-ALIAS PIC18F46K80-I/ML PIC18LF45K80-I/ML PIC18LF26K80-I/ML
+ALIAS PIC18F46K80-I/ML PIC18LF45K80-I/ML PIC18LF46K80-I/ML
 DRAW
 S -900 1100 900 -1100 0 1 10 f
 X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 I

From 0d7b0185469aaf5ed0660b0cbc50cc6ec9e21477 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Mon, 3 Aug 2015 15:05:15 +1000
Subject: [PATCH 07/12] Changed pin directions on all I/O pins to
 "bidirectional"

---
 library/microchip_pic18mcu.lib | 228 ++++++++++++++++-----------------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index d73ed079..0ff1137a 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1282,34 +1282,34 @@ F3 "" 0 -50 50 H V C CNN
 ALIAS PIC18F26K80_I/ML PIC18LF25K80_I/ML PIC18LF26K80_I/ML
 DRAW
 S -700 900 700 -900 0 1 10 f
-X RA2/Vref-AN2 1 -800 600 100 R 50 50 1 1 I
-X RA3/Vref+AN3 2 -800 500 100 R 50 50 1 1 I
-X Vcap 3 -800 -400 100 R 50 50 1 1 I
-X RA5/AN4 4 -800 400 100 R 50 50 1 1 I
+X RA2/Vref-AN2 1 -800 600 100 R 50 50 1 1 B
+X RA3/Vref+AN3 2 -800 500 100 R 50 50 1 1 B
+X Vcap 3 -800 -400 100 R 50 50 1 1 W
+X RA5/AN4 4 -800 400 100 R 50 50 1 1 B
 X Vss 5 -800 -700 100 R 50 50 1 1 W
 X OSC1/CLKIN 6 -800 -100 100 R 50 50 1 1 I
 X OSC2/CLKOUT 7 -800 0 100 R 50 50 1 1 I
-X SOSCO/RC0 8 800 -100 100 L 50 50 1 1 I
-X SOSC1/RC1 9 800 -200 100 L 50 50 1 1 I
-X CCP2/RC2 10 800 -300 100 L 50 50 1 1 I
-X CANTX/INT2/RB2 20 800 600 100 L 50 50 1 1 I
-X SCL/SCK/RC3 11 800 -400 100 L 50 50 1 1 I
-X CANRX/INT3/RB3 21 800 500 100 L 50 50 1 1 I
-X SDA/SDI/RC4 12 800 -500 100 L 50 50 1 1 I
-X AN9/ECCP1/RB4 22 800 400 100 L 50 50 1 1 I
-X SDO/RC5 13 800 -600 100 L 50 50 1 1 I
-X CCP5/RB5 23 800 300 100 L 50 50 1 1 I
-X CANTX/TX1/CCP3/RC6 14 800 -700 100 L 50 50 1 1 I
-X PGC/TX2/RB6 24 800 200 100 L 50 50 1 1 I
-X CANRX/RX1/CCP4/RC7 15 800 -800 100 L 50 50 1 1 I
-X PGD/RX2/RB7 25 800 100 100 L 50 50 1 1 I
+X SOSCO/RC0 8 800 -100 100 L 50 50 1 1 B
+X SOSC1/RC1 9 800 -200 100 L 50 50 1 1 B
+X CCP2/RC2 10 800 -300 100 L 50 50 1 1 B
+X CANTX/INT2/RB2 20 800 600 100 L 50 50 1 1 B
+X SCL/SCK/RC3 11 800 -400 100 L 50 50 1 1 B
+X CANRX/INT3/RB3 21 800 500 100 L 50 50 1 1 B
+X SDA/SDI/RC4 12 800 -500 100 L 50 50 1 1 B
+X AN9/ECCP1/RB4 22 800 400 100 L 50 50 1 1 B
+X SDO/RC5 13 800 -600 100 L 50 50 1 1 B
+X CCP5/RB5 23 800 300 100 L 50 50 1 1 B
+X CANTX/TX1/CCP3/RC6 14 800 -700 100 L 50 50 1 1 B
+X PGC/TX2/RB6 24 800 200 100 L 50 50 1 1 B
+X CANRX/RX1/CCP4/RC7 15 800 -800 100 L 50 50 1 1 B
+X PGD/RX2/RB7 25 800 100 100 L 50 50 1 1 B
 X Vss 16 -800 -600 100 R 50 50 1 1 W
-X ~MCLR~/RE3 26 -800 200 100 R 50 50 1 1 I
+X ~MCLR~/RE3 26 -800 200 100 R 50 50 1 1 B
 X Vdd 17 -800 -300 100 R 50 50 1 1 W
-X RA0/AN0 27 -800 800 100 R 50 50 1 1 I
-X AN10/INT0/RB0 18 800 800 100 L 50 50 1 1 I
-X RA1/AN1 28 -800 700 100 R 50 50 1 1 I
-X AN8/INT1/RB1 19 800 700 100 L 50 50 1 1 I
+X RA0/AN0 27 -800 800 100 R 50 50 1 1 B
+X AN10/INT0/RB0 18 800 800 100 L 50 50 1 1 B
+X RA1/AN1 28 -800 700 100 R 50 50 1 1 B
+X AN8/INT1/RB1 19 800 700 100 L 50 50 1 1 B
 X PAD 29 -800 -800 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
@@ -1324,33 +1324,33 @@ F3 "" 0 -50 50 H V C CNN
 ALIAS PIC18F26K80_I/SS PIC18LF25K80_I/SS PIC18LF26K80_I/SS
 DRAW
 S -700 900 700 -900 0 1 10 f
-X ~MCLR~/RE3 1 -800 200 100 R 50 50 1 1 I
-X RA0/AN0 2 -800 800 100 R 50 50 1 1 I
-X RA1/AN1 3 -800 700 100 R 50 50 1 1 I
-X RA2/Vref-AN2 4 -800 600 100 R 50 50 1 1 I
-X RA3/Vref+AN3 5 -800 500 100 R 50 50 1 1 I
-X Vcap 6 -800 -400 100 R 50 50 1 1 I
-X RA5/AN4 7 -800 400 100 R 50 50 1 1 I
+X ~MCLR~/RE3 1 -800 200 100 R 50 50 1 1 B
+X RA0/AN0 2 -800 800 100 R 50 50 1 1 B
+X RA1/AN1 3 -800 700 100 R 50 50 1 1 B
+X RA2/Vref-AN2 4 -800 600 100 R 50 50 1 1 B
+X RA3/Vref+AN3 5 -800 500 100 R 50 50 1 1 B
+X Vcap 6 -800 -400 100 R 50 50 1 1 W
+X RA5/AN4 7 -800 400 100 R 50 50 1 1 B
 X Vss 8 -800 -600 100 R 50 50 1 1 W
 X OSC1/CLKIN 9 -800 -100 100 R 50 50 1 1 I
 X OSC2/CLKOUT 10 -800 0 100 R 50 50 1 1 I
-X SOSCO/RC0 11 800 -100 100 L 50 50 1 1 I
-X AN10/INT0/RB0 21 800 800 100 L 50 50 1 1 I
-X SOSC1/RC1 12 800 -200 100 L 50 50 1 1 I
-X AN8/INT1/RB1 22 800 700 100 L 50 50 1 1 I
-X CCP2/RC2 13 800 -300 100 L 50 50 1 1 I
-X CANTX/INT2/RB2 23 800 600 100 L 50 50 1 1 I
-X SCL/SCK/RC3 14 800 -400 100 L 50 50 1 1 I
-X CANRX/INT3/RB3 24 800 500 100 L 50 50 1 1 I
-X SDA/SDI/RC4 15 800 -500 100 L 50 50 1 1 I
-X AN9/ECCP1/RB4 25 800 400 100 L 50 50 1 1 I
-X SDO/RC5 16 800 -600 100 L 50 50 1 1 I
-X CCP5/RB5 26 800 300 100 L 50 50 1 1 I
-X CANTX/TX1/CCP3/RC6 17 800 -700 100 L 50 50 1 1 I
+X SOSCO/RC0 11 800 -100 100 L 50 50 1 1 B
+X AN10/INT0/RB0 21 800 800 100 L 50 50 1 1 B
+X SOSC1/RC1 12 800 -200 100 L 50 50 1 1 B
+X AN8/INT1/RB1 22 800 700 100 L 50 50 1 1 B
+X CCP2/RC2 13 800 -300 100 L 50 50 1 1 B
+X CANTX/INT2/RB2 23 800 600 100 L 50 50 1 1 B
+X SCL/SCK/RC3 14 800 -400 100 L 50 50 1 1 B
+X CANRX/INT3/RB3 24 800 500 100 L 50 50 1 1 B
+X SDA/SDI/RC4 15 800 -500 100 L 50 50 1 1 B
+X AN9/ECCP1/RB4 25 800 400 100 L 50 50 1 1 B
+X SDO/RC5 16 800 -600 100 L 50 50 1 1 B
+X CCP5/RB5 26 800 300 100 L 50 50 1 1 B
+X CANTX/TX1/CCP3/RC6 17 800 -700 100 L 50 50 1 1 B
 X Vdd 17 -800 -300 100 R 50 50 1 1 W
-X PGC/TX2/RB6 27 800 200 100 L 50 50 1 1 I
-X CANRX/RX1/CCP4/RC7 18 800 -800 100 L 50 50 1 1 I
-X PGD/RX2/RB7 28 800 100 100 L 50 50 1 1 I
+X PGC/TX2/RB6 27 800 200 100 L 50 50 1 1 B
+X CANRX/RX1/CCP4/RC7 18 800 -800 100 L 50 50 1 1 B
+X PGD/RX2/RB7 28 800 100 100 L 50 50 1 1 B
 X Vss 19 -800 -700 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
@@ -1365,47 +1365,47 @@ F3 "" -650 -100 50 H V C CNN
 ALIAS PIC18F46K80-I/ML PIC18LF45K80-I/ML PIC18LF46K80-I/ML
 DRAW
 S -900 1100 900 -1100 0 1 10 f
-X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 I
-X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 I
-X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 I
-X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 I
-X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 I
+X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 B
+X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 B
+X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 B
+X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 B
+X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 B
 X Vss 6 -50 -1200 100 U 50 50 1 1 W
 X Vdd 7 100 1200 100 D 50 50 1 1 W
-X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 I
-X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 I
-X RB2/CANTX/INT2 10 -1000 200 100 R 50 50 1 1 I
-X RA1/AN1 20 -1000 900 100 R 50 50 1 1 I
+X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 B
+X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 B
+X RB2/CANTX/INT2 10 -1000 200 100 R 50 50 1 1 B
+X RA1/AN1 20 -1000 900 100 R 50 50 1 1 B
 X OSC1/CLKIN/RA7 30 -1000 -500 100 R 50 50 1 1 I
-X C2INA/PSP2/RD2 40 1000 -100 100 L 50 50 1 1 I
-X RB3/CANRX/INT3 11 -1000 100 100 R 50 50 1 1 I
-X RA2/Vref-/AN2 21 -1000 800 100 R 50 50 1 1 I
+X C2INA/PSP2/RD2 40 1000 -100 100 L 50 50 1 1 B
+X RB3/CANRX/INT3 11 -1000 100 100 R 50 50 1 1 B
+X RA2/Vref-/AN2 21 -1000 800 100 R 50 50 1 1 B
 X OSC2/CLKOUT/RA6 31 -1000 -600 100 R 50 50 1 1 I
-X C2INB/PSP3/RD3 41 1000 -200 100 L 50 50 1 1 I
-X RA3/Vref+/AN3 22 -1000 700 100 R 50 50 1 1 I
-X RC0 32 1000 1000 100 L 50 50 1 1 I
-X SDA/SDI/RC4 42 1000 600 100 L 50 50 1 1 I
-X Vddcore/Vcap 23 -1000 -1000 100 R 50 50 1 1 I
-X SDO/RC5 43 1000 500 100 L 50 50 1 1 I
-X RB4/AN9 14 -1000 0 100 R 50 50 1 1 I
-X RA5/AN4 24 -1000 600 100 R 50 50 1 1 I
-X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 I
-X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 I
-X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 I
-X RC1 35 1000 900 100 L 50 50 1 1 I
+X C2INB/PSP3/RD3 41 1000 -200 100 L 50 50 1 1 B
+X RA3/Vref+/AN3 22 -1000 700 100 R 50 50 1 1 B
+X RC0 32 1000 1000 100 L 50 50 1 1 B
+X SDA/SDI/RC4 42 1000 600 100 L 50 50 1 1 B
+X Vddcore/Vcap 23 -1000 -1000 100 R 50 50 1 1 W
+X SDO/RC5 43 1000 500 100 L 50 50 1 1 B
+X RB4/AN9 14 -1000 0 100 R 50 50 1 1 B
+X RA5/AN4 24 -1000 600 100 R 50 50 1 1 B
+X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 B
+X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 B
+X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 B
+X RC1 35 1000 900 100 L 50 50 1 1 B
 X PAD 45 250 -1200 100 U 50 50 1 1 W
-X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 I
-X RE1/AN6 26 1000 -900 100 L 50 50 1 1 I
-X CCP2/RC2 36 1000 800 100 L 50 50 1 1 I
-X RB7/PGD 17 -1000 -300 100 R 50 50 1 1 I
-X RE2/AN7 27 1000 -800 100 L 50 50 1 1 I
-X SCL/SCK/RC3 37 1000 700 100 L 50 50 1 1 I
-X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 I
+X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 B
+X RE1/AN6 26 1000 -900 100 L 50 50 1 1 B
+X CCP2/RC2 36 1000 800 100 L 50 50 1 1 B
+X RB7/PGD 17 -1000 -300 100 R 50 50 1 1 B
+X RE2/AN7 27 1000 -800 100 L 50 50 1 1 B
+X SCL/SCK/RC3 37 1000 700 100 L 50 50 1 1 B
+X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 B
 X Vdd 28 0 1200 100 D 50 50 1 1 W
-X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 I
-X RA0/CVrefAN0 19 -1000 1000 100 R 50 50 1 1 I
+X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 B
+X RA0/CVref/AN0 19 -1000 1000 100 R 50 50 1 1 B
 X Vss 29 50 -1200 100 U 50 50 1 1 W
-X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 I
+X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
@@ -1419,46 +1419,46 @@ F3 "" -650 -100 50 H V C CNN
 ALIAS PIC18F46K80-I/PT PIC18LF45K80-I/PT PIC18LF46K80-I/PT
 DRAW
 S -900 1100 900 -1100 0 1 10 f
-X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 I
-X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 I
-X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 I
-X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 I
-X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 I
+X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 B
+X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 B
+X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 B
+X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 B
+X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 B
 X Vss 6 -50 -1200 100 U 50 50 1 1 W
 X Vdd 7 100 1200 100 D 50 50 1 1 W
-X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 I
-X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 I
-X RB2/CANTX/INT2 10 -1000 200 100 R 50 50 1 1 I
-X RA1/AN1 20 -1000 900 100 R 50 50 1 1 I
+X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 B
+X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 B
+X RB2/CANTX/INT2 10 -1000 200 100 R 50 50 1 1 B
+X RA1/AN1 20 -1000 900 100 R 50 50 1 1 B
 X OSC1/CLKIN/RA7 30 -1000 -500 100 R 50 50 1 1 I
-X C2INA/PSP2/RD2 40 1000 -100 100 L 50 50 1 1 I
-X RB3/CANRX/INT3 11 -1000 100 100 R 50 50 1 1 I
-X RA2/Vref-/AN2 21 -1000 800 100 R 50 50 1 1 I
+X C2INA/PSP2/RD2 40 1000 -100 100 L 50 50 1 1 B
+X RB3/CANRX/INT3 11 -1000 100 100 R 50 50 1 1 B
+X RA2/Vref-/AN2 21 -1000 800 100 R 50 50 1 1 B
 X OSC2/CLKOUT/RA6 31 -1000 -600 100 R 50 50 1 1 I
-X C2INB/PSP3/RD3 41 1000 -200 100 L 50 50 1 1 I
-X RA3/Vref+/AN3 22 -1000 700 100 R 50 50 1 1 I
-X RC0 32 1000 1000 100 L 50 50 1 1 I
-X SDA/SDI/RC4 42 1000 600 100 L 50 50 1 1 I
-X Vddcore/Vcap 23 -1000 -1000 100 R 50 50 1 1 I
-X SDO/RC5 43 1000 500 100 L 50 50 1 1 I
-X RB4/AN9 14 -1000 0 100 R 50 50 1 1 I
-X RA5/AN4 24 -1000 600 100 R 50 50 1 1 I
-X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 I
-X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 I
-X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 I
-X RC1 35 1000 900 100 L 50 50 1 1 I
-X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 I
-X RE1/AN6 26 1000 -900 100 L 50 50 1 1 I
-X CCP2/RC2 36 1000 800 100 L 50 50 1 1 I
-X RB7/PGD 17 -1000 -300 100 R 50 50 1 1 I
-X RE2/AN7 27 1000 -800 100 L 50 50 1 1 I
-X SCL/SCK/RC3 37 1000 700 100 L 50 50 1 1 I
-X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 I
+X C2INB/PSP3/RD3 41 1000 -200 100 L 50 50 1 1 B
+X RA3/Vref+/AN3 22 -1000 700 100 R 50 50 1 1 B
+X RC0 32 1000 1000 100 L 50 50 1 1 B
+X SDA/SDI/RC4 42 1000 600 100 L 50 50 1 1 B
+X Vddcore/Vcap 23 -1000 -1000 100 R 50 50 1 1 W
+X SDO/RC5 43 1000 500 100 L 50 50 1 1 B
+X RB4/AN9 14 -1000 0 100 R 50 50 1 1 B
+X RA5/AN4 24 -1000 600 100 R 50 50 1 1 B
+X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 B
+X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 B
+X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 B
+X RC1 35 1000 900 100 L 50 50 1 1 B
+X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 B
+X RE1/AN6 26 1000 -900 100 L 50 50 1 1 B
+X CCP2/RC2 36 1000 800 100 L 50 50 1 1 B
+X RB7/PGD 17 -1000 -300 100 R 50 50 1 1 B
+X RE2/AN7 27 1000 -800 100 L 50 50 1 1 B
+X SCL/SCK/RC3 37 1000 700 100 L 50 50 1 1 B
+X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 B
 X Vdd 28 0 1200 100 D 50 50 1 1 W
-X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 I
-X RA0/CVrefAN0 19 -1000 1000 100 R 50 50 1 1 I
+X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 B
+X RA0/CVrefAN0 19 -1000 1000 100 R 50 50 1 1 B
 X Vss 29 50 -1200 100 U 50 50 1 1 W
-X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 I
+X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #

From fe838ea16bbd85238826da2a8d7567056c212770 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 6 Oct 2015 18:14:37 +1100
Subject: [PATCH 08/12] Added the following 8-bit microcontrollers
 PIC18F23K20_I/SS PIC18F24K20_I/SS PIC18F25K20_I/SS PIC18F26K20_I/SS

These are 28-pin SSOP devices with UART, CCP, SPI/I2C and UART
---
 library/microchip_pic18mcu.dcm | 50 +++++++++++++++++++++++++---------
 library/microchip_pic18mcu.lib | 41 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 0efd1ff7..d0e04d9c 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -1,7 +1,7 @@
 EESchema-DOCLIB  Version 2.0
 #
 $CMP PIC18(L)F13K50-E/P
-D PIC18(L)F13K50, 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
+D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
@@ -19,7 +19,7 @@ F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F14K50-E/P
-D PIC18(L)F14K50, 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
+D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
@@ -121,7 +121,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4331-I/P
-D PIC18(L)F4331, 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
@@ -133,7 +133,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F442-I/P
-D PIC18(L)F442, 16K Flash, 768B SRAM, 256 EEPROM, ADC, DIP40
+D 16K Flash, 768B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
@@ -151,7 +151,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4431-I/P
-D PIC18(L)F4431, 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
@@ -169,7 +169,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4450-I/P
-D PIC18(L)F4450, 16K Flash, 8K SRAM, USB, nanoWatt XLP, PDIP40
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, PDIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
@@ -187,7 +187,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4455-I/P
-D PIC18(L)F4455, 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
@@ -199,19 +199,19 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F448-I/P
-D PIC18(L)F448, 16K Flash, 768B SRAM, 256 EEPROM, CAN, DIP40
+D 16K Flash, 768B SRAM, 256 EEPROM, CAN, DIP40
 K Flash-Based 8-Bit Microcontroller CAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F44J10-I/P
-D PIC18(L)F44J10, 16K Flash, 1K SRAM, ADC, DIP40
+D 16K Flash, 1K SRAM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F452-I/P
-D PIC18(L)F452, 32K Flash, 1536B SRAM, 256 EEPROM, ADC, DIP40
+D 32K Flash, 1536B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
@@ -229,7 +229,7 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F4550-I/P
-D PIC18(L)F4550, 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
@@ -241,13 +241,13 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F458-I/P
-D PIC18(L)F458, 32K Flash, 1536B SRAM, 256 EEPROM, CAN, DIP40
+D 32K Flash, 1536B SRAM, 256 EEPROM, CAN, DIP40
 K Flash-Based 8-Bit Microcontroller CAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
 $ENDCMP
 #
 $CMP PIC18(L)F45J10-I/P
-D PIC18(L)F45J10, 32K Flash, 1K SRAM, ADC, DIP40
+D 32K Flash, 1K SRAM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
 $ENDCMP
@@ -264,6 +264,24 @@ K Flash Based 8-Bit Microcontroller ECAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
+$CMP PIC18F23K20_I/SS
+D 8K Flash, 512Byte RAM, 256Byte EEPROM, PIC18 Microcontroller ADC PWM SPI I2C USART in SSOP28 package
+K microcontroller PIC18F flash XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
+$ENDCMP
+#
+$CMP PIC18F24K20_I/SS
+D 16K Flash, 768Byte RAM, 256Byte EEPROM, PIC18 Microcontroller ADC PWM SPI I2C USART in SSOP28 package
+K microcontroller PIC18F flash XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
+$ENDCMP
+#
+$CMP PIC18F25K20_I/SS
+D 32K Flash, 1536Byte RAM, 256Byte EEPROM, PIC18 Microcontroller ADC PWM SPI I2C USART in SSOP28 package
+K microcontroller PIC18F flash XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
+$ENDCMP
+#
 $CMP PIC18F25K80_I/ML
 D 32K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN28 package
 K microcontroller PIC18 flash ECAN XLP nanoWatt
@@ -276,6 +294,12 @@ K microcontroller PIC18 flash ECAN XLP nanoWatt
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
+$CMP PIC18F26K20_I/SS
+D 64K Flash, 3936Byte RAM, 1KByte EEPROM, PIC18 Microcontroller ADC PWM SPI I2C USART in SSOP28 package
+K microcontroller PIC18F flash XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
+$ENDCMP
+#
 $CMP PIC18F26K80_I/ML
 D 64K Flash, 3.5K RAM, 1K EEPROM PIC18 Microcontroller ADC PWM CAN SPI I2C USART in QFN28 package
 K microcontroller PIC18 flash ECAN XLP nanoWatt
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 0ff1137a..ba5b36bf 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1272,6 +1272,47 @@ X RD1/C1INB/PSP1 39 -1400 600 150 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# PIC18F23K20_I/SS
+#
+DEF PIC18F23K20_I/SS U 0 40 Y Y 1 F N
+F0 "U" -700 950 50 H V L CNN
+F1 "PIC18F23K20_I/SS" 700 950 50 H V R CNN
+F2 "SSOP28" -500 -500 50 H V C CNN
+F3 "" 0 -50 50 H V C CNN
+ALIAS PIC18F24K20_I/SS PIC18F25K20_I/SS PIC18F26K20_I/SS
+DRAW
+S -700 900 700 -900 0 1 10 f
+X ~MCLR~/RE3 1 -800 100 100 R 50 50 1 1 B
+X RA0/AN0 2 -800 800 100 R 50 50 1 1 B
+X RA1/AN1 3 -800 700 100 R 50 50 1 1 B
+X RA2/Vref-AN2 4 -800 600 100 R 50 50 1 1 B
+X RA3/Vref+AN3 5 -800 500 100 R 50 50 1 1 B
+X RA4 6 -800 400 100 R 50 50 1 1 W
+X RA5/AN4 7 -800 300 100 R 50 50 1 1 B
+X Vss 8 -200 -1000 100 U 50 50 1 1 W
+X RA7/OSC1/CLKIN 9 -800 -200 100 R 50 50 1 1 I
+X RA6/OSC2/CLKOUT 10 -800 -100 100 R 50 50 1 1 I
+X Vdd 20 -100 1000 100 D 50 50 1 1 W
+X RC0 11 800 -100 100 L 50 50 1 1 B
+X AN12/INT0/RB0 21 800 800 100 L 50 50 1 1 B
+X CCP2/RC1 12 800 -200 100 L 50 50 1 1 B
+X AN10/INT1/RB1 22 800 700 100 L 50 50 1 1 B
+X CCP1/RC2 13 800 -300 100 L 50 50 1 1 B
+X AN8/INT2/RB2 23 800 600 100 L 50 50 1 1 B
+X SCL/SCK/RC3 14 800 -400 100 L 50 50 1 1 B
+X AN9/INT3/RB3 24 800 500 100 L 50 50 1 1 B
+X SDA/SDI/RC4 15 800 -500 100 L 50 50 1 1 B
+X AN11/RB4 25 800 400 100 L 50 50 1 1 B
+X SDO/RC5 16 800 -600 100 L 50 50 1 1 B
+X PGM/RB5 26 800 300 100 L 50 50 1 1 B
+X TX/RC6 17 800 -700 100 L 50 50 1 1 B
+X PGC/RB6 27 800 200 100 L 50 50 1 1 B
+X RX/RC7 18 800 -800 100 L 50 50 1 1 B
+X PGD/RB7 28 800 100 100 L 50 50 1 1 B
+X Vss 19 -100 -1000 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # PIC18F25K80_I/ML
 #
 DEF PIC18F25K80_I/ML U 0 40 Y Y 1 F N

From 2f4a0a4d64a36fb46df803d7c1effb29c20f0efe Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 6 Oct 2015 18:20:21 +1100
Subject: [PATCH 09/12] Fixed pin naming (removed extra INT pin designation)

---
 library/microchip_pic18mcu.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index ba5b36bf..5b05109d 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1300,7 +1300,7 @@ X AN10/INT1/RB1 22 800 700 100 L 50 50 1 1 B
 X CCP1/RC2 13 800 -300 100 L 50 50 1 1 B
 X AN8/INT2/RB2 23 800 600 100 L 50 50 1 1 B
 X SCL/SCK/RC3 14 800 -400 100 L 50 50 1 1 B
-X AN9/INT3/RB3 24 800 500 100 L 50 50 1 1 B
+X AN9/RB3 24 800 500 100 L 50 50 1 1 B
 X SDA/SDI/RC4 15 800 -500 100 L 50 50 1 1 B
 X AN11/RB4 25 800 400 100 L 50 50 1 1 B
 X SDO/RC5 16 800 -600 100 L 50 50 1 1 B

From 0e21a60f6010ab534139b68b6ac8d2eb2344e4ac Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Tue, 20 Oct 2015 10:13:20 +1100
Subject: [PATCH 10/12] Added PIC18F1220-SO and PIC18F1320-SO (alias) to
 microchip-pic18.lib

---
 library/microchip_pic18mcu.dcm | 10 ++++++++++
 library/microchip_pic18mcu.lib | 31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index d0e04d9c..7177ac8d 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -264,6 +264,16 @@ K Flash Based 8-Bit Microcontroller ECAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
+$CMP PIC18F1220-SO
+D 18-Pin Flash Microcontroller 4K Flash 256byte RAM, ADC UART PWM
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
+$ENDCMP
+#
+$CMP PIC18F1320-SO
+D 18-Pin Flash Microcontroller 8K Flash 256byte RAM, ADC UART PWM in SOIC-18 package
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
+$ENDCMP
+#
 $CMP PIC18F23K20_I/SS
 D 8K Flash, 512Byte RAM, 256Byte EEPROM, PIC18 Microcontroller ADC PWM SPI I2C USART in SSOP28 package
 K microcontroller PIC18F flash XLP
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 5b05109d..b5f725e7 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1272,6 +1272,37 @@ X RD1/C1INB/PSP1 39 -1400 600 150 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# PIC18F1220-SO
+#
+DEF PIC18F1220-SO U 0 40 Y Y 1 F N
+F0 "U" -550 550 50 H V C CNN
+F1 "PIC18F1220-SO" 100 550 50 H V L CNN
+F2 "SOIC-18" 50 -150 50 H V C CIN
+F3 "" -250 550 50 H V C CNN
+ALIAS PIC18F1320-SO
+DRAW
+S -600 500 700 -400 0 1 10 f
+X RA0/AN0 1 -700 300 100 R 50 50 1 1 I
+X RA1/AN1 2 -700 200 100 R 50 50 1 1 I
+X RA4/TOCKI 3 -700 -100 100 R 50 50 1 1 I
+X ~MCLR~/Vpp 4 -700 400 100 R 50 50 1 1 I
+X Vss 5 -100 -500 100 U 50 50 1 1 W
+X RA2/AN2 6 -700 100 100 R 50 50 1 1 I
+X RA3/AN3 7 -700 0 100 R 50 50 1 1 I
+X RB0/INT0 8 800 400 100 L 50 50 1 1 I
+X RB1/AN5/TX/INT1 9 800 300 100 L 50 50 1 1 I
+X RB4/AN6/RX 10 800 0 100 L 50 50 1 1 I
+X RB5/PGM 11 800 -100 100 L 50 50 1 1 I
+X RB6/PGC 12 800 -200 100 L 50 50 1 1 I
+X RB7/PGD 13 800 -300 100 L 50 50 1 1 I
+X Vdd 14 -100 600 100 D 50 50 1 1 W
+X OSC2 15 -700 -300 100 R 50 50 1 1 I
+X OSC1 16 -700 -200 100 R 50 50 1 1 I
+X RB2/INT2 17 800 200 100 L 50 50 1 1 I
+X RB3/CCP1 18 800 100 100 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 # PIC18F23K20_I/SS
 #
 DEF PIC18F23K20_I/SS U 0 40 Y Y 1 F N

From f0f1cbff5a7bd01c74c400f790740bda8e637c01 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Tue, 17 Nov 2015 16:08:43 +1100
Subject: [PATCH 11/12] Added keywords for PIC18F1220 and PIC18F1320

---
 library/microchip_pic18mcu.dcm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 7177ac8d..fb5e6899 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -265,12 +265,14 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F1220-SO
-D 18-Pin Flash Microcontroller 4K Flash 256byte RAM, ADC UART PWM
+D 18-Pin Flash Microcontroller 4K Flash 256byte RAM
+K RAM ADC UART PWM 
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
 $ENDCMP
 #
 $CMP PIC18F1320-SO
-D 18-Pin Flash Microcontroller 8K Flash 256byte RAM, ADC UART PWM in SOIC-18 package
+D 18-Pin Flash Microcontroller 8K Flash 256byte RAM
+K RAM ADC UART PWM 
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39605F.pdf
 $ENDCMP
 #

From 32f5a389435324fe512895855b7b160f76f06844 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver@currawongeng.com>
Date: Tue, 17 Nov 2015 16:10:55 +1100
Subject: [PATCH 12/12] Fixed pin grid issues (KLC Rule 3.1) for the
 PIC18F45K80-I/ML and PIC18F45K80-I/PT

---
 library/microchip_pic18mcu.lib | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index b5f725e7..141776d2 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1442,7 +1442,7 @@ X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 B
 X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 B
 X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 B
 X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 B
-X Vss 6 -50 -1200 100 U 50 50 1 1 W
+X Vss 6 0 -1200 100 U 50 50 1 1 W
 X Vdd 7 100 1200 100 D 50 50 1 1 W
 X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 B
 X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 B
@@ -1465,7 +1465,7 @@ X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 B
 X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 B
 X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 B
 X RC1 35 1000 900 100 L 50 50 1 1 B
-X PAD 45 250 -1200 100 U 50 50 1 1 W
+X PAD 45 300 -1200 100 U 50 50 1 1 W
 X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 B
 X RE1/AN6 26 1000 -900 100 L 50 50 1 1 B
 X CCP2/RC2 36 1000 800 100 L 50 50 1 1 B
@@ -1476,7 +1476,7 @@ X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 B
 X Vdd 28 0 1200 100 D 50 50 1 1 W
 X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 B
 X RA0/CVref/AN0 19 -1000 1000 100 R 50 50 1 1 B
-X Vss 29 50 -1200 100 U 50 50 1 1 W
+X Vss 29 100 -1200 100 U 50 50 1 1 W
 X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
@@ -1496,7 +1496,7 @@ X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 B
 X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 B
 X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 B
 X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 B
-X Vss 6 -50 -1200 100 U 50 50 1 1 W
+X Vss 6 0 -1200 100 U 50 50 1 1 W
 X Vdd 7 100 1200 100 D 50 50 1 1 W
 X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 B
 X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 B
@@ -1529,7 +1529,7 @@ X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 B
 X Vdd 28 0 1200 100 D 50 50 1 1 W
 X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 B
 X RA0/CVrefAN0 19 -1000 1000 100 R 50 50 1 1 B
-X Vss 29 50 -1200 100 U 50 50 1 1 W
+X Vss 29 100 -1200 100 U 50 50 1 1 W
 X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF