Skip to content

Commit

Permalink
Merge pull request #517 from parallaxinc/develop
Browse files Browse the repository at this point in the history
Release 1.5.6
  • Loading branch information
zfi authored Oct 6, 2020
2 parents a118f82 + 00ea3da commit 0317e0a
Show file tree
Hide file tree
Showing 21 changed files with 1,588 additions and 864 deletions.
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
</style>
</noscript>
<meta name="application-name" content="BlocklyProp"/>
<meta name="description" content="BlocklyProp Solo is a stand-alone Blockly implementation designed to support Parallax robots and sensor kits.">
<meta name="msapplication-TileColor" content="#FFFFFF"/>
<meta name="msapplication-TileImage" content="dist/images/mstile-144x144.png"/>
<meta name="base" content="">
Expand Down
1,102 changes: 701 additions & 401 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blocklyprop-solo",
"version": "1.5.4",
"version": "1.5.6",
"description": "A simplified implementation of Google's Blockly project configured to support Parallax robots and sensors.",
"main": "index.js",
"scripts": {
Expand All @@ -27,7 +27,7 @@
},
"homepage": "https://github.com/parallaxinc/solo#readme",
"dependencies": {
"@sentry/browser": "^5.21.0",
"@sentry/browser": "^5.25.0",
"ace-builds": "^1.4.8",
"blockly": "^2.20190722.1",
"bootbox": "^5.4.0",
Expand All @@ -47,22 +47,23 @@
"@types/ace": "0.0.43",
"acorn": "^7.1.1",
"chai": "^4.2.0",
"copy-webpack-plugin": "^5.1.1",
"copy-webpack-plugin": "^6.2.0",
"css-loader": "^3.4.2",
"eslint": "^6.6.0",
"eslint-config-google": "^0.14.0",
"html-webpack-plugin": "^4.3.0",
"minimist": "^1.2.5",
"mocha": "^6.2.3",
"node-env-webpack-plugin": "^1.1.0",
"selenium-standalone": "^6.17.0",
"selenium-standalone": "^6.20.0",
"selenium-webdriver": "^4.0.0-alpha.7",
"selfsigned": "^1.10.8",
"sinon": "^7.5.0",
"style-loader": "^1.1.3",
"terser-webpack-plugin": "^3.0.5",
"terser-webpack-plugin": "^4.2.2",
"watchpack-chokidar2": "^2.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^4.2.2"
},
Expand Down
6 changes: 5 additions & 1 deletion src/modules/blockly/generators/propc.js
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,11 @@ Blockly.propc.finish = function(code) {
}

if (profile.description === 'Scribbler Robot') {
setups.unshift(' s3_setup();pause(100);');
// setups.unshift(' s3_setup();pause(100);');
setups.unshift(' ');
setups.unshift(' pause(100);');
setups.unshift(' s3_setup();');
setups.unshift(' // Initialize the robot');
}

// Add volatile to variable declarations in cogs
Expand Down
137 changes: 0 additions & 137 deletions src/modules/blockly/generators/propc/aliaes.js

This file was deleted.

9 changes: 4 additions & 5 deletions src/modules/blockly/generators/propc/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -2237,8 +2237,7 @@ Blockly.Blocks.set_char_at_position = {
};

// Map deprecated block to its replacement
// Blockly.Blocks.set_char_at_position_zero =
// Blockly.Blocks.set_char_at_position;
Blockly.Blocks.set_char_at_position_zero = Blockly.Blocks.set_char_at_position;

/**
*
Expand Down Expand Up @@ -2274,7 +2273,7 @@ Blockly.propc.set_char_at_position = function() {
};

// Map deprecated code to its replacement
// Blockly.propc.set_char_at_position_zero = Blockly.propc.set_char_at_position;
Blockly.propc.set_char_at_position_zero = Blockly.propc.set_char_at_position;

/**
*
Expand Down Expand Up @@ -2318,7 +2317,7 @@ Blockly.Blocks.get_substring = {
};

// Map deprecated code to its replacement
// Blockly.Blocks.get_substring_zero = Blockly.Blocks.get_substring;
Blockly.Blocks.get_substring_zero = Blockly.Blocks.get_substring;

/**
*
Expand Down Expand Up @@ -2384,7 +2383,7 @@ Blockly.propc.get_substring = function() {
};

// Map deprecated code to its replacement
// Blockly.propc.get_substring_zero = Blockly.propc.get_substring;
Blockly.propc.get_substring_zero = Blockly.propc.get_substring;

/**
*
Expand Down
Loading

0 comments on commit 0317e0a

Please sign in to comment.