diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index a83d958e..834b3c1d 100755
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -126,8 +126,8 @@ K microcontroller PIC18F flash XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-E/SP
-D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+$CMP PIC18F24K50-E/ML
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
@@ -138,38 +138,38 @@ K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
+$CMP PIC18F24K50-E/SP
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
 $CMP PIC18F24K50-E/SS
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-E/ML
+$CMP PIC18F24K50-I/ML
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-I/SP
-D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
-K Flash-Based 8-Bit Microcontroller XLP
-F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
-$ENDCMP
-#
 $CMP PIC18F24K50-I/SO
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-I/SS
-D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
+$CMP PIC18F24K50-I/SP
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-I/ML
-D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
+$CMP PIC18F24K50-I/SS
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
@@ -192,8 +192,8 @@ K microcontroller PIC18F flash XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-E/SP
-D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+$CMP PIC18F25K50-E/ML
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
@@ -204,38 +204,38 @@ K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
+$CMP PIC18F25K50-E/SP
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
 $CMP PIC18F25K50-E/SS
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-E/ML
+$CMP PIC18F25K50-I/ML
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-I/SP
-D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
-K Flash-Based 8-Bit Microcontroller XLP
-F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
-$ENDCMP
-#
 $CMP PIC18F25K50-I/SO
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-I/SS
-D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
+$CMP PIC18F25K50-I/SP
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-I/ML
-D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
+$CMP PIC18F25K50-I/SS
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
@@ -654,6 +654,54 @@ K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
+$CMP PIC18LF24K50-E/ML
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF24K50-E/SO
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF24K50-E/SP
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF24K50-E/SS
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF24K50-I/ML
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF24K50-I/SO
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF24K50-I/SP
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF24K50-I/SS
+D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
 $CMP PIC18LF2550-I/SO
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
@@ -666,6 +714,54 @@ K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
+$CMP PIC18LF25K50-E/ML
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF25K50-E/SO
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF25K50-E/SP
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF25K50-E/SS
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF25K50-I/ML
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF25K50-I/SO
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF25K50-I/SP
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
+$CMP PIC18LF25K50-I/SS
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
+$ENDCMP
+#
 $CMP PIC18LF25K80_I/ML
 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
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 4529c3fb..d003d9e7 100755
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -545,10 +545,54 @@ X VSS 19 0 -1200 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# PIC18F24K50-I/ML
+#
+DEF PIC18F24K50-I/ML U 0 50 Y Y 1 F N
+F0 "U" -800 1800 50 H V C CNN
+F1 "PIC18F24K50-I/ML" 500 -1700 50 H V C CNN
+F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 0 0 50 H I C CIN
+F3 "" -2900 -1350 50 H I C CNN
+ALIAS PIC18LF24K50-I/ML PIC18F25K50-I/ML PIC18LF25K50-I/ML PIC18F24K50-E/ML PIC18LF24K50-E/ML PIC18F25K50-E/ML PIC18LF25K50-E/ML
+$FPLIST
+ QFN*1EP*6x6mm*Pitch0.65mm*
+$ENDFPLIST
+DRAW
+S -850 1750 850 -1650 0 1 10 f
+X RA2/AN2/C2IN+/Vref-/DACOUT 1 -1000 1200 150 R 50 50 1 1 B
+X RA3/AN3/C1IN+/Vref+ 2 -1000 1100 150 R 50 50 1 1 B
+X RA4/C1OUT/SRQ/T0CKI 3 -1000 1000 150 R 50 50 1 1 B
+X RA5/AN4/C2OUT/SRNQ/HLVDIN/~SS~ 4 -1000 900 150 R 50 50 1 1 B
+X VSS 5 -100 -1800 150 U 50 50 1 1 W
+X RA7/OSC1/CLKI 6 -1000 700 150 R 50 50 1 1 I
+X RA6/OSC2/CLKO 7 -1000 800 150 R 50 50 1 1 O
+X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 8 -1000 -600 150 R 50 50 1 1 B
+X RC1/CCP2/SOSCI/IOCC1 9 -1000 -700 150 R 50 50 1 1 B
+X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 10 -1000 -800 150 R 50 50 1 1 B
+X RB2/AN8/CTED1/P1B/INT2 20 -1000 200 150 R 50 50 1 1 B
+X VUSB3V3/VDDCORE 11 1000 -1200 150 L 50 50 1 1 B
+X RB3/AN9/C12IN2-/CTED2/CCP2/SDO 21 -1000 100 150 R 50 50 1 1 B
+X D-/IOCC4 12 1000 -1300 150 L 50 50 1 1 B
+X RB4/AN11/P1D/I0CB4 22 -1000 0 150 R 50 50 1 1 B
+X D+/IOCC5 13 1000 -1400 150 L 50 50 1 1 B
+X RB5/AN13/T1G/T3CKI/IOCB5 23 -1000 -100 150 R 50 50 1 1 B
+X RC6/AN18/TX/CK/IOCC6 14 -1000 -900 150 R 50 50 1 1 B
+X RB6/IOCB6/PGC 24 -1000 -200 150 R 50 50 1 1 B
+X RC7/AN19/RX/DT/SDO/IOCC7 15 -1000 -1000 150 R 50 50 1 1 B
+X RB7/IOCB7/PGD 25 -1000 -300 150 R 50 50 1 1 B
+X VSS 16 0 -1800 150 U 50 50 1 1 W
+X RE3/Vpp/~MCLR~ 26 -1000 -1300 150 R 50 50 1 1 I
+X VDD 17 0 1900 150 D 50 50 1 1 W
+X RA0/AN0/C12IN0- 27 -1000 1400 150 R 50 50 1 1 B
+X RB0/AN12/SRI/~FLT0~/SDI/SDA/INT0 18 -1000 400 150 R 50 50 1 1 B
+X RA1/AN1/C12IN1+/CTCMP 28 -1000 1300 150 R 50 50 1 1 B
+X RB1/AN10/C12IN3-/P1C/SCK/SCL/INT1 19 -1000 300 150 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # PIC18F24K50-I/SO
 #
 DEF PIC18F24K50-I/SO U 0 50 Y Y 1 F N
