From fcbcd99677cc864a0c8911c99a6e2a106f92567c Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 7 Jul 2013 21:41:29 +0000
Subject: fixed new features

git-svn-id: https://svn.spreadspace.org/pic/trunk@51 a09c6847-51d9-44de-8ef2-e725cf50f3c7
---
 downloader/downloader.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'downloader/downloader.py')

diff --git a/downloader/downloader.py b/downloader/downloader.py
index 653bd72..86a41c9 100755
--- a/downloader/downloader.py
+++ b/downloader/downloader.py
@@ -108,9 +108,11 @@ def exec_command(dev, cmd, param, answer):
                      5: "address invalid", 6: "address prohibited",
                      7: "value out of bounds" }
 
-    cstr = bytearray(struct.pack('<BB', cmd, 0) + param)
+    dev.flushInput()
+    dev.flushOutput()
+
+    cstr = bytearray(struct.pack('<BB', cmd, len(param)+3) + param)
     cstr.extend(struct.pack("<B", calc_csum(cstr)))
-    cstr[1] = len(cstr)
     dev.write(cstr)
 
     astr = bytearray()
@@ -156,9 +158,9 @@ def exec_command(dev, cmd, param, answer):
 ### Commands
 
 def identify(dev):
-    data = exec_command(dev, 1, '', '<BB3sHBBH')
+    data = exec_command(dev, 1, '', '<BB3sHHBHBH')
     id = { 'ver_min': data[0], 'ver_maj': data[1], 'name': data[2], 'devid': data[3],
-           'fss': data[4], 'mess': data[5], 'supported': data[6] }
+           'fs': data[4], 'fss': data[5], 'es': data[6], 'mess': data[7], 'supported': data[8] }
 
     if id['ver_maj'] != VERSION_MAJ:
         print "incompatible protocol version, expected: %d, got: %d" % (VERSION_MAJ, id['ver_maj'])
@@ -167,7 +169,8 @@ def identify(dev):
         print "FSS value is 0 "
         sys.exit(4)
 
-    print "connected with Bootloader '%s' Version %d.%d, (ID=%04X, FSS=%d, MESS=%d)" % (id['name'], id['ver_maj'], id['ver_min'], id['devid'], id['fss'], id['mess'])
+    print "connected with Bootloader '%s' Version %d.%d, (ID=%04X, %d bytes Flash, FSS=%d, %d bytes EEPROM, MESS=%d)" % \
+        (id['name'], id['ver_maj'], id['ver_min'], id['devid'], id['fs'], id['fss'], id['es'], id['mess'])
     return id
 
 def boot(dev):
-- 
cgit v1.2.3