From a3dfc19af160cb5ae375c8270982089da8a8a097 Mon Sep 17 00:00:00 2001
From: Ronald Moesbergen <rmoesbergen@users.noreply.github.com>
Date: Mon, 6 Nov 2023 18:42:58 +0100
Subject: [PATCH] feat: pass robotType to block generators (#82)

---
 package.json                              | 4 ++--
 src/app/effects/blockly-editor.effects.ts | 2 +-
 src/assets/blockly/leaphy-toolbox.xml     | 6 +++---
 yarn.lock                                 | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 8ac7e3f8..870c7990 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Leaphy Webbased",
   "author": "Leaphy Robotics",
   "description": "Build Leaphy Arduino programs",
-  "version": "1.7.4",
+  "version": "1.8.0",
   "license": "GPLv3",
   "main": "src/main.ts",
   "scripts": {
@@ -29,7 +29,7 @@
     "@angular/platform-browser-dynamic": "~15.2.9",
     "@angular/router": "~15.2.9",
     "@fortawesome/fontawesome-free": "^6.1.1",
-    "@leaphy-robotics/leaphy-blocks": "1.4.1",
+    "@leaphy-robotics/leaphy-blocks": "1.5.0",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",
     "@serialport/parser-readline": "^10.3.0",
diff --git a/src/app/effects/blockly-editor.effects.ts b/src/app/effects/blockly-editor.effects.ts
index 85c8aa19..f55a8e50 100644
--- a/src/app/effects/blockly-editor.effects.ts
+++ b/src/app/effects/blockly-editor.effects.ts
@@ -201,7 +201,7 @@ export class BlocklyEditorEffects {
                 workspace.clearUndo();
                 workspace.addChangeListener(Blockly.Events.disableOrphans);
                 workspace.addChangeListener(async () => {
-                    this.blocklyState.setCode(Arduino.workspaceToCode(workspace));
+                    this.blocklyState.setCode(Arduino.workspaceToCode(workspace, this.appState.getSelectedRobotType().id));
                     const xml = Blockly.Xml.workspaceToDom(workspace);
                     const prettyXml = Blockly.Xml.domToPrettyText(xml);
                     this.blocklyState.setWorkspaceXml(prettyXml);
diff --git a/src/assets/blockly/leaphy-toolbox.xml b/src/assets/blockly/leaphy-toolbox.xml
index d1055a8a..bee5b30a 100644
--- a/src/assets/blockly/leaphy-toolbox.xml
+++ b/src/assets/blockly/leaphy-toolbox.xml
@@ -146,7 +146,7 @@
     <block type="leaphy_flitz_nano_read_hand_sensor">
     </block>
     <sep gap="8"></sep>
-    <block type="leaphy_flitz_nano_led">
+    <block type="leaphy_flitz_led">
       <value name="FLITZ_LED_R">
         <shadow type="math_number">
           <field name="NUM">
@@ -739,7 +739,7 @@
 			</value>
 		</block>
 		<sep gap="8"></sep>
-		<block type="leaphy_nano_set_motor">
+		<block type="leaphy_original_set_motor">
 			<value name="MOTOR_SPEED">
 				<shadow type="math_number">
 					<field name="NUM">
@@ -749,7 +749,7 @@
 			</value>
 		</block>
 		<sep gap="8"></sep>
-		<block type="leaphy_nano_move_motors">
+		<block type="leaphy_original_move_motors">
 			<value name="MOTOR_SPEED">
 				<shadow type="math_number">
 					<field name="NUM">
diff --git a/yarn.lock b/yarn.lock
index f3bdfe86..0a134906 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1737,10 +1737,10 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@leaphy-robotics/leaphy-blocks@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.4.1.tgz#706b81557793e8f5882b77c37bc44a49286c74fa"
-  integrity sha512-t2ffPywVv/G5zSrLqqPApyOYyGkfUrfUdTdc80RMdjbpR+OIVd0RQct2mOikX0AOFtx3MtbefQzF9rU8eQ+xxA==
+"@leaphy-robotics/leaphy-blocks@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.5.0.tgz#04a9142775b4eae4cdb41268ed2853c45014136f"
+  integrity sha512-rEv35BkRTPFUDA1maQJCsBSIBpSsnHMEAVBUKcGczcok5RnYkuamt0DLhX51WZyy7iYP/5+SddMRiyYczAXq0w==
   dependencies:
     blockly "^10.1.3"
     typescript "4.3.2"