-F0 "U" -800 1750 50 H V C CNN
+F0 "U" -800 1800 50 H V C CNN
 F1 "PIC18F24K50-I/SO" 500 -1700 50 H V C CNN
 F2 "Housings_SOIC:SOIC-28W_7.5x17.9mm_Pitch1.27mm" 0 0 50 H I C CIN
 F3 "" -2900 -1350 50 H I C CNN
@@ -557,79 +601,35 @@ $FPLIST
  SO*W*7.5x17.9mm_Pitch1.27mm*
 $ENDFPLIST
 DRAW
-S -850 1700 850 -1650 0 1 10 f
-X RE3/Vpp/~MCLR~ 1 -1000 -1200 150 R 50 50 1 1 I
+S -850 1750 850 -1650 0 1 10 f
+X RE3/Vpp/~MCLR~ 1 -1000 -1300 150 R 50 50 1 1 I
 X RA0/AN0/C12IN0- 2 -1000 1400 150 R 50 50 1 1 B
 X RA1/AN1/C12IN1+/CTCMP 3 -1000 1300 150 R 50 50 1 1 B
 X RA2/AN2/C2IN+/Vref-/DACOUT 4 -1000 1200 150 R 50 50 1 1 B
 X RA3/AN3/C1IN+/Vref+ 5 -1000 1100 150 R 50 50 1 1 B
 X RA4/C1OUT/SRQ/T0CKI 6 -1000 1000 150 R 50 50 1 1 B
 X RA5/AN4/C2OUT/SRNQ/HLVDIN/~SS~ 7 -1000 900 150 R 50 50 1 1 B
-X VSS 8 -50 -1800 150 U 50 50 1 1 W
+X VSS 8 -100 -1800 150 U 50 50 1 1 W
 X RA7/OSC1/CLKI 9 -1000 700 150 R 50 50 1 1 I
 X RA6/OSC2/CLKO 10 -1000 800 150 R 50 50 1 1 O
-X VDD 20 0 1850 150 D 50 50 1 1 W
-X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 11 -1000 -550 150 R 50 50 1 1 B
+X VDD 20 0 1900 150 D 50 50 1 1 W
+X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 11 -1000 -600 150 R 50 50 1 1 B
 X RB0/AN12/SRI/~FLT0~/SDI/SDA/INT0 21 -1000 400 150 R 50 50 1 1 B
-X RC1/CCP2/SOSCI/IOCC1 12 -1000 -650 150 R 50 50 1 1 B
+X RC1/CCP2/SOSCI/IOCC1 12 -1000 -700 150 R 50 50 1 1 B
 X RB1/AN10/C12IN3-/P1C/SCK/SCL/INT1 22 -1000 300 150 R 50 50 1 1 B
