Преглед на файлове

Update for v0.2. Make gw script require latest firmware.

Keir Fraser преди 5 години
родител
ревизия
8421be9d3b
променени са 5 файла, в които са добавени 15 реда и са изтрити 7 реда
  1. 1 0
      .gitignore
  2. 1 1
      Makefile
  3. 1 1
      Rules.mk
  4. 0 2
      scripts/greaseweazle/version.py
  5. 12 3
      scripts/gw.py

+ 1 - 0
.gitignore

@@ -12,4 +12,5 @@
 *.adf
 *.scp
 *.pyc
+scripts/greaseweazle/version.py
 Greaseweazle-*

+ 1 - 1
Makefile

@@ -1,6 +1,6 @@
 
 export FW_MAJOR := 0
-export FW_MINOR := 1
+export FW_MINOR := 2
 
 PROJ = Greaseweazle
 VER := v$(FW_MAJOR).$(FW_MINOR)

+ 1 - 1
Rules.mk

@@ -3,7 +3,7 @@ CC = $(TOOL_PREFIX)gcc
 OBJCOPY = $(TOOL_PREFIX)objcopy
 LD = $(TOOL_PREFIX)ld
 
-PYTHON = python
+PYTHON = python3
 
 ifneq ($(VERBOSE),1)
 TOOL_PREFIX := @$(TOOL_PREFIX)

+ 0 - 2
scripts/greaseweazle/version.py

@@ -1,2 +0,0 @@
-major = 0
-minor = 1

+ 12 - 3
scripts/gw.py

@@ -372,9 +372,18 @@ def _main(argv):
   sample_freq = info[4]
   update_mode = (info[2] == 0)
 
-  print("** %s v%u.%u"
-        % (("Greaseweazle","Bootloader")[update_mode], info[0], info[1]))
-
+  print("** %s v%u.%u, Host Tools v%u.%u"
+        % (("Greaseweazle","Bootloader")[update_mode], info[0], info[1],
+           version.major, version.minor))
+  
+  if (not update_mode
+      and (version.major > info[0]
+           or (version.major == info[0] and version.minor > info[1]))):
+    print("Firmware is out of date: Require >= v%u.%u"
+          % (version.major, version.minor))
+    print("Install the Update Jumper and \"update <update_file>\"")
+    return
+  
   if update_mode and args.action != "update":
     print("Greaseweazle is in Firmware Update Mode:")
     print(" The only available action is \"update <update_file>\"")