Skip to content

Commit 37602fe

Browse files
DenisaCGDenisaCG
authored
Merge pull request #3 from DenisaCG/update-blockly
Updated to v0.2.0 of `jupyterlab-blockly`
2 parents 480fb92 + db5f436 commit 37602fe

File tree

5 files changed

+51
-72
lines changed

5 files changed

+51
-72
lines changed

‎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: 2 additions & 12 deletions
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.0",
6060
"patch-package": "^6.4.7",
6161
"postinstall-postinstall": "^2.1.0"
6262
},
@@ -87,17 +87,7 @@
8787
},
8888
"jupyterlab": {
8989
"extension": true,
90-
"outputDir": "jupyterlab_lego_boost/labextension",
91-
"sharedPackages": {
92-
"jupyterlab-blockly": {
93-
"bundled": false,
94-
"singleton": true
95-
},
96-
"blockly": {
97-
"bundled": false,
98-
"singleton": true
99-
}
100-
}
90+
"outputDir": "jupyterlab_lego_boost/labextension"
10191
},
10292
"jupyter-releaser": {
10393
"hooks": {

‎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.0,<0.3'],
5858
extras_require={
5959
'env': ['bleak', 'pylgbst']
6060
},

‎src/lego_boost_python_generators_and_blocks.js

Lines changed: 43 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ Blockly.Blocks['lego_boost_sleep'] = {
198198
* Generators
199199
*/
200200

201-
Blockly.Python['lego_boost_connect'] = function (block) {
202-
var value_bluetooth_address = Blockly.Python.valueToCode(
201+
BlocklyPy['lego_boost_connect'] = function (block) {
202+
var value_bluetooth_address = BlocklyPy.valueToCode(
203203
block,
204204
'BLUETOOTH_ADDRESS',
205-
Blockly.Python.ORDER_ATOMIC
205+
BlocklyPy.ORDER_ATOMIC
206206
);
207207

208208
var code =
@@ -217,17 +217,13 @@ from pylgbst.hub import MoveHub
217217
from pylgbst import get_connection_bleak
218218
`;
219219

220-
Blockly.Python['lego_boost_move_motor_a_timed'] = function (block) {
221-
var value_time = Blockly.Python.valueToCode(
222-
block,
223-
'TIME',
224-
Blockly.Python.ORDER_ATOMIC
225-
);
220+
BlocklyPy['lego_boost_move_motor_a_timed'] = function (block) {
221+
var value_time = BlocklyPy.valueToCode(block, 'TIME', BlocklyPy.ORDER_ATOMIC);
226222

227-
var value_speed = Blockly.Python.valueToCode(
223+
var value_speed = BlocklyPy.valueToCode(
228224
block,
229225
'SPEED',
230-
Blockly.Python.ORDER_ATOMIC
226+
BlocklyPy.ORDER_ATOMIC
231227
);
232228

233229
var code = 'hub.motor_A.timed(' + value_time + ', ' + value_speed + ')\n';
@@ -238,17 +234,13 @@ Blockly.Blocks['lego_boost_move_motor_a_timed'].toplevel_init = `
238234
import time
239235
`;
240236

241-
Blockly.Python['lego_boost_move_motor_b_timed'] = function (block) {
242-
var value_time = Blockly.Python.valueToCode(
243-
block,
244-
'TIME',
245-
Blockly.Python.ORDER_ATOMIC
246-
);
237+
BlocklyPy['lego_boost_move_motor_b_timed'] = function (block) {
238+
var value_time = BlocklyPy.valueToCode(block, 'TIME', BlocklyPy.ORDER_ATOMIC);
247239

248-
var value_speed = Blockly.Python.valueToCode(
240+
var value_speed = BlocklyPy.valueToCode(
249241
block,
250242
'SPEED',
251-
Blockly.Python.ORDER_ATOMIC
243+
BlocklyPy.ORDER_ATOMIC
252244
);
253245

254246
var code = 'hub.motor_B.timed(' + value_time + ', ' + value_speed + ')\n';
@@ -259,57 +251,53 @@ Blockly.Blocks['lego_boost_move_motor_b_timed'].toplevel_init = `
259251
import time
260252
`;
261253

262-
Blockly.Python['lego_boost_move_motor_a_angled'] = function (block) {
263-
var value_angle = Blockly.Python.valueToCode(
254+
BlocklyPy['lego_boost_move_motor_a_angled'] = function (block) {
255+
var value_angle = BlocklyPy.valueToCode(
264256
block,
265257
'ANGLE',
266-
Blockly.Python.ORDER_ATOMIC
258+
BlocklyPy.ORDER_ATOMIC
267259
);
268260

269-
var value_speed = Blockly.Python.valueToCode(
261+
var value_speed = BlocklyPy.valueToCode(
270262
block,
271263
'SPEED',
272-
Blockly.Python.ORDER_ATOMIC
264+
BlocklyPy.ORDER_ATOMIC
273265
);
274266

275267
var code = 'hub.motor_A.angled(' + value_angle + ', ' + value_speed + ')\n';
276268
return code;
277269
};
278270

279-
Blockly.Python['lego_boost_move_motor_b_angled'] = function (block) {
280-
var value_angle = Blockly.Python.valueToCode(
271+
BlocklyPy['lego_boost_move_motor_b_angled'] = function (block) {
272+
var value_angle = BlocklyPy.valueToCode(
281273
block,
282274
'ANGLE',
283-
Blockly.Python.ORDER_ATOMIC
275+
BlocklyPy.ORDER_ATOMIC
284276
);
285277

286-
var value_speed = Blockly.Python.valueToCode(
278+
var value_speed = BlocklyPy.valueToCode(
287279
block,
288280
'SPEED',
289-
Blockly.Python.ORDER_ATOMIC
281+
BlocklyPy.ORDER_ATOMIC
290282
);
291283

292284
var code = 'hub.motor_B.angled(' + value_angle + ', ' + value_speed + ')\n';
293285
return code;
294286
};
295287

296-
Blockly.Python['lego_boost_move_motor_ab_timed'] = function (block) {
297-
var value_time = Blockly.Python.valueToCode(
298-
block,
299-
'TIME',
300-
Blockly.Python.ORDER_ATOMIC
301-
);
288+
BlocklyPy['lego_boost_move_motor_ab_timed'] = function (block) {
289+
var value_time = BlocklyPy.valueToCode(block, 'TIME', BlocklyPy.ORDER_ATOMIC);
302290

303-
var value_speed_a = Blockly.Python.valueToCode(
291+
var value_speed_a = BlocklyPy.valueToCode(
304292
block,
305293
'SPEED_A',
306-
Blockly.Python.ORDER_ATOMIC
294+
BlocklyPy.ORDER_ATOMIC
307295
);
308296

309-
var value_speed_b = Blockly.Python.valueToCode(
297+
var value_speed_b = BlocklyPy.valueToCode(
310298
block,
311299
'SPEED_B',
312-
Blockly.Python.ORDER_ATOMIC
300+
BlocklyPy.ORDER_ATOMIC
313301
);
314302

315303
var code =
@@ -327,23 +315,23 @@ Blockly.Blocks['lego_boost_move_motor_ab_timed'].toplevel_init = `
327315
import time
328316
`;
329317

330-
Blockly.Python['lego_boost_move_motor_ab_angled'] = function (block) {
331-
var value_angle = Blockly.Python.valueToCode(
318+
BlocklyPy['lego_boost_move_motor_ab_angled'] = function (block) {
319+
var value_angle = BlocklyPy.valueToCode(
332320
block,
333321
'ANGLE',
334-
Blockly.Python.ORDER_ATOMIC
322+
BlocklyPy.ORDER_ATOMIC
335323
);
336324

337-
var value_speed_a = Blockly.Python.valueToCode(
325+
var value_speed_a = BlocklyPy.valueToCode(
338326
block,
339327
'SPEED_A',
340-
Blockly.Python.ORDER_ATOMIC
328+
BlocklyPy.ORDER_ATOMIC
341329
);
342330

343-
var value_speed_b = Blockly.Python.valueToCode(
331+
var value_speed_b = BlocklyPy.valueToCode(
344332
block,
345333
'SPEED_B',
346-
Blockly.Python.ORDER_ATOMIC
334+
BlocklyPy.ORDER_ATOMIC
347335
);
348336

349337
var code =
@@ -356,35 +344,36 @@ Blockly.Python['lego_boost_move_motor_ab_angled'] = function (block) {
356344
return code;
357345
};
358346

359-
Blockly.Python['lego_boost_start_speed'] = function (block) {
360-
var value_speed = Blockly.Python.valueToCode(
347+
BlocklyPy['lego_boost_start_speed'] = function (block) {
348+
var value_speed = BlocklyPy.valueToCode(
361349
block,
362350
'SPEED',
363-
Blockly.Python.ORDER_ATOMIC
351+
BlocklyPy.ORDER_ATOMIC
364352
);
365353

366354
var code = 'hub.motor_external.start_speed(' + value_speed + ')\n';
367355
return code;
368356
};
369357

370-
Blockly.Python['lego_boost_stop_motors'] = function (block) {
358+
BlocklyPy['lego_boost_stop_motors'] = function (block) {
371359
var code = 'hub.motor_external.stop()\n';
372360
return code;
373361
};
374362

375-
Blockly.Python['lego_boost_disconnect'] = function (block) {
363+
BlocklyPy['lego_boost_disconnect'] = function (block) {
376364
var code = 'hub.disconnect()\n';
377365
return code;
378366
};
379367

380-
Blockly.Python['lego_boost_sleep'] = function (block) {
381-
var value_seconds = Blockly.Python.valueToCode(
368+
BlocklyPy['lego_boost_sleep'] = function (block) {
369+
var value_seconds = BlocklyPy.valueToCode(
382370
block,
383371
'SECONDS',
384-
Blockly.Python.ORDER_ATOMIC
372+
BlocklyPy.ORDER_ATOMIC
385373
);
386374

387375
var code = 'time.sleep(' + value_seconds + ')\n';
376+
return code;
388377
};
389378

390379
Blockly.Blocks['lego_boost_sleep'].toplevel_init = `

‎yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3827,10 +3827,10 @@ jsprim@^1.2.2:
38273827
json-schema "0.4.0"
38283828
verror "1.10.0"
38293829

3830-
jupyterlab-blockly@^0.1.1:
3831-
version "0.1.1"
3832-
resolved "https://registry.yarnpkg.com/jupyterlab-blockly/-/jupyterlab-blockly-0.1.1.tgz#829738ed96f0da0032ea3733b48ce8deb2046a08"
3833-
integrity sha512-zU73Omvg86QzjtXlLZncR+W4sHfmDmL2pId8qeCZfkDczfIX6tlduJcw7eKyqa7eHWHox77VL8B5IrF99Uzp4w==
3830+
jupyterlab-blockly@^0.2.0:
3831+
version "0.2.0"
3832+
resolved "https://registry.yarnpkg.com/jupyterlab-blockly/-/jupyterlab-blockly-0.2.0.tgz#fc1467b832d7e981c1066890711063fc7adfa598"
3833+
integrity sha512-81btcNmyqzusDLWtAsiPKfQ+xmHQG4GX69r4M5N+nDe+12GJ1q7TKiLkqU5X5oC1/QwwUhewCfivOWoJMAtoZg==
38343834
dependencies:
38353835
"@jupyterlab/apputils" "^3.4"
38363836
"@jupyterlab/cells" "^3.4"

0 commit comments

Comments
 (0)