-X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 13 -1000 -750 150 R 50 50 1 1 B
+X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 13 -1000 -800 150 R 50 50 1 1 B
 X RB2/AN8/CTED1/P1B/INT2 23 -1000 200 150 R 50 50 1 1 B
-X VUSB3V3/VDDCORE 14 1000 -1150 150 L 50 50 1 1 B
+X VUSB3V3/VDDCORE 14 1000 -1200 150 L 50 50 1 1 B
 X RB3/AN9/C12IN2-/CTED2/CCP2/SDO 24 -1000 100 150 R 50 50 1 1 B
-X D-/IOCC4 15 1000 -1250 150 L 50 50 1 1 B
+X D-/IOCC4 15 1000 -1300 150 L 50 50 1 1 B
 X RB4/AN11/P1D/I0CB4 25 -1000 0 150 R 50 50 1 1 B
-X D+/IOCC5 16 1000 -1350 150 L 50 50 1 1 B
+X D+/IOCC5 16 1000 -1400 150 L 50 50 1 1 B
 X RB5/AN13/T1G/T3CKI/IOCB5 26 -1000 -100 150 R 50 50 1 1 B
-X RC6/AN18/TX/CK/IOCC6 17 -1000 -850 150 R 50 50 1 1 B
+X RC6/AN18/TX/CK/IOCC6 17 -1000 -900 150 R 50 50 1 1 B
 X RB6/IOCB6/PGC 27 -1000 -200 150 R 50 50 1 1 B
-X RC7/AN19/RX/DT/SDO/IOCC7 18 -1000 -950 150 R 50 50 1 1 B
+X RC7/AN19/RX/DT/SDO/IOCC7 18 -1000 -1000 150 R 50 50 1 1 B
 X RB7/IOCB7/PGD 28 -1000 -300 150 R 50 50 1 1 B
-X VSS 19 50 -1800 150 U 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# PIC18F24K50-I/SS
-#
-DEF PIC18F24K50-I/SS U 0 50 Y Y 1 F N
-F0 "U" -800 1750 50 H V C CNN
-F1 "PIC18F24K50-I/SS" 500 -1700 50 H V C CNN
-F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" -500 -500 50 H I C CNN
-F3 "" -2900 -1350 50 H I C CNN
-ALIAS PIC18LF24K50-I/SS PIC18F25K50-I/SS PIC18LF25K50-I/SS PIC18F24K50-E/SS PIC18LF24K50-E/SS PIC18F25K50-E/SS PIC18LF25K50-E/SS
-$FPLIST
- SSOP*5.3x10.2mm*Pitch0.65mm*
-$ENDFPLIST
-DRAW
-S -850 1700 850 -1650 0 1 10 f
-X RE3/Vpp/~MCLR~ 1 -1000 -1200 150 R 50 50 1 1 I
-X RA0/AN0/C12IN0- 2 -1000 1400 150 R 50 50 1 1 B
-X RA1/AN1/C12IN1+/CTCMP 3 -1000 1300 150 R 50 50 1 1 B
-X RA2/AN2/C2IN+/Vref-/DACOUT 4 -1000 1200 150 R 50 50 1 1 B
-X RA3/AN3/C1IN+/Vref+ 5 -1000 1100 150 R 50 50 1 1 B
-X RA4/C1OUT/SRQ/T0CKI 6 -1000 1000 150 R 50 50 1 1 B
-X RA5/AN4/C2OUT/SRNQ/HLVDIN/~SS~ 7 -1000 900 150 R 50 50 1 1 B
-X VSS 8 -50 -1800 150 U 50 50 1 1 W
-X RA7/OSC1/CLKI 9 -1000 700 150 R 50 50 1 1 I
-X RA6/OSC2/CLKO 10 -1000 800 150 R 50 50 1 1 O
-X VDD 20 0 1850 150 D 50 50 1 1 W
-X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 11 -1000 -550 150 R 50 50 1 1 B
-X RB0/AN12/SRI/~FLT0~/SDI/SDA/INT0 21 -1000 400 150 R 50 50 1 1 B
-X RC1/CCP2/SOSCI/IOCC1 12 -1000 -650 150 R 50 50 1 1 B
-X RB1/AN10/C12IN3-/P1C/SCK/SCL/INT1 22 -1000 300 150 R 50 50 1 1 B
-X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 13 -1000 -750 150 R 50 50 1 1 B
-X RB2/AN8/CTED1/P1B/INT2 23 -1000 200 150 R 50 50 1 1 B
-X VUSB3V3/VDDCORE 14 1000 -1150 150 L 50 50 1 1 B
-X RB3/AN9/C12IN2-/CTED2/CCP2/SDO 24 -1000 100 150 R 50 50 1 1 B
-X D-/IOCC4 15 1000 -1250 150 L 50 50 1 1 B
-X RB4/AN11/P1D/I0CB4 25 -1000 0 150 R 50 50 1 1 B
-X D+/IOCC5 16 1000 -1350 150 L 50 50 1 1 B
-X RB5/AN13/T1G/T3CKI/IOCB5 26 -1000 -100 150 R 50 50 1 1 B
-X RC6/AN18/TX/CK/IOCC6 17 -1000 -850 150 R 50 50 1 1 B
-X RB6/IOCB6/PGC 27 -1000 -200 150 R 50 50 1 1 B
-X RC7/AN19/RX/DT/SDO/IOCC7 18 -1000 -950 150 R 50 50 1 1 B
-X RB7/IOCB7/PGD 28 -1000 -300 150 R 50 50 1 1 B
-X VSS 19 50 -1800 150 U 50 50 1 1 W
+X VSS 19 0 -1800 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
@@ -647,79 +647,79 @@ $FPLIST
  PDIP*28_W7.62mm*
 $ENDFPLIST
 DRAW
