Skip to content

Commit 7b22ad8

Browse files
authored
Merge pull request #13 from DenisaCG/update-blockly
Updated to v0.2.1 of jupyterlab-blockly
2 parents cb3bbc0 + d58b075 commit 7b22ad8

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

examples/movement-example.jpblockly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"blocks":{"languageVersion":0,"blocks":[{"type":"niryo_one_connect","id":"daHwh[e6jtG#fh-i8ewz","x":176,"y":89,"fields":{"ip_0":10,"ip_1":10,"ip_2":10,"ip_3":10},"inputs":{"DO":{"block":{"type":"niryo_one_move_joints","id":"QKjvAW4f%h5[9b0xWOR_","fields":{"JOINTS_1":0,"JOINTS_2":0,"JOINTS_3":0,"JOINTS_4":0,"JOINTS_5":0,"JOINTS_6":0},"next":{"block":{"type":"niryo_one_move_joints","id":")K{~gp)SO(SWt{@ST5m!","fields":{"JOINTS_1":1,"JOINTS_2":1,"JOINTS_3":1,"JOINTS_4":1,"JOINTS_5":1,"JOINTS_6":1},"next":{"block":{"type":"niryo_one_move_joints","id":"]Cx.bVc8#Y_w;g]jl|%x","fields":{"JOINTS_1":60,"JOINTS_2":90,"JOINTS_3":60,"JOINTS_4":90,"JOINTS_5":0,"JOINTS_6":60},"next":{"block":{"type":"niryo_one_move_to_home_pose","id":"(eEKneN4=Zx1|c{N#dFy"}}}}}}}}}}]}}
1+
{"blocks":{"languageVersion":0,"blocks":[{"type":"niryo_one_connect","id":"daHwh[e6jtG#fh-i8ewz","x":176,"y":89,"fields":{"ip_0":169,"ip_1":254,"ip_2":200,"ip_3":200},"inputs":{"DO":{"block":{"type":"niryo_one_calibrate_auto","id":"gPP@%%K8Z~niKj0%6GAl","next":{"block":{"type":"niryo_one_move_joints","id":"QKjvAW4f%h5[9b0xWOR_","fields":{"JOINTS_1":0,"JOINTS_2":0,"JOINTS_3":0,"JOINTS_4":0,"JOINTS_5":0,"JOINTS_6":0},"next":{"block":{"type":"niryo_one_move_joints","id":"@oyk1!``MQ_9,YSL+=l@","fields":{"JOINTS_1":0,"JOINTS_2":-0.6,"JOINTS_3":0,"JOINTS_4":0,"JOINTS_5":0,"JOINTS_6":0},"next":{"block":{"type":"niryo_one_move_joints","id":"HMC#_g[|N.NjfIuLw51W","fields":{"JOINTS_1":-0.1,"JOINTS_2":-0.6,"JOINTS_3":0,"JOINTS_4":0,"JOINTS_5":0,"JOINTS_6":0},"next":{"block":{"type":"niryo_one_wait","id":"NFyKiagT{R?S1EkK_i)|","inputs":{"WAIT_TIME":{"block":{"type":"math_number","id":"zw.0izqes:SEtoOV_KLh","fields":{"NUM":2}}}},"next":{"block":{"type":"niryo_one_move_to_home_pose","id":"jo-LL2QwGvRG8IVO,zFX"}}}}}}}}}}}}}}]}}

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"dependencies": {
5757
"@jupyterlab/application": "^3.4",
5858
"blockly": "^7.20211209.2",
59-
"jupyterlab-blockly": "^0.1.1",
59+
"jupyterlab-blockly": "^0.2.1",
6060
"patch-package": "^6.4.7",
6161
"postinstall-postinstall": "^2.1.0"
6262
},

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
zip_safe=False,
5555
include_package_data=True,
5656
python_requires=">=3.7",
57-
install_requires=['jupyterlab-blockly>=0.1.1,<0.2'],
57+
install_requires=['jupyterlab-blockly>=0.2.1,<0.3'],
5858
extras_require={
5959
'env': ['pyniryo']
6060
},

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3737,10 +3737,10 @@ jsprim@^1.2.2:
37373737
json-schema "0.4.0"
37383738
verror "1.10.0"
37393739

3740-
jupyterlab-blockly@^0.1.1:
3741-
version "0.1.1"
3742-
resolved "https://registry.yarnpkg.com/jupyterlab-blockly/-/jupyterlab-blockly-0.1.1.tgz#829738ed96f0da0032ea3733b48ce8deb2046a08"
3743-
integrity sha512-zU73Omvg86QzjtXlLZncR+W4sHfmDmL2pId8qeCZfkDczfIX6tlduJcw7eKyqa7eHWHox77VL8B5IrF99Uzp4w==
3740+
jupyterlab-blockly@^0.2.1:
3741+
version "0.2.1"
3742+
resolved "https://registry.yarnpkg.com/jupyterlab-blockly/-/jupyterlab-blockly-0.2.1.tgz#5061e4cbbe059038d3de2bdb530a4bc81d84e2c5"
3743+
integrity sha512-mCWalOGzfe9Z6ZIVjFrD+pbelA+bmApcXbfLUo+AGVjWbYPEpSq4I9qt/DP7hwklXpYVNzst2bla1f7NajU2Tw==
37443744
dependencies:
37453745
"@jupyterlab/apputils" "^3.4"
37463746
"@jupyterlab/cells" "^3.4"

0 commit comments

Comments
 (0)