get new quickdevloader commands working

scripts/conv_rle.py

@@ -7,16 +7,28 @@ import time
 LEN = 2**16
 
 TARGET="/Users/david/Devel/arch/avr/code/quickdev16/avr/usbload"
+HUFFMAN_ENCODER="/Users/david/Devel/arch/avr/code/quickdev16/tools/huffman/huffman-encode"
 data = open(sys.argv[1],"r").read()
-
-print "Load %s (%i) bytes" % (sys.argv[1],len(data))
+print "Load %s, %i bytes" % (sys.argv[1],len(data))
 data = data[:LEN]
-print "Use (%i) bytes" % (len(data))
+print "Use %i bytes" % (len(data))
 data = binascii.rlecode_hqx(data)
 print "RLE crunch (%i) bytes" % (len(data))
+
 binfile = open("/tmp/loader.rle","w")
 binfile.write(data)
 binfile.close()
+rle_size = len(data)
+
+cmd = "%s /tmp/loader.rle" % HUFFMAN_ENCODER
+os.system(cmd)
+data = open("/tmp/loader.rle.hfm","r").read()
+print "HUFFMAN crunch (%i) bytes" % (len(data))
+huffman_size = len(data)
+
+os.unlink("/tmp/loader.rle")
+os.unlink("/tmp/loader.rle.hfm")
+
 cfile = open("/tmp/loader.c","w")
 hfile = open("/tmp/loader.h","w")
 
@@ -24,10 +36,12 @@ hfile.write('''
 #ifndef __FIFO_H__
 #define __FIFO_H__
 
-#define ROM_SIZE %i
+#define ROM_BUFFER_SIZE  %i
+#define ROM_HUFFMAN_SIZE %i
+#define ROM_RLE_SIZE     %i
 
 #endif
-''' % len(data))
+''' % (len(data), huffman_size, rle_size))
 
 cfile.write('''/*
 File: %s 
@@ -36,7 +50,7 @@ Time: %s
 #include <avr/pgmspace.h>       
 #include <loader.h>       
 
-const char _rom[ROM_SIZE] PROGMEM = {
+const char _rom[ROM_BUFFER_SIZE] PROGMEM = {
 ''' % (sys.argv[1],time.strftime("%a, %d %b %Y %H:%M:%S", time.localtime())))
 
 for idx,c in enumerate(data):