-S -850 1700 850 -1650 0 1 10 f
-X RE3/Vpp/~MCLR~ 1 -1000 -1200 150 R 50 50 1 1 I
+S -850 1750 850 -1650 0 1 10 f
+X RE3/Vpp/~MCLR~ 1 -1000 -1300 150 R 50 50 1 1 I
 X RA0/AN0/C12IN0- 2 -1000 1400 150 R 50 50 1 1 B
 X RA1/AN1/C12IN1+/CTCMP 3 -1000 1300 150 R 50 50 1 1 B
 X RA2/AN2/C2IN+/Vref-/DACOUT 4 -1000 1200 150 R 50 50 1 1 B
 X RA3/AN3/C1IN+/Vref+ 5 -1000 1100 150 R 50 50 1 1 B
 X RA4/C1OUT/SRQ/T0CKI 6 -1000 1000 150 R 50 50 1 1 B
 X RA5/AN4/C2OUT/SRNQ/HLVDIN/~SS~ 7 -1000 900 150 R 50 50 1 1 B
-X VSS 8 -50 -1800 150 U 50 50 1 1 W
+X VSS 8 -100 -1800 150 U 50 50 1 1 W
 X RA7/OSC1/CLKI 9 -1000 700 150 R 50 50 1 1 I
 X RA6/OSC2/CLKO 10 -1000 800 150 R 50 50 1 1 O
-X VDD 20 0 1850 150 D 50 50 1 1 W
-X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 11 -1000 -550 150 R 50 50 1 1 B
+X VDD 20 0 1900 150 D 50 50 1 1 W
+X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 11 -1000 -600 150 R 50 50 1 1 B
 X RB0/AN12/SRI/~FLT0~/SDI/SDA/INT0 21 -1000 400 150 R 50 50 1 1 B
-X RC1/CCP2/SOSCI/IOCC1 12 -1000 -650 150 R 50 50 1 1 B
+X RC1/CCP2/SOSCI/IOCC1 12 -1000 -700 150 R 50 50 1 1 B
 X RB1/AN10/C12IN3-/P1C/SCK/SCL/INT1 22 -1000 300 150 R 50 50 1 1 B
-X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 13 -1000 -750 150 R 50 50 1 1 B
+X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 13 -1000 -800 150 R 50 50 1 1 B
 X RB2/AN8/CTED1/P1B/INT2 23 -1000 200 150 R 50 50 1 1 B
-X VUSB3V3/VDDCORE 14 1000 -1150 150 L 50 50 1 1 B
+X VUSB3V3/VDDCORE 14 1000 -1200 150 L 50 50 1 1 B
 X RB3/AN9/C12IN2-/CTED2/CCP2/SDO 24 -1000 100 150 R 50 50 1 1 B
