adjustments for new hvcc

Author: dromer

README.md

@@ -32,18 +32,17 @@ This has been done on a Ubuntu server 18.04
 
 Either install gcc-arm-none-eabi system-wide and ensure the binaries are in your path, or edit OwlProgram/compile.mk and point TOOLROOT to where arm-none-eabi binaries are installed.
 
-    TOOLROOT = /usr/bin/ 
+    TOOLROOT = /usr/bin/
 
 To compile puredata patches you need `hvcc`, the Heavy compiler.
 
-    $ sudo apt install python python-enum34 python-jinja2 python-nose2
-    $ git clone https://github.com/pingdynasty/hvcc.git
+    $ sudo pip3 install hvcc
 
 To compile patches in native format (e.g. for testing) you will also need the gcc compiler:
 
     $ sudo apt install gcc
-    
-Compile FirmwareSender 
+
+Compile FirmwareSender
 
 FirmwareSender makes it possible to use `load` and `store` make targets, or by invoking FirmwareSender directly to load/store a compiled patch to the device using sysex codes.
 
@@ -53,7 +52,7 @@ FirmwareSender makes it possible to use `load` and `store` make targets, or by i
     $ make
     $ cp build/FirmwareSender ../../../OwlProgram/Tools
     $ cd ../../../
-   
+
 ## Make targets
 * make libs: build library archives
 * make patch: build patch binary
@@ -145,7 +144,7 @@ Note: use OWL parameters in Maximilian by adding maxiParam objects to your patch
 
 ## Using FirmwareSender
 
-If you prefer to build the patch first and send it later to the device you can 
+If you prefer to build the patch first and send it later to the device you can
 do it like this from the main directory of OwlProgram (this will store in slot 6)
 
     Tools/FirmwareSender -in ./Build/patch.bin -out "OWL-MIDI*" -store 6

Tools/build_send_receive_constants.py

@@ -9,15 +9,14 @@
 
 import os
 dir_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.append('%s/hvcc' % dir_path)
-import core.hv2ir.HeavyLangObject as HeavyLangObject
+from hvcc.core.hv2ir import HeavyLangObject
 
 heavy_hash = HeavyLangObject.HeavyLangObject.get_hash
 
 import jinja2
 
 OWL_BUTTONS = ['Push', 'B1', 'B2', 'B3', 'B4', 'B5', 'B6', 'B7', 'B8']
-               
+
 def get_template(path):
     templateLoader = jinja2.FileSystemLoader(searchpath=dir_path)
     templateEnv = jinja2.Environment(loader=templateLoader)
@@ -46,7 +45,7 @@ def main():
     with open(args.infilename, mode="r") as f:
         ir = json.load(f)
 
-        for name, v in ir['control']['receivers'].iteritems():
+        for name, v in ir['control']['receivers'].items():
             # skip __hv_init and similar
             if name.startswith("__"):
                 continue
@@ -65,7 +64,7 @@ def main():
                 jdata.append((key, name, 'RECV', "0x%x" % heavy_hash(name),
                               0, 1, 0.5, key in OWL_BUTTONS))
 
-        for k, v in ir['objects'].iteritems():
+        for k, v in ir['objects'].items():
             try:
                 if v['type'] == '__send':
                     name = v['args']['name']
@@ -84,7 +83,7 @@ def main():
                 pass
 
     # TODO, check that there is not channel defined both as input and output
-                                                              
+
     # Write to files
     with open(args.outfilename, mode="w") as f:
         template = get_template("Heavy_owl_constants.tpl.h")

heavy.mk

@@ -5,7 +5,7 @@ HEAVYNAME    ?= owl
 HEAVYSRC     ?= $(BUILDROOT)/HeavySource
 HEAVYDIR     ?= $(BUILD)/Heavy
 HEAVYARGS    ?= -g c -n $(HEAVYNAME) -p $(HEAVYDIR) -o $(BUILD)
-HVCC         ?= $(BUILDROOT)/Tools/hvcc/hvcc.py
+HVCC         ?= hvcc
 HVCC_OWL     ?= $(BUILDROOT)/Tools/build_send_receive_constants.py
 
 $(HEAVYDIR)/_main.pd: $(PATCHSOURCE)/$(HEAVYFILE)
@@ -14,9 +14,9 @@ $(HEAVYDIR)/_main.pd: $(PATCHSOURCE)/$(HEAVYFILE)
 	@cp -f $< $@
 
 $(BUILD)/Source/Heavy_owl.h: $(HEAVYDIR)/_main.pd
-	@python2.7 $(HVCC) $(HEAVYDIR)/_main.pd  $(HEAVYARGS)
+	@$(HVCC) $(HEAVYDIR)/_main.pd  $(HEAVYARGS)
 	@mv -f $(BUILD)/c/* $(BUILD)/Source
 	@cp -f $(HEAVYSRC)/HvUtils.h $(HEAVYSRC)/HvMessage.c $(BUILD)/Source
-	@python2.7 $(HVCC_OWL) $(BUILD)/ir/owl.heavy.ir.json $(BUILD)/Source/Heavy_$(HEAVYNAME)_constants.h
+	@python3 $(HVCC_OWL) $(BUILD)/ir/owl.heavy.ir.json $(BUILD)/Source/Heavy_$(HEAVYNAME)_constants.h
 
 heavy: $(BUILD)/Source/Heavy_owl.h