Skip to content

Commit 3c7a9c9

Browse files
committed
microflo: Update to 0.5.x
1 parent 06c19ad commit 3c7a9c9

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ EMSCRIPTEN_CFLAGS:=-DMICROFLO_MESSAGE_LIMIT=200 -s NO_DYNAMIC_EXECUTION=1 -s EXP
2222
build-emscripten:
2323
rm -rf $(BUILD_DIR)
2424
mkdir -p $(BUILD_DIR)
25-
$(MICROFLO) generate $(GRAPH) $(BUILD_DIR)/main.cpp --target emscripten ${LIBRARYOPTION}
26-
cd $(BUILD_DIR) && echo '#include "emscripten.hpp"' >> main.cpp # HAAACK
25+
$(MICROFLO) generate $(GRAPH) $(BUILD_DIR)/main.cpp --target emscripten --mainfile `pwd`/src/emscripten_main.hpp ${LIBRARYOPTION}
2726
cd $(BUILD_DIR) && emcc -o $(TARGET) --pre-js ${PROJECT_DIR}/src/emscripten-pre.js main.cpp $(COMMON_CFLAGS) ${EMSCRIPTEN_CFLAGS}
2827
test -e $(BUILD_DIR)/$(TARGET)
2928
node fix-nodejs-check.js dist/microflo-runtime.js

library.json

-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
{
22
"components": [
33
"AnalogRead",
4-
"ArduinoUno",
54
"BooleanAnd",
65
"BooleanOr",
76
"BreakBeforeMake",
87
"Constrain",
98
"Count",
10-
"Delimit",
119
"DigitalRead",
1210
"DigitalWrite",
1311
"Forward",
@@ -21,10 +19,7 @@
2119
"MonitorPin",
2220
"NumberEquals",
2321
"PwmWrite",
24-
"ReadCapacitivePin",
2522
"Route",
26-
"SerialIn",
27-
"SerialOut",
2823
"Split",
2924
"Timer",
3025
"ToggleBoolean",

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"coffee-script": "^1.12.5",
2222
"fbp": "^1.5.0",
2323
"mocha": "^3.2.0",
24-
"microflo": "^0.3.47",
25-
"microflo-core": "^0.3.34"
24+
"microflo": "^0.5.2",
25+
"microflo-core": "^0.5.0"
2626
}
2727
}

0 commit comments

Comments
 (0)