From 1b647da1af169047c8d7ad11b686e13506269038 Mon Sep 17 00:00:00 2001
From: Sverre <59171289+sverben@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:24:58 +0100
Subject: [PATCH] Chore: revert operators for flitz+original (#130)
---
package.json | 2 +-
src/app/domain/robot.type.ts | 1 +
src/app/effects/blockly-editor.effects.ts | 5 ++
src/app/state/app.state.ts | 8 +--
src/assets/blockly/base-toolbox.xml | 70 +++++++++++++++++++++++
yarn.lock | 8 +--
6 files changed, 85 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index 4cea43e2..ee994a9e 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"@angular/router": "16.2.12",
"@blockly/workspace-backpack": "^5.3.3",
"@fortawesome/fontawesome-free": "^6.1.1",
- "@leaphy-robotics/leaphy-blocks": "1.9.1",
+ "@leaphy-robotics/leaphy-blocks": "1.9.2",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@serialport/parser-readline": "^10.3.0",
diff --git a/src/app/domain/robot.type.ts b/src/app/domain/robot.type.ts
index 56f79230..374f4343 100644
--- a/src/app/domain/robot.type.ts
+++ b/src/app/domain/robot.type.ts
@@ -10,6 +10,7 @@ export class RobotType {
public libs: string[],
public isWired: boolean = true,
public showLeaphyActuators: boolean = true,
+ public showLeaphyOperators: boolean = true,
public showCodeOnStart: boolean = false
) { }
}
diff --git a/src/app/effects/blockly-editor.effects.ts b/src/app/effects/blockly-editor.effects.ts
index 6fec904f..a81d5200 100644
--- a/src/app/effects/blockly-editor.effects.ts
+++ b/src/app/effects/blockly-editor.effects.ts
@@ -137,6 +137,11 @@ export class BlocklyEditorEffects {
const toolboxElement = toolboxXmlDoc.getElementById('easyBloqsToolbox');
const leaphyCategories = parser.parseFromString(leaphyToolboxXml, 'text/xml');
const leaphyRobotCategory = leaphyCategories.getElementById(robotType.id);
+ if (robotType.showLeaphyOperators) {
+ toolboxElement.removeChild(toolboxXmlDoc.getElementById("l_numbers"))
+ } else {
+ toolboxElement.removeChild(toolboxXmlDoc.getElementById("l_operators"))
+ }
if (robotType.showLeaphyActuators) {
const leaphyExtraCategory = leaphyCategories.getElementById(`${robotType.id}_actuators`);
toolboxElement.prepend(leaphyExtraCategory);
diff --git a/src/app/state/app.state.ts b/src/app/state/app.state.ts
index 6a312484..07ccac18 100644
--- a/src/app/state/app.state.ts
+++ b/src/app/state/app.state.ts
@@ -18,13 +18,13 @@ export class AppState {
'Leaphy Original Extension', 'Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'
]
private static leaphyOriginalRobotType = new RobotType('l_original_uno', 'Leaphy Original', 'orig.svg', 'Arduino UNO', 'arduino:avr:uno', 'hex', 'arduino:avr',
- AppState.defaultLibraries.concat(['QMC5883LCompass', 'Arduino_APDS9960'])
+ AppState.defaultLibraries.concat(['QMC5883LCompass', 'Arduino_APDS9960']), true, true, false
);
private static leaphyFlitzRobotType = new RobotType('l_flitz_uno', 'Leaphy Flitz', 'flitz.svg', 'Arduino UNO', 'arduino:avr:uno', 'hex', 'arduino:avr',
- AppState.defaultLibraries, true, false
+ AppState.defaultLibraries, true, false, false
);
private static leaphyFlitzNanoRobotType = new RobotType('l_flitz_nano', 'Flitz Nano', 'flitz_nano.svg', 'Arduino Nano', 'arduino:avr:nano', 'hex', 'arduino:avr',
- AppState.defaultLibraries, true, false
+ AppState.defaultLibraries, true, false, false
);
private static leaphyClickRobotType = new RobotType('l_click', 'Leaphy Click', 'click.svg', 'Arduino UNO', 'arduino:avr:uno', 'hex', 'arduino:avr',
AppState.defaultLibraries
@@ -39,7 +39,7 @@ export class AppState {
AppState.defaultLibraries.concat(['QMC5883LCompass', 'Arduino_APDS9960'])
);
public static microPythonRobotType = new RobotType('l_micropython', 'MicroPython', 'micropython.svg', 'MicroPython', '', 'bin', '',
- [], true, false);
+ [], true, false, false);
public static idToRobotType = {
'l_original_uno': AppState.leaphyOriginalRobotType,
diff --git a/src/assets/blockly/base-toolbox.xml b/src/assets/blockly/base-toolbox.xml
index bed44207..9d3875bb 100644
--- a/src/assets/blockly/base-toolbox.xml
+++ b/src/assets/blockly/base-toolbox.xml
@@ -27,6 +27,76 @@
+
+ 123
+
+
+
+
+
+ 1
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ 100
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3.1
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
123
diff --git a/yarn.lock b/yarn.lock
index 7a132b05..2884d0d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1828,10 +1828,10 @@
resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==
-"@leaphy-robotics/leaphy-blocks@1.9.1":
- version "1.9.1"
- resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.9.1.tgz#57ceca362f95e0ea7c6ffe34e93827234a5c4692"
- integrity sha512-hecaMWNIxomFBbnBo5fWGfd7pJZMYK0zai8ByzoxIHfKKhxncJoQr60iT/O0HEpUJ5LZ4YE14WXrrSx8Lk1HOQ==
+"@leaphy-robotics/leaphy-blocks@1.9.2":
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.9.2.tgz#c47022eaf768081fc277423105ef075188a40b2c"
+ integrity sha512-J2NDRresPHWzdArvMgI2QHwvltk+5JauYybwo0hisQcIMlaHx49IsnQtbLRG7FfWx4wGUWJAVqjHV2gUGaAjbQ==
dependencies:
blockly "^10.1.3"
typescript "4.3.2"