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.

Sign up for GitHub

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

Jump to bottom

Simulator sps30 sensor and fluoro asm sensor #436

Open
wants to merge 3 commits into
base: add/simulator
Choose a base branch
from
Open

Simulator sps30 sensor and fluoro asm sensor #436

wants to merge 3 commits into from

Conversation

georgi-s
Copy link
Contributor

No description provided.

@mariopesch mariopesch changed the base branch from main to add/simulator March 18, 2025 06:36
@mariopesch mariopesch requested a review from Thiemann96 March 18, 2025 06:40
@mariopesch
Copy link
Member

@georgi-s @Thiemann96 please have a look at the log. Besides this seems like a lot changes for just adding two sensors.

7:39:52 AM: error during build:
7:39:52 AM: src/components/Blockly/generator/simulator/sensebox-sensors.js (26:0): Merge conflict marker encountered.
7:39:52 AM: file: /opt/build/repo/src/components/Blockly/generator/simulator/sensebox-sensors.js:26:0
7:39:52 AM: 
7:39:52 AM: 24:   return [code, Blockly.Generator.Simulator.ORDER_ATOMIC];
7:39:52 AM: 25: };
7:39:52 AM: 26: <<<<<<< Updated upstream
7:39:52 AM:     ^
7:39:52 AM: 27:
7:39:52 AM: 28: Blockly.Generator.Simulator.forBlock["sensebox_sensor_watertemperature"] = function () {
7:39:52 AM: 
7:39:52 AM:     at getRollupError (file:///opt/build/repo/node_modules/rollup/dist/es/shared/parseAst.js:397:41)
7:39:52 AM:     at ParseError.initialise (file:///opt/build/repo/node_modules/rollup/dist/es/shared/node-entry.js:14112:28)
7:39:52 AM:     at convertNode (file:///opt/build/repo/node_modules/rollup/dist/es/shared/node-entry.js:16006:10)
7:39:52 AM:     at convertProgram (file:///opt/build/repo/node_modules/rollup/dist/es/shared/node-entry.js:15249:12)
7:39:52 AM:     at Module.setSource (file:///opt/build/repo/node_modules/rollup/dist/es/shared/node-entry.js:16993:24)
7:39:52 AM:     at async ModuleLoader.addModuleSource (file:///opt/build/repo/node_modules/rollup/dist/es/shared/node-entry.js:20902:13)
7:39:53 AM: Failed during stage 'building site': Build script returned non-zero exit code: 2 (https://ntl.fyi/exit-code-2)

mariopesch
mariopesch requested changes Mar 18, 2025
View reviewed changes
src/components/Blockly/blocks/fluoroASM.js
this.appendDummyInput().appendField("Fluoro-ASM Sensor initialisieren");
this.setPreviousStatement(true, null);
this.setNextStatement(true, null);
this.setTooltip("Initialisiert den Fluoro-ASM Sensor.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@georgi-s please do not hardcode text in german. Use the internationalization keys

src/components/Blockly/compileTask.js
@@ -0,0 +1,33 @@
// compileTask.js
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this do?

@Thiemann96 Thiemann96 changed the base branch from add/simulator to development March 18, 2025 16:48
@Thiemann96 Thiemann96 changed the base branch from development to add/simulator March 18, 2025 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mariopesch mariopesch mariopesch requested changes

@Thiemann96 Thiemann96 Awaiting requested review from Thiemann96

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@georgi-s @mariopesch @Thiemann96