Bump versions

About.py

@@ -2,6 +2,7 @@
 # coding=utf-8
 
 import sys
+import datetime
 import os
 import wx
 import wx.html
@@ -36,7 +37,7 @@ class AboutDlg(wx.Dialog):
     </a>
     </p>
 
-    <p>&copy; 2020 Marcel St&ouml;r. Licensed under MIT.</p>
+    <p>&copy; {2} Marcel St&ouml;r. Licensed under MIT.</p>
 
     <p>
         <wxp module="wx" class="Button">
@@ -54,7 +55,7 @@ class AboutDlg(wx.Dialog):
         html = HtmlWindow(self, wx.ID_ANY, size=(420, -1))
         if "gtk2" in wx.PlatformInfo or "gtk3" in wx.PlatformInfo:
             html.SetStandardFonts()
-        txt = self.text.format(self._get_bundle_dir(), __version__)
+        txt = self.text.format(self._get_bundle_dir(), __version__, datetime.datetime.now().year)
         html.SetPage(txt)
         ir = html.GetInternalRepresentation()
         html.SetSize((ir.GetWidth() + 25, ir.GetHeight() + 25))

Main.py

@@ -13,12 +13,8 @@ import json
 import images as images
 from serial import SerialException
 from serial.tools import list_ports
-from esptool import ESPLoader
-from esptool import NotImplementedInROMError
-from esptool import FatalError
-from argparse import Namespace
 
-__version__ = "4.0"
+__version__ = "5.0.0"
 __flash_help__ = '''
 <p>This setting is highly dependent on your device!<p>
 <p>
@@ -61,6 +57,11 @@ class RedirectText:
         # noinspection PyStatementEffect
         None
 
+    # esptool >=3 handles output differently of the output stream is not a TTY
+    # noinspection PyMethodMayBeStatic
+    def isatty(self):
+        return True
+
 # ---------------------------------------------------------------------------
 
 
@@ -83,6 +84,8 @@ class FlashingThread(threading.Thread):
             command.extend(["--baud", str(self._config.baud),
                             "--after", "no_reset",
                             "write_flash",
+                            # https://github.com/espressif/esptool/issues/599
+                            "--flash_size", "detect",
                             "--flash_mode", self._config.mode,
                             "0x00000", self._config.firmware_path])
 
@@ -209,7 +212,7 @@ class NodeMcuFlasher(wx.Frame):
         self._select_configured_port()
         bmp = images.Reload.GetBitmap()
         reload_button = wx.BitmapButton(panel, id=wx.ID_ANY, bitmap=bmp,
-                                        size=(bmp.GetWidth() + 7, bmp.GetHeight() + 7))
+                                        size=(bmp.GetWidth() + 2, bmp.GetHeight() + 2))
         reload_button.Bind(wx.EVT_BUTTON, on_reload)
         reload_button.SetToolTip("Reload serial device list")
 
@@ -219,7 +222,7 @@ class NodeMcuFlasher(wx.Frame):
         serial_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
         serial_boxsizer.Add(self.choice, 1, wx.EXPAND)
         serial_boxsizer.AddStretchSpacer(0)
-        serial_boxsizer.Add(reload_button, 0, wx.ALIGN_RIGHT, 20)
+        serial_boxsizer.Add(reload_button)
 
         baud_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
 
@@ -298,7 +301,7 @@ class NodeMcuFlasher(wx.Frame):
         flashmode_label_boxsizer = wx.BoxSizer(wx.HORIZONTAL)
         flashmode_label_boxsizer.Add(flashmode_label, 1, wx.EXPAND)
         flashmode_label_boxsizer.AddStretchSpacer(0)
-        flashmode_label_boxsizer.Add(icon, 0, wx.ALIGN_RIGHT, 20)
+        flashmode_label_boxsizer.Add(icon)
 
         erase_label = wx.StaticText(panel, label="Erase flash")
         console_label = wx.StaticText(panel, label="Console")

build-on-mac.spec

@@ -25,6 +25,6 @@ exe = EXE(pyz,
           upx=True,
           console=False , icon='images/icon-256.icns')
 app = BUNDLE(exe,
-             name='NodeMCU-PyFlasher-4.0.app',
+             name='NodeMCU-PyFlasher-5.0.0.app',
              icon='./images/icon-256.icns',
              bundle_identifier='com.frightanic.nodemcu-pyflasher')

build-on-win.spec

@@ -19,7 +19,7 @@ exe = EXE(pyz,
           a.binaries,
           a.zipfiles,
           a.datas,
-          name='NodeMCU-PyFlasher-4.0',
+          name='NodeMCU-PyFlasher-5.0.0',
           debug=False,
           strip=False,
           upx=True,

build.bat

@@ -1,3 +1,4 @@
 pyinstaller --log-level=DEBUG ^
             --noconfirm ^
+            --windowed ^
             build-on-win.spec

build.sh

@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
-#rm -fr build dist
-VERSION=4.0
+# rm -fr build dist
+VERSION=5.0.0
 NAME=NodeMCU-PyFlasher
 
 pyinstaller --log-level=DEBUG \
             --noconfirm \
+            --windowed \
             build-on-mac.spec
 
-#https://github.com/sindresorhus/create-dmg
+# https://github.com/sindresorhus/create-dmg
 create-dmg dist/$NAME-$VERSION.app
 mv "$NAME-$VERSION 0.0.0.dmg" dist/$NAME-$VERSION.dmg

esptool-py-why-here.txt

@@ -1,12 +0,0 @@
-If esptool.py is installed using python setup.py` from a checked out version it creates something like the following
-in the Python environment
-
-esptool.py file containing
-
-#!/usr/local/opt/python/bin/python2.7
-# EASY-INSTALL-SCRIPT: 'esptool==1.3.dev0','esptool.py'
-__requires__ = 'esptool==1.3.dev0'
-__import__('pkg_resources').run_script('esptool==1.3.dev0', 'esptool.py')
-
-PyInstaller (and cx_Freeze) doesn't support pkg_resources and complains about 'ImportError: "No module named
-pkg_resources"'. This can be avoided if the application maintains a local copy of esptool.py.

requirements.txt

@@ -1,3 +1,5 @@
-esptool==2.6
-wxPython==4.0.4
-PyInstaller==3.6
+esptool>=3.0
+pyserial~=3.5
+wxPython~=4.1.1
+PyInstaller~=4.2
+httplib2>=0.18.1