-X D-/IOCC4 15 1000 -1250 150 L 50 50 1 1 B
+X D-/IOCC4 15 1000 -1300 150 L 50 50 1 1 B
 X RB4/AN11/P1D/I0CB4 25 -1000 0 150 R 50 50 1 1 B
-X D+/IOCC5 16 1000 -1350 150 L 50 50 1 1 B
+X D+/IOCC5 16 1000 -1400 150 L 50 50 1 1 B
 X RB5/AN13/T1G/T3CKI/IOCB5 26 -1000 -100 150 R 50 50 1 1 B
-X RC6/AN18/TX/CK/IOCC6 17 -1000 -850 150 R 50 50 1 1 B
+X RC6/AN18/TX/CK/IOCC6 17 -1000 -900 150 R 50 50 1 1 B
 X RB6/IOCB6/PGC 27 -1000 -200 150 R 50 50 1 1 B
-X RC7/AN19/RX/DT/SDO/IOCC7 18 -1000 -950 150 R 50 50 1 1 B
+X RC7/AN19/RX/DT/SDO/IOCC7 18 -1000 -1000 150 R 50 50 1 1 B
 X RB7/IOCB7/PGD 28 -1000 -300 150 R 50 50 1 1 B
-X VSS 19 50 -1800 150 U 50 50 1 1 W
+X VSS 19 0 -1800 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# PIC18F24K50-I/ML
+# PIC18F24K50-I/SS
 #
-DEF PIC18F24K50-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F24K50-I/SS U 0 50 Y Y 1 F N
 F0 "U" -800 1750 50 H V C CNN
-F1 "PIC18F24K50-I/ML" 500 -1700 50 H V C CNN
-F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 0 0 50 H I C CIN
+F1 "PIC18F24K50-I/SS" 500 -1700 50 H V C CNN
+F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" -500 -500 50 H I C CNN
 F3 "" -2900 -1350 50 H I C CNN
-ALIAS PIC18LF24K50-I/ML PIC18F25K50-I/ML PIC18LF25K50-I/ML PIC18F24K50-E/ML PIC18LF24K50-E/ML PIC18F25K50-E/ML PIC18LF25K50-E/ML
+ALIAS PIC18LF24K50-I/SS PIC18F25K50-I/SS PIC18LF25K50-I/SS PIC18F24K50-E/SS PIC18LF24K50-E/SS PIC18F25K50-E/SS PIC18LF25K50-E/SS
 $FPLIST
- QFN*1EP*6x6mm*Pitch0.65mm*
+ SSOP*5.3x10.2mm*Pitch0.65mm*
 $ENDFPLIST
 DRAW
