From 0e66d5c2df73e80575c34df52ccc038a27851b66 Mon Sep 17 00:00:00 2001 From: GEPD Date: Thu, 12 May 2016 17:43:51 -0300 Subject: [PATCH] New Serial Option "Not used" to avoid the error "None serial port selected" when a serial port is not necessary (https://github.com/gepd/Deviot/issues/29) --- Languages/en.lang | 3 +++ Languages/es.lang | 3 +++ Languages/ko.lang | 3 +++ libs/Menu.py | 3 ++- libs/PlatformioCLI.py | 10 +++++++--- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Languages/en.lang b/Languages/en.lang index c8d212c..d006883 100644 --- a/Languages/en.lang +++ b/Languages/en.lang @@ -95,6 +95,9 @@ msgstr "Serial Port(s)" msgid "menu_add_ip" msgstr "Add IP Manually" +msgid "menu_not_used_port" +msgstr "Not Used" + msgid "menu_monitor_serial" msgstr "Monitor Serial" diff --git a/Languages/es.lang b/Languages/es.lang index 91072e9..2e72fb1 100644 --- a/Languages/es.lang +++ b/Languages/es.lang @@ -96,6 +96,9 @@ msgstr "Puerto(s) Serial" msgid "menu_add_ip" msgstr "Agregar IP Manualmente" +msgid "menu_not_used_port" +msgstr "No usado" + msgid "menu_monitor_serial" msgstr "Monitor Serial" diff --git a/Languages/ko.lang b/Languages/ko.lang index 5932c87..72d9230 100644 --- a/Languages/ko.lang +++ b/Languages/ko.lang @@ -95,6 +95,9 @@ msgstr "시리얼 포트" msgid "menu_add_ip" msgstr "IP 추가하기" +msgid "menu_not_used_port" +msgstr "Not Used" + msgid "menu_monitor_serial" msgstr "시리얼 모니터" diff --git a/libs/Menu.py b/libs/Menu.py index 3f04a7e..761f628 100644 --- a/libs/Menu.py +++ b/libs/Menu.py @@ -241,7 +241,8 @@ def createSerialPortsMenu(self): menu_preset = self.getTemplateMenu(file_name='serial.json') menu_ports = [ - {"caption": _("menu_add_ip"), "command": "add_serial_ip"}] + {"caption": _("menu_add_ip"), "command": "add_serial_ip"}, + {"caption": "menu_not_used_port", "command": "select_port", "checkbox": True, "args": {"id_port": "none"}}] for port in port_list: temp_info = {} diff --git a/libs/PlatformioCLI.py b/libs/PlatformioCLI.py index 199834f..c5c72b7 100644 --- a/libs/PlatformioCLI.py +++ b/libs/PlatformioCLI.py @@ -335,7 +335,7 @@ def uploadSketchProject(self): id_port = self.Preferences.get('id_port', '') current_ports = listSerialPorts() - if(id_port not in current_ports): + if(id_port not in current_ports and id_port != 'none'): id_port = False # check port selected @@ -360,8 +360,12 @@ def uploadSketchProject(self): self.message_queue.stopPrint() return - command = ['run', '-t upload --upload-port %s -e %s' % - (id_port, choosen_env)] + up_port = '--upload-port %s' % id_port + if(id_port == 'none'): + up_port = '' + + command = ['run', '-t upload %s -e %s' % + (up_port, choosen_env)] self.Commands.runCommand(command) if(not self.Commands.error_running):