Merge branch 'april-1-patch'

- Tweaks to uploading code for better reporting of failures when over
  VEXnet
- Fix project upgrading. Works as intended now

Author: edjubuh

proscli/flasher.py

@@ -2,6 +2,7 @@
 import os
 import os.path
 import ntpath
+import serial
 import sys
 import prosflasher.ports
 import prosflasher.upload
@@ -93,11 +94,10 @@ def flash(ctx, save_file_system, y, port, binary, no_poll, retry):
     click.echo('Flashing ' + binary + ' to ' + ', '.join(port))
     for p in port:
         tries = 1
-        while tries <= retry:
-            code = prosflasher.upload.upload(p, y, binary, no_poll, ctx)
-            if code or code == -1000:
-                break
+        code = prosflasher.upload.upload(p, y, binary, no_poll, ctx)
+        while tries <= retry and (not code or code == -1000):
             click.echo('Retrying...')
+            code = prosflasher.upload.upload(p, y, binary, no_poll, ctx)
             tries += 1
 
 
@@ -167,7 +167,7 @@ def get_sys_info(cfg, yes, port):
         port = [port]
 
     for p in port:
-        sys_info = prosflasher.upload.ask_sys_info(prosflasher.ports.create_serial(p), cfg)
+        sys_info = prosflasher.upload.ask_sys_info(prosflasher.ports.create_serial(p, serial.PARITY_EVEN), cfg)
         click.echo(repr(sys_info))
 
     pass

proscli/upgrade.py

@@ -16,7 +16,7 @@ def get_upgrade_command():
     if getattr(sys, 'frozen', False):
         cmd = os.path.abspath(os.path.join(sys.executable, '..', '..', 'updater.exe'))
         if os.path.exists(cmd):
-            return [cmd, '/silentall', '-nofreqcheck']
+            return [cmd, '-reducedgui']
         else:
             return False
     else:

prosconductor/providers/githubreleases.py

@@ -26,7 +26,7 @@ def get_cert_attr():
 
 class GithubReleasesDepotProvider(DepotProvider):
     registrar = 'github-releases'
