From ed9c1e9f9689c5364fe63742d17015b17bcaa265 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 7 Jul 2013 14:17:49 +0000
Subject: removed name for identify - now using userid

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

(limited to 'downloader/downloader.py')

diff --git a/downloader/downloader.py b/downloader/downloader.py
index f0407e9..c0ce34f 100755
--- a/downloader/downloader.py
+++ b/downloader/downloader.py
@@ -158,8 +158,8 @@ def exec_command(dev, cmd, param, answer):
 ### Commands
 
 def identify(dev):
-    data = exec_command(dev, 1, '', '<BB10sHHBHBH')
-    id = { 'ver_min': data[0], 'ver_maj': data[1], 'name': data[2], 'devid': data[3],
+    data = exec_command(dev, 1, '', '<BBHHHBHBH')
+    id = { 'ver_min': data[0], 'ver_maj': data[1], 'userid': data[2], 'devid': data[3],
            'fs': data[4], 'fss': data[5], 'es': data[6], 'mess': data[7], 'supported': data[8] }
 
     if id['ver_maj'] != VERSION_MAJ:
@@ -169,8 +169,8 @@ def identify(dev):
         print "FSS value is 0 "
         sys.exit(4)
 
-    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'])
+    print "connected with Bootloader '%04X' Version %d.%d, (ID=%04X, %d bytes Flash, FSS=%d, %d bytes EEPROM, MESS=%d)" % \
+        (id['userid'], 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