Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 0.21.x back into master #1301

Merged
merged 11 commits into from
Jun 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. See
[standard-version](/~https://github.com/conventional-changelog/standard-version)
for commit guidelines.

<a name="0.21.1"></a>
## 0.21.1 (2018-06-25)

### Bug fixes

* [c++] Fix `isSettingUp` function that returned opposite value. (#1297)
* [tutorial] Update tutorial to use proper PORT literals, mention new pins and nodes. (#1296)

<a name="0.21.0"></a>
## 0.21.0 (2018-06-09)

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"packages": [
"packages/*"
],
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion packages/xod-arduino/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xod-arduino",
"version": "0.21.0",
"version": "0.21.1",
"description": "XOD project: Arduino transpiler",
"scripts": {
"build:js": "babel src/ -d dist/ --source-maps",
Expand Down
2 changes: 1 addition & 1 deletion packages/xod-arduino/platform/runtime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ TimeMs transactionTime() {
}

bool isSettingUp() {
return !g_isSettingUp;
return g_isSettingUp;
}

template<typename ContextT>
Expand Down
6 changes: 3 additions & 3 deletions packages/xod-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xod-cli",
"version": "0.21.0",
"version": "0.21.1",
"description": "XOD project: Command Line Interface",
"scripts": {
"build:workspace": "cpx \"../../workspace/__lib__/**\" \"./__lib__\"",
Expand Down Expand Up @@ -28,10 +28,10 @@
"sanctuary-def": "^0.14.0",
"source-map-support": "^0.4.15",
"swagger-client": "^3.4.3",
"xod-arduino": "^0.21.0",
"xod-arduino": "^0.21.1",
"xod-fs": "^0.21.0",
"xod-func-tools": "^0.21.0",
"xod-pm": "^0.21.0",
"xod-pm": "^0.21.1",
"xod-project": "^0.21.0",
"xod-tabtest": "^0.21.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/xod-client-browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xod-client-browser",
"version": "0.21.0",
"version": "0.21.1",
"description": "XOD project: Client browser application",
"scripts": {
"build:tutorial-project": "node ./tools/loadTutorialProject.js",
Expand All @@ -23,8 +23,8 @@
"redux": "^3.0.5",
"redux-thunk": "^2.1.0",
"url-parse": "^1.2.0",
"xod-arduino": "^0.21.0",
"xod-client": "^0.21.0",
"xod-arduino": "^0.21.1",
"xod-client": "^0.21.1",
"xod-func-tools": "^0.21.0",
"xod-project": "^0.21.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/xod-client-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "AGPL-3.0",
"main": "src-babel/app/main.js",
"name": "xod-client-electron",
"version": "0.21.0",
"version": "0.21.1",
"scripts": {
"build:workspace": "cpx \"../../workspace/**/*\" \"src-babel/workspace\"",
"build:gui": "webpack --colors",
Expand Down Expand Up @@ -41,9 +41,9 @@
"redux": "^3.0.5",
"redux-thunk": "^2.1.0",
"serialport": "^4.0.7",
"xod-arduino": "^0.21.0",
"xod-arduino": "^0.21.1",
"xod-arduino-deploy": "^0.21.0",
"xod-client": "^0.21.0",
"xod-client": "^0.21.1",
"xod-deploy": "^0.21.0",
"xod-fs": "^0.21.0",
"xod-func-tools": "^0.21.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/xod-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xod-client",
"version": "0.21.0",
"version": "0.21.1",
"description": "XOD project: Client application",
"scripts": {
"build": "babel src/ -d dist/ --source-maps",
Expand Down Expand Up @@ -58,10 +58,10 @@
"url-parse": "^1.1.9",
"url-search-params-polyfill": "^2.0.1",
"vec-la-fp": "^1.5.2",
"xod-arduino": "^0.21.0",
"xod-arduino": "^0.21.1",
"xod-func-tools": "^0.21.0",
"xod-patch-search": "^0.21.0",
"xod-pm": "^0.21.0",
"xod-pm": "^0.21.1",
"xod-project": "^0.21.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/xod-pm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xod-pm",
"version": "0.21.0",
"version": "0.21.1",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/bits/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Low-level bits and bytes operations",
"license": "AGPL-3.0",
"name": "bits",
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/common-hardware/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Hardware drivers for popular and simple peripherals",
"license": "AGPL-3.0",
"name": "common-hardware",
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/core/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "The very basic nodes of XOD",
"license": "AGPL-3.0",
"name": "core",
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/gpio/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes of XOD to deal with GPIO (hardware pins)",
"license": "AGPL-3.0",
"name": "gpio",
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/i2c/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "I²C (aka I2C, IIC, TWI) bus interfacing",
"license": "AGPL-3.0",
"name": "i2c",
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/math/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Nodes of XOD for basic mathematical operations",
"license": "AGPL-3.0",
"name": "math",
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion workspace/__lib__/xod/units/project.xod
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"description": "Units of measurement conversions",
"license": "AGPL-3.0",
"name": "units",
"version": "0.21.0"
"version": "0.21.1"
}
2 changes: 1 addition & 1 deletion workspace/blink/__fixtures__/arduino.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion workspace/lcd-time/__fixtures__/arduino.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion workspace/two-button-switch/__fixtures__/arduino.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.