Skip to content

Commit b930c4c

Browse files
mhightower83d-a-v
authored andcommitted
boards.txt.py: Fix packagegen to use newfilestr instead of filestr when writing file. (#7018)
Three missing boards are now in package/package_esp8266com_index.template.json.
1 parent bb6243a commit b930c4c

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

package/package_esp8266com_index.template.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@
6262
{
6363
"name": "SparkFun ESP8266 Thing Dev"
6464
},
65+
{
66+
"name": "SparkFun Blynk Board"
67+
},
6568
{
6669
"name": "SweetPea ESP-210"
6770
},
@@ -106,6 +109,12 @@
106109
},
107110
{
108111
"name": "ESPectro Core"
112+
},
113+
{
114+
"name": "ITEAD Sonoff"
115+
},
116+
{
117+
"name": "DOIT ESP-Mx DevKit (ESP8285)"
109118
}
110119
],
111120
"toolsDependencies": [
@@ -359,4 +368,4 @@
359368
]
360369
}
361370
]
362-
}
371+
}

tools/boards.txt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@
10431043
'resetmethod_nodtr_nosync': collections.OrderedDict([
10441044
( '.upload.resetmethod', '--before no_reset_no_sync --after soft_reset' ),
10451045
]),
1046-
1046+
10471047
####################### menu.FlashMode
10481048

10491049
'flashmode_menu': collections.OrderedDict([
@@ -1635,7 +1635,7 @@ def package ():
16351635
# To get consistent indent/formatting read the JSON and write it out programattically
16361636
if packagegen:
16371637
with open(pkgfname, 'w') as package_file:
1638-
filejson = json.loads(filestr, object_pairs_hook=collections.OrderedDict)
1638+
filejson = json.loads(newfilestr, object_pairs_hook=collections.OrderedDict)
16391639
package_file.write(json.dumps(filejson, indent=3, separators=(',',': ')))
16401640
print("updated: %s" % pkgfname)
16411641
else:

0 commit comments

Comments
 (0)