From 1cdbc8740049580defb7da390fc7587ca690a9b5 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sat, 28 Dec 2024 11:19:51 +0100 Subject: [PATCH 1/4] fix: don't map uno motor speed --- src/generators/arduino/leaphy_original.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/generators/arduino/leaphy_original.ts b/src/generators/arduino/leaphy_original.ts index 6b3c77f..f060a86 100644 --- a/src/generators/arduino/leaphy_original.ts +++ b/src/generators/arduino/leaphy_original.ts @@ -40,16 +40,17 @@ function getCodeGenerators(arduino: Arduino) { let speed = arduino.valueToCode(block, "MOTOR_SPEED", arduino.ORDER_ATOMIC) || "100"; - // Map the speed to a range of 150 - 255 to compensate for low PWM signal voltage - if (parseInt(speed) > 0) { - speed = `map(${speed}, 0, 255, 150, 255)`; - } + arduino.addInclude( "include_leaphy_original", '#include "Leaphyoriginal1.h"', ); // Set different motor pins for nano robots if (arduino.robotType.includes("nano")) + // Map the speed to a range of 150 - 255 to compensate for low PWM signal voltage + if (parseInt(speed) > 0) { + speed = `map(${speed}, 0, 255, 150, 255)`; + } arduino.addSetup( "set_motor_pins", "setMotorPins(3, 2, 11, 4);", From d96f8deb206a04b1ca3d56fee007288f670dd02c Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sat, 28 Dec 2024 11:20:23 +0100 Subject: [PATCH 2/4] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 24cc8ca..0df2d11 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "dist", "media" ], - "version": "3.3.2", + "version": "3.3.3", "description": "Leaphy custom Blockly blocks and arduino code generator", "name": "@leaphy-robotics/leaphy-blocks" } From 0975f20be4505ba909e47f4f0011ae3d0abe74a1 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sat, 28 Dec 2024 11:45:18 +0100 Subject: [PATCH 3/4] chore: prettier --- src/generators/arduino/leaphy_original.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/generators/arduino/leaphy_original.ts b/src/generators/arduino/leaphy_original.ts index f060a86..049a70a 100644 --- a/src/generators/arduino/leaphy_original.ts +++ b/src/generators/arduino/leaphy_original.ts @@ -47,15 +47,11 @@ function getCodeGenerators(arduino: Arduino) { ); // Set different motor pins for nano robots if (arduino.robotType.includes("nano")) - // Map the speed to a range of 150 - 255 to compensate for low PWM signal voltage if (parseInt(speed) > 0) { + // Map the speed to a range of 150 - 255 to compensate for low PWM signal voltage speed = `map(${speed}, 0, 255, 150, 255)`; } - arduino.addSetup( - "set_motor_pins", - "setMotorPins(3, 2, 11, 4);", - true, - ); + arduino.addSetup("set_motor_pins", "setMotorPins(3, 2, 11, 4);", true); return `setMotor(${dropdown_Type}, ${speed});\n`; }; From f7f282ff29fcb3af948442e136566caa55d0286f Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sat, 28 Dec 2024 13:06:05 +0100 Subject: [PATCH 4/4] fix: logic error --- src/generators/arduino/leaphy_original.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/generators/arduino/leaphy_original.ts b/src/generators/arduino/leaphy_original.ts index 049a70a..c530c97 100644 --- a/src/generators/arduino/leaphy_original.ts +++ b/src/generators/arduino/leaphy_original.ts @@ -46,12 +46,17 @@ function getCodeGenerators(arduino: Arduino) { '#include "Leaphyoriginal1.h"', ); // Set different motor pins for nano robots - if (arduino.robotType.includes("nano")) + if (arduino.robotType.includes("nano")) { if (parseInt(speed) > 0) { // Map the speed to a range of 150 - 255 to compensate for low PWM signal voltage speed = `map(${speed}, 0, 255, 150, 255)`; } - arduino.addSetup("set_motor_pins", "setMotorPins(3, 2, 11, 4);", true); + arduino.addSetup( + "set_motor_pins", + "setMotorPins(3, 2, 11, 4);", + true, + ); + } return `setMotor(${dropdown_Type}, ${speed});\n`; };