Merge pull request #163 from c-base/microflo-06

Update to microflo 0.6

Author: bergie

Gruntfile.coffee

@@ -62,7 +62,7 @@ microflo_gen = (name, options={}) ->
     target: 'linux'
     out: "build/#{options.target||'linux'}/#{name}/#{name}.#{options.ext||'cpp'}"
     graph: "graphs/#{name}.fbp"
-    library: "./components-#{name}.json"
+    components: ["./node_modules/microflo-core/components", "./node_modules/microflo-arduino/components/LedChainWS.hpp"]
   for k,v of defaults
     options[k] = v if not options[k]?
 
@@ -75,10 +75,13 @@ microflo_gen = (name, options={}) ->
   fs.mkdirSync path.join(dir,'builder') if not fs.existsSync path.join(dir,'builder')
   cmd = [
     options.microflo,
-    '--target', options.target
-    '--library', options.library
     'generate', options.graph, options.out
+    '--target', options.target
   ]
+
+  for c in options.components
+    cmd = cmd.concat(['--components', c])
+
   return cmd.join(' ')
 
 microflo_compile = (name, options={}) ->
@@ -175,15 +178,15 @@ module.exports = ->
       tablelights_run: './spec/microflo-linux.sh TableLights 4444 & sleep 5'
       portallights_arduino_gen: microflo_gen 'PortalLights', { target: 'arduino', ext: 'ino.tmpl' }
       portallights_arduino_build: arduino_build 'PortalLights', 
-        board: 'arduino:avr:uno'
+        board: 'arduino:avr:leonardo'
         ext: 'ino'
       portallights_linux_gen: microflo_gen 'PortalLights' 
       portallights_linux_comp: microflo_compile 'PortalLights'
       portallights_run: './spec/microflo-linux.sh PortalLights 5555 & sleep 5'
       kill_microflo_linux:
         options: { shell: '/bin/bash' }
         command: 'pkill microflo-linux || echo no processes to kill'
-      flash_arduino: flash_avr 'build/arduino/PortalLights/builder/PortalLights.ino.hex', { board: 'arduino:avr:uno' }
+      flash_arduino: flash_avr 'build/arduino/PortalLights/builder/PortalLights.ino.hex', { board: 'arduino:avr:leonardo' }
 
   # Grunt plugins used for building
   @loadNpmTasks 'grunt-exec'

components-PortalLights.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "google-auth-library": "~0.12.0",
-    "microflo": "~0.5.0",
+    "microflo": "~0.6.0",
     "noflo": "~1.0.0",
     "noflo-core": "~0.5.0",
     "noflo-filesystem": "~2.0.0",
@@ -30,14 +30,15 @@
     "grunt-mocha-test": "^0.13.2",
     "grunt-noflo-lint": "^0.3.0",
     "grunt-string-replace": "^1.3.1",
-    "microflo-core": "^0.3.38",
+    "microflo-core": "^0.6.0",
+    "microflo-arduino": "^0.6.0",
     "mocha": "^4.0.0",
     "noflo-nodejs": "^0.9.0"
   },
   "scripts": {
     "test": "grunt test",
     "start": "./node_modules/.bin/noflo-nodejs --register=false --graph graphs/main.json --secret=ingress --catch-exceptions=false --cache=true",
-    "portallights": "./node_modules/.bin/microflo runtime --port 5555 --graph graphs/PortalLights.fbp --componentmap build/arduino/PortalLights/componentlib-map.json --serial /dev/ttyACM0 --baudrate 9600",
+    "portallights": "./node_modules/.bin/microflo runtime --port 5555 --graph graphs/PortalLights.fbp --componentmap build/arduino/PortalLights/main.component.map.json --serial /dev/ttyACM0 --baudrate 9600",
     "postinstall": "./node_modules/.bin/noflo-cache-preheat"
   },
   "noflo": {

components-TableLights.json

@@ -4,7 +4,7 @@ PORT=$2
 
 FIRMWARE_FILE=build/linux/$NAME/$NAME
 SERIAL_FILE=test.$NAME.microflo
-COMPONENT_MAP=build/linux/$NAME/componentlib-map.json
+COMPONENT_MAP=build/linux/$NAME/$NAME.component.map.json
 OPTIONS="--port $PORT --baudrate 115200 --serial $SERIAL_FILE --graph graphs/$NAME.fbp"
 
 # Make sure we clean up

package.json

@@ -1,6 +1,6 @@
 [Service]
 WorkingDirectory=/opt/ingress-table
-ExecStart=/usr/bin/node --max-old-space-size=100 ./node_modules/.bin/microflo runtime --port 5555 --graph graphs/PortalLights.fbp --componentmap build/arduino/PortalLights/componentlib-map.json --serial /dev/ttyACM0 --baudrate 9600
+ExecStart=/usr/bin/node --max-old-space-size=100 ./node_modules/.bin/microflo runtime --port 5555 --graph graphs/PortalLights.fbp --componentmap build/arduino/PortalLights/PortalLights.component.map.json --serial /dev/ttyACM0 --baudrate 9600
 Restart=always
 User=bergie
 

spec/microflo-linux.sh

@@ -1,6 +1,6 @@
 [Service]
 WorkingDirectory=/opt/ingress-table
-ExecStart=/usr/bin/node --max-old-space-size=100 ./node_modules/.bin/microflo runtime --port 4444 --graph graphs/TableLights.fbp --componentmap build/arduino/TableLights/componentlib-map.json --serial /dev/ttyACM1 --baudrate 115200
+ExecStart=/usr/bin/node --max-old-space-size=100 ./node_modules/.bin/microflo runtime --port 4444 --graph graphs/TableLights.fbp --componentmap build/arduino/TableLights/TableLights.component.map.json --serial /dev/ttyACM1 --baudrate 115200
 #ExecStart=/opt/ingress-table/spec/microflo-linux.sh TableLights 4444
 Restart=always
 User=bergie