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

Added support for Adafruit DC Motor Shield v2 #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for Adafruit DC Motor Shield v2 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 51 additions & 0 deletions src/main/java/com/ardublock/translator/block/adafruit/dcmotor2_bwd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.ardublock.translator.block.adafruit;

import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
import com.ardublock.translator.block.exception.BlockException;
import com.ardublock.translator.block.exception.SocketNullException;
import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;

public class dcmotor2_bwd extends TranslatorBlock
{

public dcmotor2_bwd(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}

public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
TranslatorBlock ChannelBlock = this.getRequiredTranslatorBlockAtSocket(0);
TranslatorBlock SpeedBlock = this.getRequiredTranslatorBlockAtSocket(1);
String ChannelNumber = ChannelBlock.toCode();
String Speed = SpeedBlock.toCode();
String MotorDeclare;

if (Integer.parseInt(ChannelNumber) > 4 )
{
throw new BlockException(this.blockId, "the Channel# of DC Motor must be 1,2,3 or 4");
//ChannelNumber = "4";
}
if (Integer.parseInt(Speed) > 255 )
{
throw new BlockException(this.blockId, "the Speed of DC Motor must be 0(stop) to 255(full speed)");
//Speed = "255";
}

String MotorName = "motor_dc_" + ChannelNumber;

String ret = "\t" + MotorName + "->setSpeed(" + Speed + ");\n";
ret += "\t" + MotorName + "->run(BACKWARD);\n";
translator.addHeaderFile("Wire.h");
translator.addHeaderFile("Adafruit_MotorShield.h");
translator.addHeaderFile("utility/Adafruit_PWMServoDriver.h");
translator.addDefinitionCommand("Adafruit_MotorShield AFMS = Adafruit_MotorShield();");
translator.addDefinitionCommand("Adafruit_DCMotor *" + MotorName + " = AFMS.getMotor("+ ChannelNumber + ");");
translator.addSetupCommand("AFMS.begin();");
//translator.addSetupCommand(MotorName + "->setSpeed(127);\n" + MotorName + "->run(FORWARD);\n" + MotorName + "->run(RELEASE);");

return ret;
}

}
51 changes: 51 additions & 0 deletions src/main/java/com/ardublock/translator/block/adafruit/dcmotor2_fwd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.ardublock.translator.block.adafruit;

import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
import com.ardublock.translator.block.exception.BlockException;
import com.ardublock.translator.block.exception.SocketNullException;
import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;

public class dcmotor2_fwd extends TranslatorBlock
{

public dcmotor2_fwd(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}

public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
TranslatorBlock ChannelBlock = this.getRequiredTranslatorBlockAtSocket(0);
TranslatorBlock SpeedBlock = this.getRequiredTranslatorBlockAtSocket(1);
String ChannelNumber = ChannelBlock.toCode();
String Speed = SpeedBlock.toCode();
String MotorDeclare;

if (Integer.parseInt(ChannelNumber) > 4 )
{
throw new BlockException(this.blockId, "the Channel# of DC Motor must be 1,2,3 or 4");
//ChannelNumber = "4";
}
if (Integer.parseInt(Speed) > 255 )
{
throw new BlockException(this.blockId, "the Speed of DC Motor must be 0(stop) to 255(full speed)");
//Speed = "255";
}

String MotorName = "motor_dc_" + ChannelNumber;

String ret = "\t" + MotorName + "->setSpeed(" + Speed + ");\n";
ret += "\t" + MotorName + "->run(FORWARD);\n";
translator.addHeaderFile("Wire.h");
translator.addHeaderFile("Adafruit_MotorShield.h");
translator.addHeaderFile("utility/Adafruit_PWMServoDriver.h");
translator.addDefinitionCommand("Adafruit_MotorShield AFMS = Adafruit_MotorShield();");
translator.addDefinitionCommand("Adafruit_DCMotor *" + MotorName + " = AFMS.getMotor("+ ChannelNumber + ");");
translator.addSetupCommand("AFMS.begin();");
//translator.addSetupCommand(MotorName + "->setSpeed(127);\n" + MotorName + "->run(FORWARD);\n" + MotorName + "->run(RELEASE);");

return ret;
}

}
50 changes: 50 additions & 0 deletions src/main/java/com/ardublock/translator/block/adafruit/dcmotor2_release.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.ardublock.translator.block.adafruit;

import com.ardublock.translator.Translator;
import com.ardublock.translator.block.TranslatorBlock;
import com.ardublock.translator.block.exception.BlockException;
import com.ardublock.translator.block.exception.SocketNullException;
import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;

