Revision: 1770 Author: sebastien.lelong Date: Fri Mar 12 12:04:03 2010 Log: update metadata with new PICs/datasheets http://code.google.com/p/jallib/source/detail?r=1770
Modified:
/trunk/tools/adc/adc_an_grp.py
/trunk/tools/adc/adc_pcfg.py
/trunk/tools/adc/adc_pins.py
/trunk/tools/adc/vref_pins.py
/trunk/tools/pinmap.json
/trunk/tools/pinmap_pinsuffix.json
=======================================
--- /trunk/tools/adc/adc_an_grp.py Wed Mar 10 12:04:20 2010
+++ /trunk/tools/adc/adc_an_grp.py Fri Mar 12 12:04:03 2010
@@ -37,18 +37,6 @@
'16F873A',
'18F2539',
'18F2439'],
- (('RB1', 'AN10'), ('RE2', 'AN7'), ('RE0', 'AN5'), ('RE1', 'AN6'),
('RB3', 'AN9'), ('RB2', 'AN8'), ('RC2', 'AN11'), ('RB0', 'AN12'),
('RA5', 'AN4'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1')): ['18LF45J50',
-
'18F45J11',
-
'18LF46J11',
-
'18F46J50',
-
'18LF45J11',
-
'18LF44J50',
-
'18F44J50',
-
'18F45J50',
-
'18LF46J50',
-
'18F46J11',
-
'18LF44J11',
-
'18F44J11'],
(('RB2', 'AN2'), ('RB1', 'AN1'), ('RB0', 'AN0')): ['16F526', '16F506'],
(('RB3', 'AN9'), ('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'),
('RA5', 'AN4'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1'), ('RC2', 'AN11')): ['18F24J50',
'18F25J50',
@@ -73,8 +61,8 @@
'18F2553',
'18F2220',
'18F25K20',
-
'18F2420',
'18F24J10',
+
'18F2420',
'18LF24J10',
'18F23K20',
'18F2321',
@@ -89,11 +77,51 @@
'18F2455',
'18F26K20',
'18F2221'],
- (('RB4', 'AN11'), ('RE2', 'AN7'), ('RE0', 'AN5'), ('RE1', 'AN6'),
('RB3', 'AN9'), ('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'),
('RA5', 'AN4'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1')): ['18F4553',
+ (('RB4', 'AN11'), ('RE2', 'AN7'), ('RB5', 'AN13'), ('RE1', 'AN6'),
('RB3', 'AN9'), ('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'),
('RA5', 'AN4'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1'), ('RE0', 'AN5')): ['16LF1946',
+
'16F727',
+
'16F747',
+
'16F884',
+
'16F887',
+
'16F1939',
+
'16F1947',
+
'16LF1947',
+
'16LF1937',
+
'16F777',
+
'16LF727',
+
'16LF724',
+
'16F1946',
+
'16F724',
+
'16LF1934',
+
'16LF1939',
+
'16F1934',
+
'16F1937'],
+ (('RB4', 'AN11'), ('RE2', 'AN7'), ('RE0', 'AN5'), ('RE1', 'AN6'),
('RB3', 'AN9'), ('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'),
('RA5', 'AN4'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1')): ['18F4620',
+
'18LF45J10',
+
'18F44K20',
+
'18F4220',
+
'18F4221',
+
'18F4610',
+
'18F4553',
'18F4550',
'18F4455',
+
'18F4410',
+
'18F4515',
+
'18F46K20',
+
'18F4525',
+
'18F4523',
+
'18F4520',
+
'18F45J10',
+
'18F4423',
+
'18F4420',
'18F4450',
-
'18F4458'],
+
'18F4510',
+
'18F4458',
+
'18F4321',
+
'18F4320',
+
'18F45K20',
+
'18LF44J10',
+
'18F44J10',
+
'18F43K20'],
(('RB4', 'AN6'), ('RB1', 'AN5'), ('RB0', 'AN4'), ('RA2', 'AN2'),
('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1')): ['18F1320',
'18F1220'],
(('RB4', 'AN9'), ('RB1', 'AN8'), ('RB0', 'AN10'), ('RA5', 'AN4'),
('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1')): ['18F2480',
@@ -102,13 +130,19 @@
'18F2682',
'18F2685',
'18F2680'],
+ (('RB4', 'AN9'), ('RE2', 'AN7'), ('RE0', 'AN5'), ('RE1', 'AN6'),
('RB1', 'AN8'), ('RB0', 'AN10'), ('RA5', 'AN4'), ('RA2', 'AN2'),
('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1')): ['18F4682',
+
'18F4480',
+
'18F4580',
+
'18F4585',
+
'18F4680',
+
'18F4685'],
(('RB5', 'AN13'), ('RB4', 'AN11'), ('RB3', 'AN9'), ('RB2', 'AN8'),
('RB1', 'AN10'), ('RB0', 'AN12'), ('RA5', 'AN4'), ('RA2', 'AN2'),
('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1')): ['16F1938',
-
'16F726',
'16F722',
'16F723',
'16F886',
'16F883',
'16F882',
+
'16F726',
'16F737',
'16F767',
'16LF1938',
@@ -125,9 +159,9 @@
'16LF1826',
'16LF1827'],
(('RC0', 'AN4'), ('RC1', 'AN5'), ('RC2', 'AN6'), ('RC3', 'AN7'),
('RA4', 'AN3'), ('RA2', 'AN2'), ('RA0', 'AN0'), ('RA1', 'AN1')):
['16LF1823',
+
'16HV616',
'16F1824',
'16F1823',
-
'16HV616',
'16F1825',
'16F616',
'16F676',
@@ -143,8 +177,17 @@
'18LF26K22',
'18LF25K22',
'18F26K22'],
+ (('RC7', 'AN19'), ('RD5', 'AN25'), ('RD4', 'AN24'), ('RD7', 'AN27'),
('RD6', 'AN26'), ('RD1', 'AN21'), ('RD0', 'AN20'), ('RD3', 'AN23'),
('RD2', 'AN22'), ('RB5', 'AN13'), ('RB4', 'AN11'), ('RB3', 'AN9'),
('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'), ('RA5', 'AN4'),
('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1'),
('RC4', 'AN16'), ('RC5', 'AN17'), ('RC6', 'AN18'), ('RE1', 'AN6'),
('RC2', 'AN14'), ('RC3', 'AN15'), ('RE2', 'AN7'), ('RE0', 'AN5')):
['18F46K22',
+
'18F44K22',
+
'18LF46K22',
+
'18LF44K22',
+
'18LF45K22',
+
'18F45K22',
+
'18LF43K22',
+
'18F43K22'],
(('RC7', 'AN9'), ('RB5', 'AN11'), ('RB4', 'AN10'), ('RC0', 'AN4'),
('RC1', 'AN5'), ('RC2', 'AN6'), ('RC3', 'AN7'), ('RA4', 'AN3'),
('RA2', 'AN2'), ('RA0', 'AN0'), ('RA1', 'AN1'), ('RC6', 'AN8')):
['18LF13K22',
'16LF721',
+
'16F720',
'16F1829',
'16F1828',
'16F721',
@@ -154,7 +197,6 @@
'16F677',
'18F14K22',
'16LF1828',
-
'16F720',
'16F689',
'16LF1829',
'16F687',
@@ -166,60 +208,6 @@
'18LF13K50',
'18F14K50',
'18LF14K50'],
- (('RE1', 'AN6'), ('RD5', 'AN25'), ('RD4', 'AN24'), ('RD7', 'AN27'),
('RD6', 'AN26'), ('RD1', 'AN21'), ('RD0', 'AN20'), ('RD3', 'AN23'),
('RD2', 'AN22'), ('RB5', 'AN13'), ('RB4', 'AN11'), ('RB3', 'AN9'),
('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'), ('RA5', 'AN4'),
('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1'),
('RE2', 'AN7'), ('RC5', 'AN17'), ('RC6', 'AN18'), ('RC7', 'AN19'),
('RC2', 'AN14'), ('RC3', 'AN15'), ('RC4', 'AN16'), ('RE0', 'AN5')):
['18F46K22',
-
'18F44K22',
-
'18LF46K22',
-
'18LF44K22',
-
'18LF45K22',
-
'18F45K22',
-
'18LF43K22',
-
'18F43K22'],
- (('RE1', 'AN6'), ('RE2', 'AN7'), ('RB5', 'AN13'), ('RB4', 'AN11'),
('RB3', 'AN9'), ('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'),
('RA5', 'AN4'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1'), ('RE0', 'AN5')): ['16LF1946',
-
'16F747',
-
'16F884',
-
'16F887',
-
'16F1939',
-
'16F1947',
-
'16F727',
-
'16LF1947',
-
'16LF1937',
-
'16F777',
-
'16LF727',
-
'16LF724',
-
'16F1946',
-
'16F724',
-
'16LF1934',
-
'16LF1939',
-
'16F1934',
-
'16F1937'],
- (('RE1', 'AN6'), ('RE2', 'AN7'), ('RE0', 'AN5'), ('RB4', 'AN11'),
('RB3', 'AN9'), ('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'),
('RA5', 'AN4'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1')): ['18F4620',
-
'18LF45J10',
-
'18F44K20',
-
'18F4220',
-
'18F4221',
-
'18F4610',
-
'18F4410',
-
'18F46K20',
-
'18F4515',
-
'18F4525',
-
'18F4523',
-
'18F4520',
-
'18F45J10',
-
'18F4423',
-
'18F4420',
-
'18F4510',
-
'18F4321',
-
'18F4320',
-
'18F45K20',
-
'18LF44J10',
-
'18F44J10',
-
'18F43K20'],
- (('RE1', 'AN6'), ('RE2', 'AN7'), ('RE0', 'AN5'), ('RB4', 'AN9'),
('RB1', 'AN8'), ('RB0', 'AN10'), ('RA5', 'AN4'), ('RA2', 'AN2'),
('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1')): ['18F4682',
-
'18F4480',
-
'18F4580',
-
'18F4585',
-
'18F4680',
-
'18F4685'],
(('RE2', 'AN7'), ('RE0', 'AN5'), ('RE1', 'AN6'), ('RA5', 'AN4'),
('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1')): ['16F874A',
'16F914',
'16F946',
@@ -236,6 +224,18 @@
'18F452',
'16F77',
'16F874'],
+ (('RE2', 'AN7'), ('RE0', 'AN5'), ('RE1', 'AN6'), ('RB3', 'AN9'),
('RB2', 'AN8'), ('RB1', 'AN10'), ('RB0', 'AN12'), ('RA5', 'AN4'),
('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1'),
('RC2', 'AN11')): ['18LF45J50',
+
'18F45J11',
+
'18LF46J11',
+
'18F46J50',
+
'18LF45J11',
+
'18LF44J50',
+
'18F44J50',
+
'18F45J50',
+
'18LF46J50',
+
'18F46J11',
+
'18LF44J11',
+
'18F44J11'],
(('RE2', 'AN8'), ('RE0', 'AN6'), ('RE1', 'AN7'), ('RA4', 'AN4'),
('RA5', 'AN5'), ('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'),
('RA1', 'AN1')): ['18F4431',
'18F4331'],
(('RF2', 'AN7'), ('RF6', 'AN11'), ('RF5', 'AN10'), ('RA5', 'AN4'),
('RA2', 'AN2'), ('RA3', 'AN3'), ('RA0', 'AN0'), ('RA1', 'AN1')):
['18F66J50',
=======================================
--- /trunk/tools/adc/adc_pcfg.py Sun Oct 18 11:14:03 2009
+++ /trunk/tools/adc/adc_pcfg.py Fri Mar 12 12:04:03 2010
@@ -1,5 +1,5 @@
adc_pcfg = \
-{'30221C': {'0000': {'RA0': 'A',
+{'30221': {'0000': {'RA0': 'A',
'RA1': 'A',
'RA2': 'A',
'RA3': 'A',
@@ -74,7 +74,7 @@
'RA2': 'VREF-',
'RA3': 'VREF+',
'RA5': 'D'}},
- '30292C': {'0000': {'RA0': 'A',
+ '30292': {'0000': {'RA0': 'A',
'RA1': 'A',
'RA2': 'A',
'RA3': 'A',
@@ -194,7 +194,7 @@
'RE0': 'D',
'RE1': 'D',
'RE2': 'D'}},
- '30325B': {'000': {'RA0': 'A',
+ '30325': {'000': {'RA0': 'A',
'RA1': 'A',
'RA2': 'A',
'RA3': 'A',
@@ -253,7 +253,7 @@
# for 30498C, 14 analog channels can be set with PCFG bits = 0b_0000 or
0b_0001
# keep only one config, else adc_channels.jal generation won't be good
# (variable defined twice)
- '30498C': {'0000': {'AN0/RA0': 'A',
+ '30498': {'0000': {'AN0/RA0': 'A',
'AN1/RA1': 'A',
'AN10/RB1': 'A',
'AN11/RB4': 'A',
@@ -477,7 +477,7 @@
'AN7/RE2': 'D',
'AN8/RB2': 'D',
'AN9/RB3': 'D'}},
- '30569B': {'0000': {'RA0': 'A',
+ '30569': {'0000': {'RA0': 'A',
'RA1': 'A',
'RA2': 'A',
'RA3': 'A',
@@ -597,7 +597,7 @@
'RE0': 'D',
'RE1': 'D',
'RE2': 'D'}},
- '39582B': {'0000': {'AN0/RA0': 'A',
+ '39582': {'0000': {'AN0/RA0': 'A',
'AN1/RA1': 'A',
'AN2/RA2': 'A',
'AN3/RA3': 'A',
@@ -717,7 +717,7 @@
'AN5/RE0': 'D',
'AN6/RE1': 'D',
'AN7/RE2': 'D'}},
- '39597C': {'000': {'RA0': 'A',
+ '39597': {'000': {'RA0': 'A',
'RA1': 'A',
'RA2': 'A',
'RA3': 'A',
@@ -752,7 +752,7 @@
'RA2': 'D',
'RA3': 'D',
'RA5': 'D'}},
- '39598E': {'0000': {'AN0/RA0': 'A',
+ '39598': {'0000': {'AN0/RA0': 'A',
'AN1/RA1': 'A',
'AN2/RA2': 'A',
'AN3/RA3': 'A',
@@ -827,12 +827,12 @@
'AN2/RA2': 'VREF-',
'AN3/RA3': 'VREF+',
'AN4/RA4': 'D'}},
- '41206B': {'0x0': {'RA0': 'A', 'RA1': 'A', 'RA2': 'A', 'RA3': 'A'},
+ '41206': {'0x0': {'RA0': 'A', 'RA1': 'A', 'RA2': 'A', 'RA3': 'A'},
'0x1': {'RA0': 'A', 'RA1': 'A', 'RA2': 'A',
'RA3': 'VREF'},
'100': {'RA0': 'A', 'RA1': 'A', 'RA2': 'D',
'RA3': 'A'},
'101': {'RA0': 'A', 'RA1': 'A', 'RA2': 'D',
'RA3': 'VREF'},
'11x': {'RA0': 'D', 'RA1': 'D', 'RA2': 'D',
'RA3': 'D'}},
- '30485A': {
+ '30485': {
'0000' : {
'AN7/RE2' : 'A',
'AN6/RE1' : 'A',
@@ -984,7 +984,7 @@
'AN0/RA0' : 'A',
},
},
- '30491C' : {
+ '30491' : {
'0000' : {
'AN15/RH7' : 'A',
'AN14/RH6' : 'A',
@@ -1274,7 +1274,7 @@
'AN0/RA0' : 'D',
},
},
- '39948A': {
+ '39948': {
'0000': {
'AN11/RF6': 'A',
'AN10/RF5': 'A',
@@ -1459,7 +1459,7 @@
'AN0/RA0' : 'D',
},
},
- '39632D': {
+ '39632': {
# same config for '0001' and '0010', only keep one config
# else will produce error in ADC lib generation
'0000': {
@@ -1673,7 +1673,7 @@
'AN0/RA0' : 'D',
},
},
- '39760D': {
+ '39760': {
# same config for '0001' and '0010', only keep one config
# else will produce error in ADC lib generation
'0000': {
@@ -1887,7 +1887,7 @@
'AN0/RA0' : 'D',
},
},
- '39887B': {
+ '39887': {
# same config for '0001' and '0010', only keep one config
# else will produce error in ADC lib generation
'0000': {
=======================================
--- /trunk/tools/pinmap.json Wed Mar 10 12:04:20 2010
+++ /trunk/tools/pinmap.json Fri Mar 12 12:04:03 2010
File is too large to display a diff.
--
You received this message because you are subscribed to the Google Groups
"jallib" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/jallib?hl=en.
