Merge pull request #68 from thepapermen/esp32support

Esp32support

Author: ricki-z

.gitignore

@@ -3,7 +3,7 @@
 *.swp
 .idea/**
 _buildid.py
-
+.python-version
 build/
 dist/
 

airrohr-flasher.py

@@ -12,7 +12,7 @@
 import json
 
 import requests
-from esptool import ESPLoader, erase_flash, write_flash
+from esptool import ESPLoader, erase_flash, write_flash, NotSupportedError
 
 import airrohrFlasher
 from airrohrFlasher.qtvariant import QtGui, QtCore, QtWidgets
@@ -34,6 +34,17 @@
 else:
     RESOURCES_PATH = os.path.dirname(os.path.realpath(__file__))
 
+
+def get_chip_id(esp):
+    """
+    A shim to fix firmware flashing for ESP-32
+    """
+    try:
+        return esp.chip_id()
+    except NotSupportedError:
+        return esp.read_mac()
+
+
 class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
     uploadProgress = QtCore.Signal([str, int])
     configProgress = QtCore.Signal([str, int])
@@ -494,7 +505,7 @@ def write_config(self, progress, device, path, baudrate=460800):
 
         progress.emit(self.tr(
             'Finished in {time:.2f} seconds. Sensor ID: {sensor_id}').format(
-                time=t, sensor_id=esp.chip_id()), 100)
+                time=t, sensor_id=get_chip_id(esp)), 100)
 
         esp.flash_finish(True)
 
@@ -640,7 +651,7 @@ def flash_board(self, progress, device, binary_uri, baudrate=460800):
 
         progress.emit(self.tr(
             'Finished in {time:.2f} seconds. Sensor ID: {sensor_id}').format(
-                time=t, sensor_id=esp.chip_id()), 100)
+                time=t, sensor_id=get_chip_id(esp)), 100)
 
         esp.flash_finish(True)