fixes ElectroBlocks#129 motor issue

vasu737et · May 30, 2024 · d0b93ee · d0b93ee
1 parent 000ef3a
commit d0b93ee
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/src/blocks/color/generators.ts b/src/blocks/color/generators.ts
@@ -1,4 +1,5 @@
 import Blockly from "blockly";
+import { variables } from "blockly/blocks";
 
 function hexToRgb(hex) {
   const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
@@ -13,6 +14,7 @@ function hexToRgb(hex) {
 
 Blockly["Arduino"]["color_picker_custom"] = function (block) {
   const rgb = hexToRgb(block.getFieldValue("COLOR"));
+  addColorStructToLibarires();
 
   return [
     "{ " + rgb.r + ", " + rgb.g + ", " + rgb.b + "}",
@@ -21,9 +23,11 @@ Blockly["Arduino"]["color_picker_custom"] = function (block) {
 };
 
 Blockly["Arduino"]["colour_random"] = function (block) {
+  addColorStructToLibarires();
   return [
     "{ random(0, 255), random(0, 255), random(0, 255)}",
     Blockly["Arduino"].ORDER_ATOMIC,
+
   ];
 };
 
@@ -43,9 +47,20 @@ Blockly["Arduino"]["colour_rgb"] = function (block) {
     "BLUE",
     Blockly["Arduino"].ORDER_ATOMIC
   );
-
+  addColorStructToLibarires();
   return [
     "{ " + red + ", " + green + ", " + blue + "}",
     Blockly["Arduino"].ORDER_ATOMIC,
   ];
 };
+
+function addColorStructToLibarires() { 
+  Blockly["Arduino"].libraries_['Color_Struct']= `
+  struct RGB { 
+   int red;
+   int green; 
+   int blue;
+  };
+  `;
+}
+
diff --git a/src/blocks/loops/generators.ts b/src/blocks/loops/generators.ts
@@ -10,7 +10,7 @@ Blockly["Arduino"]["controls_repeat_ext"] = function (block: Block) {
       "TIMES",
       Blockly["Arduino"].ORDER_ASSIGNMENT
     ) || "0";
-
+    loopLine();
   let branch = Blockly["Arduino"].statementToCode(block, "DO");
   branch = Blockly["Arduino"].addLoopTrap(branch, block.id);
   let code = "";
@@ -35,7 +35,7 @@ Blockly["Arduino"]["controls_for"] = function (block: Block) {
   const loopIndexVariable = Blockly.getMainWorkspace().getVariableById(
     block.getFieldValue("VAR")
   ).name;
-
+ 
   const branch = Blockly["Arduino"].statementToCode(block, "DO");
 
   const startNumber =
@@ -81,6 +81,7 @@ Blockly["Arduino"]["controls_for"] = function (block: Block) {
 
 Blockly["Arduino"]["controls_whileUntil"] = function (block: Block) {
   // Do while/until loop.
+
   const until = block.getFieldValue("MODE") === "UNTIL";
   let argument0 =
     Blockly["Arduino"].valueToCode(
@@ -106,3 +107,8 @@ Blockly["Arduino"]["controls_flow_statements"] = function (block: Block) {
   }
   throw Error("Unknown flow statement.");
 };
+
+function loopLine(){
+  Blockly["Arduino"].libraries_['LoopL']= `int simple_loop_variable = 0;
+  `;
+}
diff --git a/src/blocks/motors/blocks.ts b/src/blocks/motors/blocks.ts
@@ -28,10 +28,13 @@ Blockly.defineBlocksWithJsonArray([
         type: "field_dropdown",
         name: "DIRECTION",
         options: [
-          ["Forward", "FORWARD"],
-          ["Backward", "BACKWARD"],
+          ["Clockwise", "CLOCKWISE"],
+          ["Anti-Clockwise", "ANTI-CLOCKWISE"],
         ],
       },
+
+
+
       {
         type: "input_dummy",
         align: "RIGHT",
@@ -50,4 +53,4 @@ Blockly.defineBlocksWithJsonArray([
     tooltip: "",
     helpUrl: "",
   },
-]);
+]);
diff --git a/src/blocks/motors/generators.ts b/src/blocks/motors/generators.ts
@@ -15,14 +15,15 @@ Blockly['Arduino']['move_motor'] = function(block: Block) {
     'SPEED',
     Blockly['Arduino'].ORDER_ATOMIC
   );
-
+  let dir = 'backward';
+  if(direction=='CLOCKWISE') dir= 'forward';
   Blockly['Arduino'].libraries_['include_motor_library'] =
     '#include <AFMotor.h>;\n';
   Blockly['Arduino'].libraries_['include_motor_init_' + motorNumber] =
     'AF_DCMotor motor_' + motorNumber + '(' + motorNumber + ');\n';
 
-  let code = 'motor_' + motorNumber + '.run("' + direction + '");\n';
+  let code = 'motor_' + motorNumber + '.run("' + dir + '");\n';
   code += 'motor_' + motorNumber + '.setSpeed(' + speed + ');\n';
 
   return code;
-};
+};