file tool fixes

kripken · kripken · commit fe00c08a453e · 2011-10-13T15:00:30.000-07:00
diff --git a/tools/file2json.py b/tools/file2json.py
@@ -22,5 +22,9 @@
   if len(sdata) > 0:
     lined += ['\n']
 json = '[' + ''.join(lined) + ']'
-print json
+
+if len(sys.argv) < 3:
+  print json
+else:
+  print 'var ' + sys.argv[2] + '=' + json + ';'
 
diff --git a/tools/make_file.py b/tools/make_file.py
@@ -7,8 +7,9 @@
 import os, sys, re
 
 data = open(sys.argv[1], 'r').read()
-m = re.search('\[[\d, ]*\]', data)
+m = re.search('\[[\d, -]*\]', data)
 data = eval(m.group(0))
+data = [x&0xff for x in data]
 string = ''.join([chr(item) for item in data])
 out = open(sys.argv[1]+'.raw', 'wb')
 print data[0:80]