public class dcmotor2_release extends TranslatorBlock
{

public dcmotor2_release(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}

public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
TranslatorBlock ChannelBlock = this.getRequiredTranslatorBlockAtSocket(0);
TranslatorBlock SpeedBlock = this.getRequiredTranslatorBlockAtSocket(1);
String ChannelNumber = ChannelBlock.toCode();
String Speed = SpeedBlock.toCode();
String MotorDeclare;

if (Integer.parseInt(ChannelNumber) > 4 )
{
throw new BlockException(this.blockId, "the Channel# of DC Motor must be 1,2,3 or 4");
//ChannelNumber = "4";
}
if (Integer.parseInt(Speed) > 255 )
{
throw new BlockException(this.blockId, "the Speed of DC Motor must be 0(stop) to 255(full speed)");
//Speed = "255";
}

String MotorName = "motor_dc_" + ChannelNumber;

String ret = "\t" + MotorName + "->run(RELEASE);\n";
translator.addHeaderFile("Wire.h");
translator.addHeaderFile("Adafruit_MotorShield.h");
translator.addHeaderFile("utility/Adafruit_PWMServoDriver.h");
translator.addDefinitionCommand("Adafruit_MotorShield AFMS = Adafruit_MotorShield();");
translator.addDefinitionCommand("Adafruit_DCMotor *" + MotorName + " = AFMS.getMotor("+ ChannelNumber + ");");
translator.addSetupCommand("AFMS.begin();");
//translator.addSetupCommand(MotorName + "->setSpeed(127);\n" + MotorName + "->run(FORWARD);\n" + MotorName + "->run(RELEASE);");

return ret;
}

}
32 changes: 21 additions & 11 deletions src/main/resources/com/ardublock/block/ardublock.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,12 @@ bd.communication=Communication
bd.especial=Code Blocks

bd.adafruit=Adafruit
bg.ada_dc_motor_fwd=DC motor FORWARD
bg.ada_dc_motor_bwd=DC motor BACKWARD
bg.ada_dc_motor_release=DC motor RELEASE
bg.ada_dc_motor_fwd=DC Motor v1 FORWARD
bg.ada_dc_motor_bwd=DC Motor v1 BACKWARD
bg.ada_dc_motor_release=DC Motor v1 RELEASE
bg.ada_dc_motor2_fwd=DC Motor v2 FORWARD
bg.ada_dc_motor2_bwd=DC Motor v2 BACKWARD
bg.ada_dc_motor2_release=DC Motor v2 RELEASE
bg.ada_neopixel_NEO_GRB=NEO_GRB
bg.ada_neopixel_NEO_RGB=NEO_RGB
bg.ada_neopixel_NEO_KHZ400=NEO_KHZ400
Expand Down Expand Up @@ -1069,22 +1072,29 @@ bg.bleshield_read_poly=read from BLE Shield
bg.bleshield_compare=BLE Shield
bg.bleshield_compare.description=BLE Shield for Bluetooth Communication return a boolean

bd.adafruit.description=Adafruit Motorshield
bg.ada_dc_motor_fwd=Adafruit DC motor FORWARD
bg.ada_dc_motor_bwd=Adafruit DC motor BACKWARD
bg.ada_dc_motor_release=Adafruit DC motor RELEASE
bd.adafruit=Adafruit
bd.adafruit.description=Adafruit Products
bg.ada_dc_motor_fwd=DC Motor v1 FORWARD
bg.ada_dc_motor_fwd.description=Motor Shield v1 - DC Motor Forward
bg.ada_dc_motor_bwd=DC Motor v1 BACKWARD
bg.ada_dc_motor_bwd.description=Motor Shield v1 - DC Motor Backward
bg.ada_dc_motor_release=DC Motor v1 RELEASE
bg.ada_dc_motor_release.description=Motor Shield v1 - DC Motor Stop
bg.ada_dc_motor2_fwd=DC Motor v2 FORWARD
bg.ada_dc_motor2_fwd.description=Motor Shield v2 - DC Motor Forward
bg.ada_dc_motor2_bwd=DC Motor v2 BACKWARD
bg.ada_dc_motor2_bwd.description=Motor Shield v2 - DC Motor Backward
bg.ada_dc_motor2_release=DC Motor v2 RELEASE
bg.ada_dc_motor2_release.description=Motor Shield v2 - DC Motor Stop
bg.ada_neopixel_NEO_GRB=NEO_GRB
bg.ada_neopixel_NEO_RGB.description=NEO_RGB
bg.ada_neopixel_NEO_KHZ400=NEO_KHZ400
bg.ada_neopixel_NEO_KHZ800=NEO_KHZ800
bg.ada_neopixel_init=initialization
bg.ada_neopixel_init=Initialization
bg.ada_neopixel_pixel_colorGRB=Pixel Color between 0 and 255 for each color
bg.ada_neopixel_pixel_colorRGB=Pixel Color between 0 and 255 for each color
bg.ada_neopixel_show= Push the color data to the strip
bg.ada_neopixel_Brightness=Brightness between 0 and 255
bg.ada_dc_motor_fwd.description=
bg.ada_dc_motor_bwd.description=
bg.ada_dc_motor_release.description=
bg.ada_neopixel_init.description=
bg.ada_neopixel_pixel_colorGRB.description=
bg.ada_neopixel_pixel_colorRGB.description=
Expand Down