From a61b3c48e1998ec64010e6d2f2140b5290371760 Mon Sep 17 00:00:00 2001
From: M Hightower <27247790+mhightower83@users.noreply.github.com>
Date: Thu, 16 Jan 2020 18:36:31 -0800
Subject: [PATCH] Updated packagegen to use newfilestr instead of filestr when
 writing file. Three missing boards are now in
 package/package_esp8266com_index.template.json. @d-a-v please check this. I
 am not sure where this file gets used or how to test this change. Before
 making the change, I was seeing a different result between --package and
 --packagegen.

---
 package/package_esp8266com_index.template.json | 11 ++++++++++-
 tools/boards.txt.py                            |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index 4cb8a1a27d..847eb4a129 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -62,6 +62,9 @@
                   {
                      "name": "SparkFun ESP8266 Thing Dev"
                   },
+                  {
+                     "name": "SparkFun Blynk Board"
+                  },
                   {
                      "name": "SweetPea ESP-210"
                   },
@@ -106,6 +109,12 @@
                   },
                   {
                      "name": "ESPectro Core"
+                  },
+                  {
+                     "name": "ITEAD Sonoff"
+                  },
+                  {
+                     "name": "DOIT ESP-Mx DevKit (ESP8285)"
                   }
                ],
                "toolsDependencies": [
@@ -359,4 +368,4 @@
          ]
       }
    ]
-}
+}
\ No newline at end of file
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 8fbffceb4f..49ccfd4c77 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -1043,7 +1043,7 @@
     'resetmethod_nodtr_nosync': collections.OrderedDict([
         ( '.upload.resetmethod', '--before no_reset_no_sync --after soft_reset' ),
         ]),
-  
+
     ####################### menu.FlashMode
 
     'flashmode_menu': collections.OrderedDict([
@@ -1635,7 +1635,7 @@ def package ():
     # To get consistent indent/formatting read the JSON and write it out programattically
     if packagegen:
         with open(pkgfname, 'w') as package_file:
-            filejson = json.loads(filestr, object_pairs_hook=collections.OrderedDict)
+            filejson = json.loads(newfilestr, object_pairs_hook=collections.OrderedDict)
             package_file.write(json.dumps(filejson, indent=3, separators=(',',': ')))
         print("updated:   %s" % pkgfname)
     else: