Skip to content

Commit

Permalink
Merge pull request #11966 from hugueskamba/hk-remove-json-duplicate-keys
Browse files Browse the repository at this point in the history
Fix targets.json syntax errors
  • Loading branch information
0xc0170 authored Nov 29, 2019
2 parents 733f5e2 + 444c089 commit b4a885d
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions targets/targets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2029,13 +2029,11 @@
],
"overrides": {
"tickless-from-us-ticker": true,
"init-us-ticker-at-boot": true
"init-us-ticker-at-boot": true,
"network-default-interface-type": "ETHERNET"
},
"device_name": "LPC54628J512ET180",
"post_binary_hook": { "function": "LPCTargetCode.lpc_patch" },
"overrides": {
"network-default-interface-type": "ETHERNET"
}
"post_binary_hook": { "function": "LPCTargetCode.lpc_patch" }
},
"LPC546XX": {
"supported_form_factors": ["ARDUINO"],
Expand Down Expand Up @@ -7533,11 +7531,9 @@
"inherits": ["MCU_NRF52832"],
"release_versions": ["5"],
"device_name": "nRF52832_xxAA",
"macros_add": [
"WSF_MAX_HANDLERS=10"
],
"device_has_remove": ["ITM"],
"macros_add": [
"WSF_MAX_HANDLERS=10",
"CONFIG_GPIO_AS_PINRESET",
"NRF52_PAN_12",
"NRF52_PAN_15",
Expand Down

0 comments on commit b4a885d

Please sign in to comment.