Skip to content

Commit 76e6c88

Browse files
theotherjimmytheotherjimmy
committed
auto-formatted target.json
1 parent ca8ae5c commit 76e6c88

File tree

2 files changed

+36
-52
lines changed

2 files changed

+36
-52
lines changed

‎hal/targets.json

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
},
3838
"LPCTarget": {
3939
"inherits": ["Target"],
40-
"post_binary_hook": {
41-
"function": "LPCTargetCode.lpc_patch"
42-
},
40+
"post_binary_hook": {"function": "LPCTargetCode.lpc_patch"},
4341
"public": false
4442
},
4543
"LPC11C24": {
@@ -514,12 +512,12 @@
514512
"core": "Cortex-M0+",
515513
"extra_labels": ["Freescale", "KSDK2_MCUS", "FRDM"],
516514
"macros": ["CPU_MKL27Z64VLH4", "FSL_RTOS_MBED"],
517-
"supported_toolchains": ["ARM","GCC_ARM","IAR"],
515+
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
518516
"supported_form_factors": ["ARDUINO"],
519517
"is_disk_virtual": true,
520518
"default_toolchain": "ARM",
521519
"detect_code": ["0261"],
522-
"progen_target": {"target":"frdm-kl27z"}
520+
"progen_target": {"target": "frdm-kl27z"}
523521
},
524522
"K64F": {
525523
"supported_form_factors": ["ARDUINO"],
@@ -550,7 +548,7 @@
550548
"is_disk_virtual": true,
551549
"default_toolchain": "ARM",
552550
"detect_code": ["0214"],
553-
"progen": {"target":"hexiwear-k64f"}
551+
"progen": {"target": "hexiwear-k64f"}
554552
},
555553
"NUCLEO_F030R8": {
556554
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -741,7 +739,7 @@
741739
"default_toolchain": "uARM",
742740
"supported_form_factors": ["ARDUINO"],
743741
"detect_code": ["0790"],
744-
"progen": {"target":"nucleo-l031k6"}
742+
"progen": {"target": "nucleo-l031k6"}
745743
},
746744
"NUCLEO_L053R8": {
747745
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -913,7 +911,7 @@
913911
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
914912
"extra_labels": ["STM", "STM32F4", "STM32F411RE"],
915913
"macros": ["HSE_VALUE=26000000", "VECT_TAB_OFFSET=0x08010000"],
916-
"post_binary_hook": {
914+
"post_binary_hook": {
917915
"function": "MTSCode.combine_bins_mts_dragonfly",
918916
"toolchains": ["GCC_ARM", "ARM_STD", "ARM_MICRO"]
919917
},
@@ -1030,14 +1028,14 @@
10301028
"macros_add": ["TARGET_MCU_NRF51_16K_S110"],
10311029
"EXPECTED_SOFTDEVICES_WITH_OFFSETS": [
10321030
{
1033-
"name" : "s110_nrf51822_8.0.0_softdevice.hex",
1034-
"boot" : "s110_nrf51822_8.0.0_bootloader.hex",
1035-
"offset" : 98304
1031+
"name": "s110_nrf51822_8.0.0_softdevice.hex",
1032+
"boot": "s110_nrf51822_8.0.0_bootloader.hex",
1033+
"offset": 98304
10361034
},
10371035
{
1038-
"name" : "s110_nrf51822_7.1.0_softdevice.hex",
1039-
"boot" : "s110_nrf51822_7.1.0_bootloader.hex",
1040-
"offset" : 90112
1036+
"name": "s110_nrf51822_7.1.0_softdevice.hex",
1037+
"boot": "s110_nrf51822_7.1.0_bootloader.hex",
1038+
"offset": 90112
10411039
}
10421040
],
10431041
"public": false
@@ -1491,55 +1489,31 @@
14911489
"SAMR21G18A": {
14921490
"inherits": ["Target"],
14931491
"core": "Cortex-M0+",
1494-
"macros": [
1495-
"__SAMR21G18A__",
1496-
"I2C_MASTER_CALLBACK_MODE=true",
1497-
"EXTINT_CALLBACK_MODE=true",
1498-
"USART_CALLBACK_MODE=true",
1499-
"TC_ASYNC=true"
1500-
],
1492+
"macros": ["__SAMR21G18A__", "I2C_MASTER_CALLBACK_MODE=true", "EXTINT_CALLBACK_MODE=true", "USART_CALLBACK_MODE=true", "TC_ASYNC=true"],
15011493
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAMR21"],
15021494
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
15031495
"progen": {"target": "samr21g18a"}
15041496
},
15051497
"SAMD21J18A": {
15061498
"inherits": ["Target"],
15071499
"core": "Cortex-M0+",
1508-
"macros": [
1509-
"__SAMD21J18A__",
1510-
"I2C_MASTER_CALLBACK_MODE=true",
1511-
"EXTINT_CALLBACK_MODE=true",
1512-
"USART_CALLBACK_MODE=true",
1513-
"TC_ASYNC=true"
1514-
],
1500+
"macros": ["__SAMD21J18A__", "I2C_MASTER_CALLBACK_MODE=true", "EXTINT_CALLBACK_MODE=true", "USART_CALLBACK_MODE=true", "TC_ASYNC=true"],
15151501
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAMD21"],
15161502
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
15171503
"progen": {"target": "samd21j18a"}
15181504
},
15191505
"SAMD21G18A": {
15201506
"inherits": ["Target"],
15211507
"core": "Cortex-M0+",
1522-
"macros": [
1523-
"__SAMD21G18A__",
1524-
"I2C_MASTER_CALLBACK_MODE=true",
1525-
"EXTINT_CALLBACK_MODE=true",
1526-
"USART_CALLBACK_MODE=true",
1527-
"TC_ASYNC=true"
1528-
],
1508+
"macros": ["__SAMD21G18A__", "I2C_MASTER_CALLBACK_MODE=true", "EXTINT_CALLBACK_MODE=true", "USART_CALLBACK_MODE=true", "TC_ASYNC=true"],
15291509
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAMD21"],
15301510
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
15311511
"progen": {"target": "samd21g18a"}
15321512
},
15331513
"SAML21J18A": {
15341514
"inherits": ["Target"],
15351515
"core": "Cortex-M0+",
1536-
"macros": [
1537-
"__SAML21J18A__",
1538-
"I2C_MASTER_CALLBACK_MODE=true",
1539-
"EXTINT_CALLBACK_MODE=true",
1540-
"USART_CALLBACK_MODE=true",
1541-
"TC_ASYNC=true"
1542-
],
1516+
"macros": ["__SAML21J18A__", "I2C_MASTER_CALLBACK_MODE=true", "EXTINT_CALLBACK_MODE=true", "USART_CALLBACK_MODE=true", "TC_ASYNC=true"],
15431517
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAML21"],
15441518
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
15451519
"progen": {"target": "samr21j18a"},
@@ -1552,7 +1526,7 @@
15521526
"macros": ["__SAMG55J19__", "BOARD=75", "I2C_MASTER_CALLBACK_MODE=true", "EXTINT_CALLBACK_MODE=true", "USART_CALLBACK_MODE=true", "TC_ASYNC=true"],
15531527
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
15541528
"default_toolchain": "ARM",
1555-
"progen": {"target":"samg55j19"},
1529+
"progen": {"target": "samg55j19"},
15561530
"progen_target": "samg55j19"
15571531
}
15581532
}

‎workspace_tools/remove-device-h.py

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@ def parse_attributes(path) :
9494
m = re.match(attr_matcher, line)
9595
if m: yield m.group(1)
9696

97+
remove_matcher = re.compile('^#define\W+DEVICE_(\w+)\W+[10].*$')
98+
def remove_attributes(path) :
99+
with open(path) as input :
100+
remainder = filter(lambda l: not re.match(remove_matcher, l), input)
101+
with open(path,"wb") as output :
102+
output.truncate(0)
103+
output.write("// The 'provides' section in 'target.json' is now used"+
104+
" to create the device's hardware preprocessor switches.\n")
105+
output.write("// Check the 'provides' section of the target description"+
106+
" in 'targets.json' for more details.\n")
107+
output.writelines(remainder)
108+
97109
def user_select(things, message) :
98110
print(message)
99111
for thing, number in zip(things, range(len(things))):
@@ -148,10 +160,8 @@ def add_to_targets(targets, device_file, verbose=False, remove=False) :
148160
for t in target :
149161
targets[t]["features"] = sorted(list(set(targets[t].setdefault("features",[]) + attrs)))
150162
if verbose : print("[VERBOSE] target {} now features {}".format(t, attrs))
151-
if remove :
152-
global git_processes
153-
git = Popen(['git', 'rm', device_file])
154-
git_processes.append(git)
163+
if remove is True:
164+
remove_attributes(device_file)
155165

156166
if __name__ == '__main__' :
157167
import argparse
@@ -166,8 +176,8 @@ def add_to_targets(targets, device_file, verbose=False, remove=False) :
166176
' to convert from device.h format to a piece of targets.json')
167177
parser.add_argument('-v', '--verbose', action='store_true',
168178
help="print out every target that is updated in the targets.json")
169-
parser.add_argument('-g', '--git-rm', action='store_true',
170-
help="call git rm on every device.h file")
179+
parser.add_argument('-r', '--rm', action='store_true',
180+
help="remove the used attributes from a device.h file")
171181
args = parser.parse_args()
172182
if not args.target and not args.file and not args.all :
173183
print("[WARNING] no action specified; auto-formatting targets.json")
@@ -186,17 +196,17 @@ def add_to_targets(targets, device_file, verbose=False, remove=False) :
186196
for target in args.target :
187197
device_file = find(target, os.curdir)
188198
if device_file :
189-
add_to_targets(targets, device_file, verbose=args.verbose, remove=args.git_rm)
199+
add_to_targets(targets, device_file, verbose=args.verbose, remove=args.rm)
190200
else :
191201
print("[WARNING] could not locate a device file for target {}".format(target))
192202

193203
if args.file :
194204
for file in args.file :
195-
add_to_targets(targets, file, verbose=args.verbose, remove=args.git_rm)
205+
add_to_targets(targets, file, verbose=args.verbose, remove=args.rm)
196206

197207
if args.all :
198208
for file in find_all_devices(os.curdir, verbose=args.verbose) :
199-
add_to_targets(targets, file, verbose=args.verbose, remove=args.git_rm)
209+
add_to_targets(targets, file, verbose=args.verbose, remove=args.rm)
200210

201211
dump(targets_file_name, targets)
202212

0 commit comments

Comments
 (0)