Merge pull request #2 from FunPythonEC/uPyIDEToga

correcion de errores (testeado)

Author: sasilva1998

__main__.py

@@ -1,4 +1,4 @@
-from uPyIDE.app import main
+from uPy_IDE.app import main
 
 if __name__ == '__main__':
     main().main_loop()

app.py

@@ -6,7 +6,7 @@
 import glob
 import serial
 import time
-from uPyIDE import esptool
+import uPy_IDE.esptool as esptool
 
 def serial_ports():
 	if sys.platform.startswith('win'):
@@ -35,55 +35,65 @@ def startup(self):
 		self.main_window=toga.MainWindow(title=self.name,size=(640,400))
 
 		label_style=Pack(flex=1,padding_right=24)
-		box_style=Pack(direction=ROW,padding=10)
+		box_style_horiz=Pack(direction=ROW,padding=15)
+		box_style_verti=Pack(direction=COLUMN,padding=15)
 
+		#selections
 		self.portselect=toga.Selection(items=serial_ports())
 		self.chipselect=toga.Selection(items=["ESP8266","ESP32"], on_select=self.update_selections)
 		self.verselect=toga.Selection(items=["v1.8.7","v1.9.0","v1.9.1","v1.9.2","v1.9.3","v1.9.4","v1.10.0"])
 
-		self.filelabel=toga.Label("No ha seleccionado ningun archivo")
+		#switchs
+		self.switchdio=toga.Switch('DIO', is_on=False, style=Pack(padding_left=10,padding_top=5))
+
+		self.filelabel=toga.Label("No ha seleccionado ningun archivo", style=Pack(padding=2))
 		self.fname=None
 		self.main_window.content=toga.Box(
 			children=[
-
-				toga.Box(style=box_style, children=[
-					self.portselect,
-					self.chipselect,
-					self.verselect
+				toga.Box(style=box_style_verti, children=[
+
+					toga.Box(style=Pack(direction=ROW,padding_left=25), children=[
+						self.portselect,
+						self.chipselect,
+						self.verselect,
+						self.switchdio
+						]),
+
+					toga.Box(style=Pack(direction=COLUMN,padding_top=7), children=[
+						toga.Button("Seleccionar archivo", on_press=self.action_open_file_dialog, style=Pack(padding_top=15,padding_left=2)),
+						self.filelabel,
+						toga.Button("Grabar archivo en ESP", on_press=self.save_to_esp, style=Pack(padding=2))
+						])
 					]),
-
-				toga.Box(style=box_style, children=[
+				toga.Box(style=box_style_verti, children=[
 					toga.Button("Flashear",on_press=self.flash),
 					toga.Button("Borrar flash/firmware",on_press=self.eraseflash),
 					toga.Button("Actualizar puertos",on_press=self.update_ports)
-					]),
-
-				toga.Box(style=box_style, children=[
-					toga.Button("Seleccionar archivo",on_press=self.action_open_file_dialog),
-					self.filelabel,
-					toga.Button("Grabar archivo en ESP", on_press=self.save_esp)
 					])
 				])
+
 		self.main_window.show()
 
 
-	def save_esp(self, button):
-		command="python3.6 cli.py -p "+self.portselect.value+" put "+fname
-		os.system(command)
+	def save_to_esp(self, button):
+		from uPy_IDE.pyboard import Pyboard
+		from uPy_IDE import cli
+		eboard=Pyboard(self.portselect.value)
+		cli.put(self.fname,board=eboard)
 
 
 	def flash(self,button):
-		import os
 		port=self.portselect.value
 		chip=self.chipselect.value
 		ver=self.verselect.value
 
 		if chip == "ESP32":
-			command = 'python3.6 esptool.py --chip esp32 --port '+port+' write_flash -z 0x1000 esp32/'+ver+'.bin'
-			os.system(command)
+			esptool.main(["--chip","esp32","--port",self.portselect.value,"write_flash","-z","0x1000","esp32/"+ver+'.bin'])
 		elif chip == "ESP8266":
-			command = 'python3.6 esptool.py --port '+port+' --baud 460800 write_flash --flash_size=detect 0 esp8266/'+ver+'.bin'
-			os.system(command)		
+			if self.switchdio.get_is_on:
+				esptool.main(["--port",self.portselect.value,"--baud","460800","write_flash","--flash_size=detect","0","uPy_IDE/esp8266/"+ver+'.bin'])		
+			else:
+				esptool.main(["--port",self.portselect.value,"--baud","460800","write_flash","--flash_size=detect","-fm","dio","0","uPy_IDE/esp8266/"+ver+'.bin'])		
 
 	def update_ports(self, button):
 		portlist = serial_ports()
@@ -104,15 +114,13 @@ def update_selections(self,button):
 
 
 	def eraseflash(self,button):
-		import os
+		
 		port=self.portselect.value
 		chip=self.chipselect.value
 		if chip=='ESP32':
-			command='python3.6 esptool.py --chip esp32 erase_flash'
-			os.system(command)
+			esptool.main(["-p",self.portselect.value,"erase_flash"])
 		elif chip=='ESP8266':
-			command='python3.6 esptool.py --port '+port+' erase_flash'
-			os.system(command)
+			esptool.main(["-p",self.portselect.value,"erase_flash"])
 
 	def action_open_file_dialog(self, widget):
 		try:

cli.py

@@ -35,8 +35,8 @@
 if config:
     dotenv.load_dotenv(dotenv_path=config)
 
-import files as files
-import pyboard as pyboard
+import uPy_IDE.files as files
+import uPy_IDE.pyboard as pyboard
 
 
 _board = None
@@ -194,11 +194,7 @@ def ls(directory, long_format, recursive):
     for f in board_files.ls(directory, long_format=long_format, recursive=recursive):
         print(f)
 
-
-@cli.command()
-@click.argument("local", type=click.Path(exists=True))
-@click.argument("remote", required=False)
-def put(local, remote):
+def put(local, remote=None, board=None):
     """Put a file or folder and its contents on the board.
 
     Put will upload a local file or folder  to the board.  If the file already
@@ -237,7 +233,7 @@ def put(local, remote):
     if os.path.isdir(local):
         # Directory copy, create the directory and walk all children to copy
         # over the files.
-        board_files = files.Files(_board)
+        board_files = files.Files(board)
         for parent, child_dirs, child_files in os.walk(local):
             # Create board filesystem absolute path to parent directory.
             remote_parent = posixpath.normpath(
@@ -259,7 +255,7 @@ def put(local, remote):
         # File copy, open the file and copy its contents to the board.
         # Put the file on the board.
         with open(local, "rb") as infile:
-            board_files = files.Files(_board)
+            board_files = files.Files(board)
             board_files.put(remote, infile.read())
 
 

esptool.py

@@ -2609,7 +2609,6 @@ def add_spi_flash_subparsers(parent, is_elf2image):
     expand_file_arguments()
 
     args = parser.parse_args(custom_commandline)
-
     print('esptool.py v%s' % __version__)
 
     # operation function can take 1 arg (args), 2 args (esp, arg)

files.py

@@ -22,7 +22,7 @@
 import ast
 import textwrap
 
-from pyboard import PyboardError
+from uPy_IDE.pyboard import PyboardError
 
 
 BUFFER_SIZE = 32  # Amount of data to read or write to the serial port at a time.