-S -850 1700 850 -1650 0 1 10 f
-X RE3/Vpp/~MCLR~ 26 -1000 -1200 150 R 50 50 1 1 I
-X RA0/AN0/C12IN0- 27 -1000 1400 150 R 50 50 1 1 B
-X RA1/AN1/C12IN1+/CTCMP 28 -1000 1300 150 R 50 50 1 1 B
-X RA2/AN2/C2IN+/Vref-/DACOUT 1 -1000 1200 150 R 50 50 1 1 B
-X RA3/AN3/C1IN+/Vref+ 2 -1000 1100 150 R 50 50 1 1 B
-X RA4/C1OUT/SRQ/T0CKI 3 -1000 1000 150 R 50 50 1 1 B
-X RA5/AN4/C2OUT/SRNQ/HLVDIN/~SS~ 4 -1000 900 150 R 50 50 1 1 B
-X VSS 5 -50 -1800 150 U 50 50 1 1 W
-X RA7/OSC1/CLKI 6 -1000 700 150 R 50 50 1 1 I
-X RA6/OSC2/CLKO 7 -1000 800 150 R 50 50 1 1 O
-X VDD 17 0 1850 150 D 50 50 1 1 W
-X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 8 -1000 -550 150 R 50 50 1 1 B
-X RB0/AN12/SRI/~FLT0~/SDI/SDA/INT0 18 -1000 400 150 R 50 50 1 1 B
-X RC1/CCP2/SOSCI/IOCC1 9 -1000 -650 150 R 50 50 1 1 B
-X RB1/AN10/C12IN3-/P1C/SCK/SCL/INT1 19 -1000 300 150 R 50 50 1 1 B
-X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 10 -1000 -750 150 R 50 50 1 1 B
-X RB2/AN8/CTED1/P1B/INT2 20 -1000 200 150 R 50 50 1 1 B
-X VUSB3V3/VDDCORE 11 1000 -1150 150 L 50 50 1 1 B
-X RB3/AN9/C12IN2-/CTED2/CCP2/SDO 21 -1000 100 150 R 50 50 1 1 B
-X D-/IOCC4 12 1000 -1250 150 L 50 50 1 1 B
-X RB4/AN11/P1D/I0CB4 22 -1000 0 150 R 50 50 1 1 B
-X D+/IOCC5 13 1000 -1350 150 L 50 50 1 1 B
-X RB5/AN13/T1G/T3CKI/IOCB5 23 -1000 -100 150 R 50 50 1 1 B
-X RC6/AN18/TX/CK/IOCC6 14 -1000 -850 150 R 50 50 1 1 B
-X RB6/IOCB6/PGC 24 -1000 -200 150 R 50 50 1 1 B
-X RC7/AN19/RX/DT/SDO/IOCC7 15 -1000 -950 150 R 50 50 1 1 B
-X RB7/IOCB7/PGD 25 -1000 -300 150 R 50 50 1 1 B
-X VSS 16 50 -1800 150 U 50 50 1 1 W
+S -850 1750 850 -1650 0 1 10 f
+X RE3/Vpp/~MCLR~ 1 -1000 -1300 150 R 50 50 1 1 I
+X RA0/AN0/C12IN0- 2 -1000 1400 150 R 50 50 1 1 B
+X RA1/AN1/C12IN1+/CTCMP 3 -1000 1300 150 R 50 50 1 1 B
+X RA2/AN2/C2IN+/Vref-/DACOUT 4 -1000 1200 150 R 50 50 1 1 B
+X RA3/AN3/C1IN+/Vref+ 5 -1000 1100 150 R 50 50 1 1 B
+X RA4/C1OUT/SRQ/T0CKI 6 -1000 1000 150 R 50 50 1 1 B
+X RA5/AN4/C2OUT/SRNQ/HLVDIN/~SS~ 7 -1000 900 150 R 50 50 1 1 B
+X VSS 8 -100 -1800 150 U 50 50 1 1 W
+X RA7/OSC1/CLKI 9 -1000 700 150 R 50 50 1 1 I
+X RA6/OSC2/CLKO 10 -1000 800 150 R 50 50 1 1 O
+X VDD 20 0 1900 150 D 50 50 1 1 W
+X RC0/SOSCO/T1CKI/T3CKI/T3G/IOCC0 11 -1000 -600 150 R 50 50 1 1 B
+X RB0/AN12/SRI/~FLT0~/SDI/SDA/INT0 21 -1000 400 150 R 50 50 1 1 B
+X RC1/CCP2/SOSCI/IOCC1 12 -1000 -700 150 R 50 50 1 1 B
+X RB1/AN10/C12IN3-/P1C/SCK/SCL/INT1 22 -1000 300 150 R 50 50 1 1 B
+X RC2/AN14/CTPLS/CCP1/P1A/IOCC2 13 -1000 -800 150 R 50 50 1 1 B
+X RB2/AN8/CTED1/P1B/INT2 23 -1000 200 150 R 50 50 1 1 B
+X VUSB3V3/VDDCORE 14 1000 -1200 150 L 50 50 1 1 B
+X RB3/AN9/C12IN2-/CTED2/CCP2/SDO 24 -1000 100 150 R 50 50 1 1 B
+X D-/IOCC4 15 1000 -1300 150 L 50 50 1 1 B
+X RB4/AN11/P1D/I0CB4 25 -1000 0 150 R 50 50 1 1 B
+X D+/IOCC5 16 1000 -1400 150 L 50 50 1 1 B
+X RB5/AN13/T1G/T3CKI/IOCB5 26 -1000 -100 150 R 50 50 1 1 B
+X RC6/AN18/TX/CK/IOCC6 17 -1000 -900 150 R 50 50 1 1 B
+X RB6/IOCB6/PGC 27 -1000 -200 150 R 50 50 1 1 B
+X RC7/AN19/RX/DT/SDO/IOCC7 18 -1000 -1000 150 R 50 50 1 1 B
+X RB7/IOCB7/PGD 28 -1000 -300 150 R 50 50 1 1 B
+X VSS 19 0 -1800 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #