Skip to content

Commit

Permalink
leapmotion simplification
Browse files Browse the repository at this point in the history 
leapmotion init no need
simplification of the block with the lib
  • Loading branch information
@karlTH
karlTH committed May 28, 2015
1 parent c3dd56e commit d26d2a8
Show file tree
Hide file tree
Showing 16 changed files with 51 additions and 38 deletions.
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/Hand_positionX.java
View file
Expand Up @@ -13,6 +13,10 @@ public Hand_positionX(Long blockId, Translator translator, String codePrefix, St

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "hand_positionX" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/Hand_positionY.java
View file
Expand Up @@ -13,6 +13,10 @@ public Hand_positionY(Long blockId, Translator translator, String codePrefix, St

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "hand_positionY" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/Hand_positionZ.java
View file
Expand Up @@ -13,6 +13,10 @@ public Hand_positionZ(Long blockId, Translator translator, String codePrefix, St

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "hand_positionZ" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/angle_annulaire.java
View file
Expand Up @@ -13,6 +13,10 @@ public angle_annulaire(Long blockId, Translator translator, String codePrefix, S

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "angle_annulaire" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/angle_auriculaire.java
View file
Expand Up @@ -13,6 +13,10 @@ public angle_auriculaire(Long blockId, Translator translator, String codePrefix,

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "angle_auriculaire" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/angle_index.java
View file
Expand Up @@ -13,6 +13,10 @@ public angle_index(Long blockId, Translator translator, String codePrefix, Strin

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "angle_index" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/angle_majeur.java
View file
Expand Up @@ -13,6 +13,10 @@ public angle_majeur(Long blockId, Translator translator, String codePrefix, Stri

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "angle_majeur" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/angle_pouce.java
View file
Expand Up @@ -13,6 +13,10 @@ public angle_pouce(Long blockId, Translator translator, String codePrefix, Strin

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "angle_pouce" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/handRotX.java
View file
Expand Up @@ -13,6 +13,10 @@ public handRotX(Long blockId, Translator translator, String codePrefix, String c

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "handRotX" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/handRotY.java
View file
Expand Up @@ -13,6 +13,10 @@ public handRotY(Long blockId, Translator translator, String codePrefix, String c

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "handRotY" + codeSuffix;
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/ardublock/translator/block/Duinoedu/handRotZ.java
View file
Expand Up @@ -13,6 +13,10 @@ public handRotZ(Long blockId, Translator translator, String codePrefix, String c

@Override
public String toCode() throws SocketNullException {
translator.addHeaderFile("SerialPlus.h");
translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/autre/EDU_SerialPlus/");
translator.addDefinitionCommand("SerialPlus monSerialLeap;");
translator.addSetupCommand("monSerialLeap.branch(&Serial); \nmonSerialLeap.begin(9600);");
return codePrefix + "handRotZ" + codeSuffix;
}

Expand Down
12 changes: 2 additions & 10 deletions src/main/java/com/ardublock/translator/block/LoopBlock.java
View file
Expand Up @@ -3,7 +3,7 @@
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.exception.SocketNullException;
import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
import com.ardublock.translator.block.Duinoedu.Leapmotion_init;


public class LoopBlock extends TranslatorBlock
{
Expand All @@ -16,7 +16,6 @@ public LoopBlock(Long blockId, Translator translator, String codePrefix, String
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
String ret;
Boolean leapmotion= false;
ret = "void loop()\n{\n";
if (translator.isGuinoProgram())
{
Expand All @@ -25,10 +24,6 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio
TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(0);
while (translatorBlock != null)
{
if (translatorBlock instanceof Leapmotion_init)
{
leapmotion= true;
}
ret = ret + translatorBlock.toCode();
translatorBlock = translatorBlock.nextTranslatorBlock();

Expand All @@ -37,10 +32,7 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio
{
ret += "yield();\n";
}
if (leapmotion)
{
ret = ret + "}\n";
}

ret = ret + "}\n\n";
return ret;
}
Expand Down
19 changes: 5 additions & 14 deletions src/main/java/com/ardublock/translator/block/ProgramBlock.java
View file
Expand Up @@ -6,7 +6,7 @@
import com.ardublock.translator.Translator;
import com.ardublock.translator.block.exception.SocketNullException;
import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
import com.ardublock.translator.block.Duinoedu.Leapmotion_init;


public class ProgramBlock extends TranslatorBlock
{
Expand All @@ -24,14 +24,11 @@ public ProgramBlock(Long blockId, Translator translator, String codePrefix, Stri
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
String ret="";
Boolean leapmotion= false;

TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(0);
while (translatorBlock != null)
{
if (translatorBlock instanceof Leapmotion_init)
{
leapmotion= true;;
}

ret = translatorBlock.toCode();
translatorBlock = translatorBlock.nextTranslatorBlock();
this.setupCommand.add(ret);
Expand All @@ -44,10 +41,7 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio
TranslatorBlock translatorBlock2 = getTranslatorBlockAtSocket(1);
while (translatorBlock2 != null)
{
if (translatorBlock instanceof Leapmotion_init)
{
leapmotion= true;
}

ret = ret + translatorBlock2.toCode();
translatorBlock2 = translatorBlock2.nextTranslatorBlock();
}
Expand All @@ -56,10 +50,7 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio
{
ret += "yield();\n";
}
if (leapmotion)
{
ret = ret + "}\n";
}

ret = ret + "}\n\n";
return ret;
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/com/ardublock/block/ardublock.properties
View file
Expand Up @@ -967,8 +967,6 @@ bg.DuinoEDU_MP3_Player=MP3 Player
bg.DuinoEDU_MP3_Player.description=Fixe a volume between 0 and 1000. Play the Track between 0 and 255.
bg.DuinoEDU_MP3_Pause=MP3 Pause
bg.DuinoEDU_MP3_Pause.description=MP3 Pause
bg.DuinoEDU_leapmotion_init=Leapmotion Init
bg.DuinoEDU_leapmotion_init.description=Leapmotion Init
bg.DuinoEDU_hand_positionX=X position hand
bg.DuinoEDU_hand_positionX.description=X position hand
bg.DuinoEDU_hand_positionY=Y position hand
Expand Down
11 changes: 0 additions & 11 deletions src/main/resources/com/ardublock/block/ardublock.xml
View file
Expand Up @@ -6245,16 +6245,6 @@
<BlockConnector connector-type="number" connector-kind="plug"/>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="DuinoEDU_leapmotion_init" kind="command" color="0 255 0" initlabel="bg.DuinoEDU_leapmotion_init">
<description>
<text>Leap motion init</text>
</description>
<Images>
<Image>
<FileLocation>com/ardublock/block/arduino/leapmotion.png</FileLocation>
</Image>
</Images>
</BlockGenus>
<BlockGenus name="DuinoEDU_hand_positionX" kind="data" color="0 255 0" initlabel="bg.DuinoEDU_hand_positionX">
<description>
<text>DuinoEDU_hand_positionX</text>
Expand Down Expand Up @@ -10872,7 +10862,6 @@
<BlockGenusMember>DuinoEDU_Guino_pause</BlockGenusMember>
<BlockGenusMember>DuinoEDU_Guino_Title</BlockGenusMember>
<BlockGenusMember>DuinoEDU_Guino_column</BlockGenusMember>
<BlockGenusMember>DuinoEDU_leapmotion_init</BlockGenusMember>
<BlockGenusMember>DuinoEDU_hand_positionX</BlockGenusMember>
<BlockGenusMember>DuinoEDU_handRotX</BlockGenusMember>
<BlockGenusMember>DuinoEDU_angle_pouce</BlockGenusMember>
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/com/ardublock/block/block-mapping.properties
View file
Expand Up @@ -513,7 +513,6 @@ DuinoEDU_IRREMOTE_NE_PAS_MEMORISER=com.ardublock.translator.block.Duinoedu.IRREM
DuinoEDU_IRREMOTE_MEMORISER_200_MS=com.ardublock.translator.block.Duinoedu.IRREMOTE_MEMORISER_200_MS
DuinoEDU_IRREMOTE_MEMORISER_2000_MS=com.ardublock.translator.block.Duinoedu.IRREMOTE_MEMORISER_2000_MS
DuinoEDU_infrared_compare=com.ardublock.translator.block.Duinoedu.Infrared_compare
DuinoEDU_leapmotion_init=com.ardublock.translator.block.Duinoedu.Leapmotion_init
DuinoEDU_hand_positionX=com.ardublock.translator.block.Duinoedu.Hand_positionX
DuinoEDU_hand_positionY=com.ardublock.translator.block.Duinoedu.Hand_positionY
DuinoEDU_hand_positionZ=com.ardublock.translator.block.Duinoedu.Hand_positionZ
Expand Down

0 comments on commit d26d2a8

Please sign in to comment.