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

Development #374

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
10da3e1
change I2C address of VL53L8CX first
PaulaScharf Nov 14, 2024
0f0467c
if and test
BjoernLuig Nov 20, 2024
6f27ccc
fix language
BjoernLuig Nov 20, 2024
6435318
only necessary change to fix toolbox language error
BjoernLuig Nov 20, 2024
d936714
added automatic change from decimal comma to dot and visualize numer …
BjoernLuig Nov 20, 2024
19d4f7a
Merge branch 'main' into small-language-and-error-message-fixes
BjoernLuig Nov 20, 2024
2e60d5e
Bump cross-spawn from 7.0.3 to 7.0.6
dependabot[bot] Nov 20, 2024
226f0f4
preSetupCode
PaulaScharf Nov 22, 2024
1f260a8
dont give negative distances
PaulaScharf Nov 25, 2024
28a328b
feat: initial blockly update
felixerdy Nov 25, 2024
9c9e2b4
fix: Block with capital b
mariopesch Nov 25, 2024
b1282ba
fix: color field block
felixerdy Nov 25, 2024
ecb590b
fix: blockly import
felixerdy Nov 25, 2024
6790b14
fix: minify svg
mariopesch Nov 25, 2024
01c1a65
Merge pull request #373 from sensebox/chore/blockly-update
mariopesch Nov 25, 2024
1fd89a7
Merge pull request #367 from sensebox/dependabot/npm_and_yarn/cross-s…
mariopesch Nov 25, 2024
b66cbdd
only use 1MHz I2C vor vl53l8cx not for other sensors
PaulaScharf Nov 25, 2024
ecd726b
Merge pull request #366 from sensebox/small-language-and-error-messag…
mariopesch Nov 25, 2024
0f80c3a
only use target status 5, 6 or 9
PaulaScharf Nov 25, 2024
2edba76
updated target_status and I2C clock for bitmap generation too
PaulaScharf Nov 25, 2024
0611360
fix mutators
mariopesch Nov 26, 2024
046dad0
fix: compare block.outputConnection
felixerdy Nov 26, 2024
1f8df0b
fix: procedures_defnoreturn generator
felixerdy Nov 26, 2024
0a920f8
fix: reconnect connections
felixerdy Nov 26, 2024
2605ba3
fix: switch_case CASECONDITION
felixerdy Nov 26, 2024
893966e
fix: forBlock in variables
felixerdy Nov 26, 2024
d609ffb
fix case block
mariopesch Nov 26, 2024
0084ac3
fix load xml file and reset workspace
mariopesch Nov 26, 2024
050261d
Merge branch 'development' into fix/vl53l8cx-i2c-address
PaulaScharf Nov 28, 2024
419616e
Merge pull request #363 from sensebox/fix/vl53l8cx-i2c-address
mariopesch Dec 4, 2024
6cba720
single negativ block, better Tooltip links, deacrease variable, fix t…
BjoernLuig Dec 17, 2024
b43b686
fix language (update), tooltips and compiling math bugs
BjoernLuig Dec 30, 2024
ae1116b
add note on workaraung with settooltip
BjoernLuig Jan 6, 2025
b38d2a5
Merge pull request #382 from sensebox/negatives-in-math
BjoernLuig Jan 6, 2025
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
Prev Previous commit
Next Next commit
fix load xml file and reset workspace
  • Loading branch information
mariopesch committed Nov 26, 2024
commit 0084ac3f222e3efc2ff6c2ff3c2f4aa36093236e
2 changes: 1 addition & 1 deletion src/components/Tutorial/Builder/BlocklyExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class BlocklyExample extends Component {
var xml = this.props.value;
// check if value is valid xml;
try {
Blockly.Xml.textToDom(xml);
Blockly.utils.xml.textToDom(xml);
this.props.deleteError(this.props.index, "xml");
} catch (err) {
xml = initialXml;
Expand Down
7 changes: 5 additions & 2 deletions src/components/Workspace/OpenProject.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ class OpenProject extends Component {
this.props.clearStats();
Blockly.Xml.domToWorkspace(xmlFile, workspace);
if (workspace.getAllBlocks().length < 1) {
Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(xmlBefore), workspace);
Blockly.Xml.domToWorkspace(
Blockly.utils.xml.textToDom(xmlBefore),
workspace,
);
this.setState({
open: true,
title: Blockly.Msg.no_blocks_found_title,
Expand Down Expand Up @@ -104,7 +107,7 @@ class OpenProject extends Component {
reader.onloadend = () => {
var xmlDom = null;
try {
xmlDom = Blockly.Xml.textToDom(reader.result);
xmlDom = Blockly.utils.xml.textToDom(reader.result);
var boardAttribute = xmlDom.getAttribute("board");
if (!boardAttribute) {
this.setState({ showOldXMLFileWarning: true });
Expand Down
2 changes: 1 addition & 1 deletion src/components/Workspace/ResetWorkspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ResetWorkspace extends Component {
const workspace = Blockly.getMainWorkspace();
Blockly.Events.disable(); // https://groups.google.com/forum/#!topic/blockly/m7e3g0TC75Y
// if events are disabled, then the workspace will be cleared AND the blocks are not in the trashcan
const xmlDom = Blockly.Xml.textToDom(initialXml);
const xmlDom = Blockly.utils.xml.textToDom(initialXml);
Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
Blockly.Events.enable();
workspace.options.maxBlocks = Infinity;
Expand Down