Merge branch 'release/v0.1.2-alpha'

Author: gepd

CHANGES.md

@@ -1,5 +1,24 @@
 # uPiot Release Notes
 
+## Version 0.1.2-alpha | 04 Nov 2017
+
+#### New
+
+* Command to send a cancel string (\x03) through the serial port including a shortcut (ctrl+shift+c).
+
+#### Improvements
+
+* Avoid to send empty string to the console when it's waiting for new data
+* Activate the window console each time it's open or called from a sampy command.
+* Warn the user to restart ST after uPiot is updated.
+* 'sampy run' will now display the output in realtime.
+
+#### Bugs
+
+* Removed hardcoded strings to burn the firmware in other boards.
+* Fix console call when multiples boards are connected (Issue: #1).
+
+
 ## Version 0.1.1-alpha | 28 Oct 2017
 
 #### Improvements

Default (Linux).sublime-keymap

@@ -22,5 +22,9 @@
     },{
         "keys": ["ctrl+alt+p"], 
         "command": "upiot_put_current_file"
+    },{
+        "keys": ["ctrl+shift+c"], 
+        "command": "upiot_raw_serial",
+        "args": {"data": "\\x03"}
     }
 ]

Default (OSX).sublime-keymap

@@ -22,5 +22,9 @@
     },{
         "keys": ["ctrl+alt+p"], 
         "command": "upiot_put_current_file"
+    },{
+        "keys": ["ctrl+shift+c"], 
+        "command": "upiot_raw_serial",
+        "args": {"data": "\\x03"}
     }
 ]

Default (Windows).sublime-keymap

@@ -22,5 +22,9 @@
     },{
         "keys": ["ctrl+alt+p"], 
         "command": "upiot_put_current_file"
+    },{
+        "keys": ["ctrl+shift+c"], 
+        "command": "upiot_raw_serial",
+        "args": {"data": "\\x03"}
     }
 ]

README.md

@@ -112,6 +112,7 @@ List of options available in the command menu. (`ctrl+alt+m`)
 |Put Current File|Puts the focused file your device|
 |Run Current File|Runs the focused file your device|
 |Select Serial Port|Selects the serial port to be used in the Console or `Burn Firmware` command|
+|Cancel (Ctrl + C)|Sends a cancel string to the open serial port (\x03)|
 |Write in Console|Sends an string through the serial port. You can also use the [Console commands]|
 |Sync File From Device|Search all files in your device and save it in the given location|
 |Help|Opens this github|
@@ -125,6 +126,7 @@ At this moment, there is 4 importantant shorcuts:
 * `ctrl+alt+o` Opents the uPiot console
 * `ctrl+alt+r` Runs the current file
 * `ctrl+alt+p` Puts the current file
+* `ctrl+shift+c` Sends a cancel string to the open serial port (\x03)
 
 I haven't test the shortcuts in all platforms, if you have any problem [open a issue](https://github.com/gepd/uPiot-MicroPython-Tool/issues)
 

commands/__init__.py

@@ -40,6 +40,7 @@
 from .select_board import upiotSelectBoardCommand
 from .sampy_help import upiotSampyHelpCommand
 from .min_origami import upiotCreatePaneCommand
+from .raw_serial import upiotRawSerialCommand
 
 __all__ = [
     'upiotBurnFirmwareCommand',
@@ -59,5 +60,6 @@
     'upiotConsoleCommand',
     'upiotConsoleWriteCommand',
     'upiotSampyHelpCommand',
-    'upiotCreatePaneCommand'
+    'upiotCreatePaneCommand',
+    'upiotRawSerialCommand'
 ]

commands/burn_firmware.py

@@ -40,6 +40,7 @@
 
 
 class upiotBurnFirmwareCommand(WindowCommand):
+    board = None
     port = None
     items = None
     firmwares = None
@@ -54,14 +55,14 @@ def run(self, selected=None):
         self.items = []
 
         settings = sublime.load_settings(tools.SETTINGS_NAME)
-        board = settings.get(setting_key, None)
+        self.board = settings.get(setting_key, None)
 
         if(not selected):
             sublime.active_window().run_command('upiot_select_board',
                                                 {'action': tools.BURN})
             return
 
-        self.firmwares = paths.firmware_folder(board)
+        self.firmwares = paths.firmware_folder(self.board)
         self.firmware_list()
 
         tools.quick_panel(self.items, self.callback_selection)
@@ -102,7 +103,7 @@ def burn_firmware(self):
         filename = self.url.split('/')[-1]
         firmware = join(self.firmwares, filename)
 
-        options = self.get_board_options('esp32')
+        options = self.get_board_options(self.board)
         options.append(firmware)
 
         caption = "Do you want to erase the flash memory?"

commands/cancel_command.sublime-commands

@@ -0,0 +1,7 @@
+[
+	{
+        "caption": "UPIOT: Cancel (Ctrl + C)", 
+        "command": "upiot_raw_serial",
+        "args": {"data": "\\x03"}
+    }
+]

commands/download_firmware.py

@@ -61,7 +61,9 @@ def download_firmware(self):
         If the file isn't in the firmwares folder, it download the file and
         put it in a folder corresponding to the board selection
         """
-        folder = paths.firmware_folder('esp32')
+        settings = sublime.load_settings(tools.SETTINGS_NAME)
+        board = settings.get('board', None)
+        folder = paths.firmware_folder(board)
         tools.make_folder(folder)
 
         tools.ACTIVE_VIEW = self.window.active_view()

commands/raw_serial.py

@@ -0,0 +1,43 @@
+# This file is part of the uPiot project, https://github.com/gepd/upiot/
+#
+# MIT License
+#
+# Copyright (c) 2017 GEPD
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import sublime
+from sublime_plugin import WindowCommand
+
+from ..tools import serial
+from ..tools.ampy import pyboard
+from ..tools import str_cmd_serial
+
+
+class upiotRawSerialCommand(WindowCommand):
+
+    def run(self, data):
+        port = serial.selected_port()
+
+        try:
+            sserial = serial.serial_dict[port]
+            sserial.write(str_cmd_serial(data))
+        except:
+            sserial = pyboard.serial_dict[port]
+            sserial.write(str_cmd_serial(data))