move esptool

XionDot · Aug 24, 2017 · 5821e28 · 5821e28
1 parent afb5509
commit 5821e28
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/__init__.py b/__init__.py
@@ -1 +1 @@
-from .panda import Panda, PandaWifiStreaming, PandaDFU
+from .panda import Panda, PandaWifiStreaming, PandaDFU, ESPROM, CesantaFlasher
diff --git a/boardesp/Makefile b/boardesp/Makefile
@@ -14,10 +14,10 @@ else
 endif
 
 flashall: user1.bin user2.bin
-	./tools/esptool.py write_flash 0 $(SDK_BASE)/bin/boot_v1.5.bin 0x01000 user1.bin 0x81000 user2.bin 0x3FE000 $(SDK_BASE)/bin/blank.bin
+	../panda/esptool.py write_flash 0 $(SDK_BASE)/bin/boot_v1.5.bin 0x01000 user1.bin 0x81000 user2.bin 0x3FE000 $(SDK_BASE)/bin/blank.bin
 
 proxy-0x00000.bin: proxy
-	./tools/esptool.py elf2image $^
+	../panda/esptool.py elf2image $^
 
 proxy: proxy.o
 
@@ -42,7 +42,7 @@ obj/rsa.o: ../crypto/rsa.c
 	$(CC) $(CFLAGS) -c $^ -o $@
 
 oldflash: proxy-0x00000.bin
-	./tools/esptool.py write_flash 0 proxy-0x00000.bin 0x40000 proxy-0x40000.bin
+	../panda/esptool.py write_flash 0 proxy-0x00000.bin 0x40000 proxy-0x40000.bin
 
 user1.bin: obj/proxy.o obj/elm327.o obj/webserver.o obj/sha.o obj/rsa.o
 	$(CC) $(CFLAGS) $^ -o a.out -L$(SDK_BASE)/ld -T$(SDK_BASE)/ld/eagle.app.v6.new.1024.app1.ld $(LDLIBS)

diff --git a/boardesp/__init__.py b/boardesp/__init__.py
diff --git a/boardesp/tools/__init__.py b/boardesp/tools/__init__.py
diff --git a/panda/__init__.py b/panda/__init__.py
@@ -9,6 +9,7 @@
 import time
 import traceback
 from dfu import PandaDFU
+from esptool import ESPROM, CesantaFlasher
 
 __version__ = '0.0.3'
 

diff --git a/boardesp/tools/esptool.py → panda/esptool.py b/boardesp/tools/esptool.py → panda/esptool.py
@@ -30,13 +30,13 @@
 import tempfile
 import time
 import traceback
-from panda import Panda
+import usb1
 
 __version__ = "1.2"
 
-import usb1
 class FakePort(object):
   def __init__(self, serial=None):
+    from panda import Panda
     self.panda = Panda(serial)
 
     # will only work on new st, old ones will stay @ 921600

diff --git a/release/flash_release.py b/release/flash_release.py
@@ -2,8 +2,7 @@
 from __future__ import print_function
 import sys
 import time
-from panda import Panda, PandaDFU
-from panda.boardesp.tools.esptool import ESPROM, CesantaFlasher
+from panda import Panda, PandaDFU, ESPROM, CesantaFlasher
 from zipfile import ZipFile
 
 def status(x):
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from .panda import Panda, PandaWifiStreaming, PandaDFU
		from .panda import Panda, PandaWifiStreaming, PandaDFU, ESPROM, CesantaFlasher