Fixes for KiCad7 libraries

jvestman · Sep 23, 2023 · 2929a04 · 2929a04
1 parent 626be76
commit 2929a04
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/arduino_generator.py b/arduino_generator.py
@@ -38,7 +38,7 @@ def generate_atmega328p(args):
 U1['VCC'] += Net.fetch('+5V')
 U1['AVCC'] += Net.fetch('+5V')
 U1['GND'] += Net.fetch('GND')
-U1['~RESET~/PC6'] & R('10k') & Net.fetch('{mcurail}')
+U1['~{RESET}/PC6'] & R('10k') & Net.fetch('{mcurail}')
 {crystal}
 # Serial communications
 U1['PD1'] += Net.fetch('tx')
@@ -61,7 +61,7 @@ def generate_atmega_crystal(args):
     if args['crystal_footprint'] == 'CST':
         return '''
 # Crystal
-ATMEGA_XTAL = Part('Device','Resonator', footprint='Resonator_SMD_muRata_CSTxExxV-3Pin_3.0x1.1mm')
+ATMEGA_XTAL = Part('Device','Resonator', footprint='Resonator_SMD_Murata_CSTxExxV-3Pin_3.0x1.1mm')
 U1['XTAL1/PB6'] += ATMEGA_XTAL[1]
 U1['XTAL2/PB7'] += ATMEGA_XTAL[3]
 ATMEGA_XTAL[2] += Net.fetch('GND')

diff --git a/generator.py b/generator.py
@@ -59,7 +59,7 @@ def generate(args):
     if args.get('mcu') == "WeMos D1 mini":
         code += generate_subcircuit(generate_wemos_d1_mini, args)
 
-    if args.get('mcu') in ['ATmega328P-PU', "ATmega328P-AU", "ATmega328P-MU"]:
+    if args.get('mcu') in ['ATmega328P-P', "ATmega328P-A", "ATmega328P-M"]:
         code += generate_atmega328p(args)
         if args['icsp']:
             code += generate_icsp()
@@ -68,7 +68,7 @@ def generate(args):
         if args['FTDI header']:
             code += generate_arduino_ftdi_reset(args)
 
-    if args.get('mcu') in ['ATtiny85-20PU', 'ATtiny85-20SU', 'ATtiny85-20MU']:
+    if args.get('mcu') in ['ATtiny85-20P', 'ATtiny85-20S', 'ATtiny85-20M']:
         code += generate_attiny85(args)
 
     if args.get('mcu') in ['Arduino Nano']:
@@ -255,7 +255,7 @@ def generate_power_connector(args):
         args['battery_connector_pos'] = '+VBatt'
 
     return '''
-BATTERY = Part('Connector', 'Conn_01x02_Female', footprint='{powersource_footprint}')
+BATTERY = Part('Connector', 'Conn_01x02_Socket', footprint='{powersource_footprint}')
 BATTERY[1] += Net.fetch('{battery_connector_pos}')
 BATTERY[2] += Net.fetch('GND')
 '''.format(**args)
@@ -342,7 +342,7 @@ def generate_18b20(args):
 def generate_onewire_connector(args):
     """Generate connector for external onewire devices"""
     return '''
-ONEWIRECONN = Part('Connector', 'Conn_01x03_Female', footprint='{onewire_connector_footprint}')
+ONEWIRECONN = Part('Connector', 'Conn_01x03_Socket', footprint='{onewire_connector_footprint}')
 ONEWIRECONN[1] += Net.fetch('{mcurail}')
 ONEWIRECONN[2] += Net.fetch('DQ')
 ONEWIRECONN[3] += Net.fetch('GND')
@@ -391,7 +391,7 @@ def generate_ftdi_header(args):
     """Generate header for connecting FTDI programmer"""
 
     return '''
-FTDI_HEADER = Part('Connector', 'Conn_01x06_Female', footprint='Skimibowi:FTDI_Header')
+FTDI_HEADER = Part('Connector', 'Conn_01x06_Pin', footprint='Skimibowi:FTDI_Header')
 FTDI_HEADER[1] += Net.fetch('GND')
 FTDI_HEADER[2] += Net.fetch('CTS')
 FTDI_HEADER[3] += Net.fetch('{mcurail}')

diff --git a/tests/arduino-nano.py b/tests/arduino-nano.py
@@ -53,7 +53,7 @@ def C(value):
     """Creates default capacitor footprint"""
     return Part('Device', 'C', value=value, footprint='Capacitor_SMD:C_1206_3216Metric')
 
-U1 = Part('MCU_Microchip_ATmega', 'ATmega328P-AU', footprint='Package_QFP:TQFP-32_7x7mm_P0.8mm')
+U1 = Part('MCU_Microchip_ATmega', 'ATmega328P-A', footprint='Package_QFP:TQFP-32_7x7mm_P0.8mm')
 
 # Power networks
 U1['VCC'] += Net.fetch('+5V')
@@ -121,7 +121,7 @@ def C(value):
 Net.fetch('GND') & C('100nF') & FTDI230['3V3OUT']
 
 BOARD = Part('MCU_Module', 'Arduino_Nano_v3.x', footprint='Module:Arduino_Nano')
-BOARD['~RESET'] += U1['~RESET~/PC6']
+BOARD['~RESET'] += U1['~{RESET}/PC6']
 BOARD['+5V'] += Net.fetch('+5V')
 BOARD['3V3'] += Net.fetch('+3V3')
 BOARD['GND'] += Net.fetch('GND')

diff --git a/tests/basic-esp12.py b/tests/basic-esp12.py
@@ -64,7 +64,7 @@ def generate_power_led():
 generate_esp()
 
 
-FTDI_HEADER = Part('Connector', 'Conn_01x06_Female', footprint='Skimibowi:FTDI_Header')
+FTDI_HEADER = Part('Connector', 'Conn_01x06_Pin', footprint='Skimibowi:FTDI_Header')
 FTDI_HEADER[1] += Net.fetch('GND')
 FTDI_HEADER[2] += Net.fetch('CTS')
 FTDI_HEADER[3] += Net.fetch('+VBatt')

diff --git a/tests/esp-12-mcp73831-ap2112k-cp2104-feather.py b/tests/esp-12-mcp73831-ap2112k-cp2104-feather.py
@@ -112,7 +112,7 @@ def generate_power_led():
 generate_esp()
 
 
-BATTERY = Part('Connector', 'Conn_01x02_Female', footprint='JST_PH_S2B-PH-K_1x02_P2.00mm_Horizontal')
+BATTERY = Part('Connector', 'Conn_01x02_Socket', footprint='JST_PH_S2B-PH-K_1x02_P2.00mm_Horizontal')
 BATTERY[1] += Net.fetch('+VBatt')
 BATTERY[2] += Net.fetch('GND')
 

diff --git a/tests/esp12-ftdi-header.py b/tests/esp12-ftdi-header.py
@@ -79,7 +79,7 @@ def generate_power_led():
 generate_esp()
 
 
-FTDI_HEADER = Part('Connector', 'Conn_01x06_Female', footprint='Skimibowi:FTDI_Header')
+FTDI_HEADER = Part('Connector', 'Conn_01x06_Pin', footprint='Skimibowi:FTDI_Header')
 FTDI_HEADER[1] += Net.fetch('GND')
 FTDI_HEADER[2] += Net.fetch('CTS')
 FTDI_HEADER[3] += Net.fetch('+VBatt')