Use v1.05 binaries in firmwareprep

testjig/firmwareprep.py

@@ -7,14 +7,9 @@
 #
 ########################### Configuration ###########################
 
-# Paths for all .hex files to include in the installation image
-SOURCE_FILES = [
-    "../bin/fc-boot-v101.hex",
-    "../firmware/fc-firmware.hex",
-    ]
-
-# ELF file corresponding to the firmware under test, for symbol lookups
-ELF_FILE = "../firmware/fc-firmware.elf"
+# Firmware image to deploy
+HEX_FILE = "../bin/fc-firmware-v105.hex"
+ELF_FILE = "../bin/fc-firmware-v105.elf"
 
 # Which GDB to use for the firmware image
 GDB_COMMAND = "arm-none-eabi-gdb"
@@ -43,10 +38,10 @@ output.write("""/*
  * Firmware data for Fadecandy production.
  * AUTOMATICALLY GENERATED by firmwareprep.py
  * 
- * Date: %s
+ * Date:     %s
+ * Firmware: %s
+ * SHA1:     %s
  *
- * Source files:
-%s *
  * Copyright (c) 2013 Micah Elizabeth Scott
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -68,16 +63,12 @@ output.write("""/*
  */
 
 """ % (time.asctime(),
-    ''.join([
-        " *     %s (%s)\n" %
-        (f, hashlib.sha1(open(f, 'rb').read()).hexdigest())
-        for f in SOURCE_FILES
-    ])))
+       HEX_FILE,
+       hashlib.sha1(open(HEX_FILE, 'rb').read()).hexdigest()))
 
 # Load all .hex files into a flat memory image
 loader = intelhex.IntelHex()
-for path in SOURCE_FILES:
-    loader.loadhex(path)
+loader.loadhex(HEX_FILE)
 image = loader.tobinstr()
 
 # Pad to a sector boundary