-    location_desc = 'eyo smwd'
+    location_desc = 'username/repository'
     config = {
         'include_prereleases': {
             'method': 'bool',
@@ -80,7 +80,7 @@ def list_online(self, template_types=None):
             # filter out pre-releases according to registar_options (include_prerelease implies prerelease) and
             # by if the release has a kernel-template.zip or library-template.zip file
             for release in [rel for rel in json if
-                            (not rel['prerelease'] or config.registrar_options.get('include_prerelease', False)) and
+                            (not rel['prerelease'] or config.registrar_options.get('include_prereleases', False)) and
                             (not rel['draft'] or config.registrar_options.get('include_draft', False))]:
                 for asset in [a for a in release['assets'] if
                               re.fullmatch(string=a['name'].lower(), pattern='.*-template.zip')]:

prosconductor/providers/local.py

@@ -117,12 +117,12 @@ def create_project(identifier, dest, pros_cli=None):
     copytree(config.directory, dest)
     for root, dirs, files in os.walk(dest):
         for d in dirs:
-            d = os.path.relpath(os.path.join(root, d), config.directory)
+            d = os.path.relpath(os.path.join(root, d), dest)
             if any([fnmatch.fnmatch(d, p) for p in config.template_ignore]):
                 verbose('Removing {}'.format(d))
                 os.rmdir(os.path.join(root, d))
         for f in files:
-            f = os.path.relpath(os.path.join(root, f), config.directory)
+            f = os.path.relpath(os.path.join(root, f), dest)
             if any([fnmatch.fnmatch(f, p) for p in config.template_ignore]):
                 verbose('Removing {}'.format(f))
                 os.remove(os.path.join(root, f))

prosflasher/bootloader.py

@@ -21,6 +21,7 @@ def send_bootloader_command(port, command, response_size=1):
     port.write([command, 0xff - command])
     time.sleep(0.01)
     response = port.read(response_size)
+    debug_response(command, response)
     return response
 
 
@@ -52,7 +53,7 @@ def prepare_bootloader(port):
     time.sleep(0.01)
     port.rts = 0
     time.sleep(0.01)
-    for _ in range(0,3):
+    for _ in range(0, 3):
         port.write([0x7f])
         response = port.read(1)
         debug_response(0x7f, response)
@@ -120,7 +121,7 @@ def erase_flash(port):
     return True
 
 
-def write_flash(port, start_address, data, retry=2):
+def write_flash(port, start_address, data, retry=2, is_wireless=False):
     data = bytearray(data)
     if len(data) > 256:
         click.echo('Tried writing too much data at once! ({} bytes)'.format(len(data)))
@@ -130,33 +131,39 @@ def write_flash(port, start_address, data, retry=2):
     debug('Writing {} bytes to {}'.format(len(data), adr_to_str(c_addr)))
     response = send_bootloader_command(port, 0x31)
     if response is None or len(response) < 1 or response[0] != ACK:
-        click.echo('failed (write command not accepted)')
-        return False
+        if retry > 0:
+            debug('RETRYING PACKET AT COMMAND')
+            return write_flash(port, start_address, data, retry=retry - 1)
+        else:
+            click.echo('failed (write command not accepted)')
+            return False
     port.write(c_addr)
     port.flush()
+    time.sleep(0.005 if is_wireless else 0.002)
     response = port.read(1)
     debug_response(adr_to_str(c_addr), response)
     if response is None or len(response) < 1 or response[0] != ACK:
         if retry > 0:
-            debug('RETRYING PACKET')
-            write_flash(port, start_address, data, retry=retry - 1)
+            debug('RETRYING PACKET AT ADDRESS')
+            return write_flash(port, start_address, data, retry=retry - 1)
         else:
             click.echo('failed (address not accepted)')
             return False
     checksum = len(data) - 1
     for x in data:
         checksum ^= x
-    send_data = data
+    send_data = data[:]
     send_data.insert(0, len(send_data) - 1)
     send_data.append(checksum)
     port.write(send_data)
-    time.sleep(0.005)
+    port.flush()
+    time.sleep(0.007 if is_wireless else 0.002)
     response = port.read(1)
     debug('STM BL RESPONSE TO WRITE: {}'.format(response))
     if response is None or len(response) < 1 or response[0] != ACK:
         if retry > 0:
-            debug('RETRYING PACKET')
-            write_flash(port, start_address, data, retry=retry - 1)
+            debug('RETRYING PACKET AT WRITE')
+            return write_flash(port, start_address, data, retry=retry - 1)
         else:
             click.echo('failed (could not complete upload)')
             return False
@@ -171,14 +178,14 @@ def chunks(l, n):
         yield l[i:i + n]
 
 
-def upload_binary(port, file):
+def upload_binary(port, file, is_wireless=False):
     address = 0x08000000
     with open(file, 'rb') as f:
         data = bytes(f.read())
-        data_segments = [data[x:x+MAX_WRITE_SIZE] for x in range(0, len(data), MAX_WRITE_SIZE)]
+        data_segments = [data[x:x + MAX_WRITE_SIZE] for x in range(0, len(data), MAX_WRITE_SIZE)]
         with click.progressbar(data_segments, label='Uploading binary to Cortex...') as segments:
             for segment in segments:
-                if not write_flash(port, address, segment):
+                if not write_flash(port, address, segment, is_wireless=is_wireless):
                     return False
                 address += 0x100
     return True

prosflasher/ports.py

@@ -41,7 +41,7 @@ def create_serial(port, parity):
     # port.port = port_str if port_str != '' else None
     port.timeout = 0.5
     # port.write_timeout = 5.0
-    port.inter_byte_timeout = 0.1  # todo make sure this is seconds
+    port.inter_byte_timeout = 0.2
     return port
 
 

prosflasher/upload.py

@@ -60,6 +60,13 @@ def __repr__(self):
                         self.joystick_firmware, self.joystick_battery,
                         self.cortex_firmware, self.cortex_battery, self.backup_battery)
 
+    @property
+    def is_wireless(self):
+        return self.connection_type == ConnectionType.serial_vexnet2 or \
+               self.connection_type == ConnectionType.serial_vexnet2_dl or \
+               self.connection_type == ConnectionType.serial_vexnet1 or \
+               self.connection_type == ConnectionType.serial_vexnet1_turbo
+
 
 # THIS MANAGES THE UPLOAD PROCESS FOR A GIVEN PORT/BINARY PAIR
 def upload(port, y, binary, no_poll=False, ctx=proscli.utils.State()):
@@ -79,19 +86,23 @@ def upload(port, y, binary, no_poll=False, ctx=proscli.utils.State()):
                 time.sleep(1.5)
                 sys_info = ask_sys_info(port)
                 if sys_info is None:
-                    click.echo('Failed to get system info... Try again', err=True)
-                    return False
+                    sys_info = SystemInfo()
+                    sys_info.connection_type = ConnectionType.unknown
+                    click.echo('Failed to get system info... Prompting to continue...', err=True)
             click.echo(repr(sys_info))
         else:
             sys_info = SystemInfo()
             sys_info.connection_type = ConnectionType.serial_usb  # assume this
         if sys_info.connection_type == ConnectionType.unknown and not y:
             click.confirm('Unable to determine system type. It may be necessary to press the '
-                          'programming button on the programming kit. Continue?', abort=True, default=True)
+                          'programming button on the programming kit. Continuing is usually safe.'
+                          ' Continue?', abort=True, default=True)
         if sys_info.connection_type == ConnectionType.serial_vexnet2:
             # need to send to download channel
             if not send_to_download_channel(port):
                 return False
+        if sys_info.is_wireless:  # increase read timeout for wireless connections
+            port.timeout = 1.0
         if not expose_bootloader(port):
             return False
         port.read_all()
@@ -101,7 +112,11 @@ def upload(port, y, binary, no_poll=False, ctx=proscli.utils.State()):
             return False
         if not prosflasher.bootloader.erase_flash(port):
             return False
-        if not prosflasher.bootloader.upload_binary(port, binary):
+        if not prosflasher.bootloader.upload_binary(port, binary, is_wireless=sys_info.is_wireless):
+            if sys_info.is_wireless:
+                click.echo('Binary failed to upload. You may now need to upload via a USB connection because too many '
+                           'packets were dropped. Move the joystick closer to the microcontroller for a more reliable '
+                           'connection.')
             return False
         if not prosflasher.bootloader.send_go_command(port, 0x08000000):
             return False
@@ -273,4 +288,3 @@ def dump_cortex(port, file, verbose=False):
         port.close()
     click.echo("Download complete!")
     pass
-