Skip to content

Commit

Permalink
add mouse in esplora
Browse files Browse the repository at this point in the history
  • Loading branch information
karlTH committed Apr 6, 2015
1 parent b73f262 commit 5973c36
Show file tree
Hide file tree
Showing 10 changed files with 300 additions and 9 deletions.
27 changes: 27 additions & 0 deletions src/main/java/com/ardublock/translator/block/Esplora/Middle.java
@@ -0,0 +1,27 @@
package com.ardublock.translator.block.Esplora;

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


public class Middle extends TranslatorBlock {

public Middle (Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}
//@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{



String ret = "MIDDLE";

return codePrefix + ret + codeSuffix;

}

}
@@ -0,0 +1,29 @@
package com.ardublock.translator.block.Esplora;

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


public class Mouse_Click extends TranslatorBlock {

public Mouse_Click (Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}
//@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
String Click;
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
Click = translatorBlock.toCode();

translator.addSetupCommand("Mouse.begin();");
String ret = "Mouse.click(MOUSE_"+Click+");\n";

return ret;

}

}
@@ -0,0 +1,29 @@
package com.ardublock.translator.block.Esplora;

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


public class Mouse_Press extends TranslatorBlock {

public Mouse_Press (Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}
//@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
String Click;
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
Click = translatorBlock.toCode();

translator.addSetupCommand("Mouse.begin();");
String ret = "Mouse.press(MOUSE_"+Click+");\n";

return ret;

}

}
@@ -0,0 +1,29 @@
package com.ardublock.translator.block.Esplora;

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


public class Mouse_Release extends TranslatorBlock {

public Mouse_Release (Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}
//@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
String Click;
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
Click = translatorBlock.toCode();

translator.addSetupCommand("Mouse.begin();");
String ret = "Mouse.release(MOUSE_"+Click+");\n";

return ret;

}

}
@@ -0,0 +1,29 @@
package com.ardublock.translator.block.Esplora;

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


public class Mouse_isPressed extends TranslatorBlock {

public Mouse_isPressed (Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}
//@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
String Click;
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
Click = translatorBlock.toCode();

translator.addSetupCommand("Mouse.begin();");
String ret = "Mouse.isPressed(MOUSE_"+Click+");\n";

return codePrefix + ret + codeSuffix;

}

}
@@ -0,0 +1,32 @@
package com.ardublock.translator.block.Esplora;

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


public class Mouse_move extends TranslatorBlock {

public Mouse_move (Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
{
super(blockId, translator, codePrefix, codeSuffix, label);
}
//@Override
public String toCode() throws SocketNullException, SubroutineNotDeclaredException
{
String Xaxis;
String Yaxis;
TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
Xaxis = translatorBlock.toCode();
translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
Yaxis = translatorBlock.toCode();

translator.addSetupCommand("Mouse.begin();");
String ret = "Mouse.move("+Xaxis+","+Yaxis+",O);\n";

return ret;

}

}
29 changes: 21 additions & 8 deletions src/main/resources/com/ardublock/block/ardublock.properties
Expand Up @@ -1115,23 +1115,23 @@ bd.Esplora=Arduino Esplora
bg.Esplora_Led=Led
bg.Esplora_Led.description=Led
bg.Esplora_AccelerationX=Acc X
bg.Esplora_AccelerationX.description=
bg.Esplora_AccelerationX.description=Acc X
bg.Esplora_AccelerationY=Acc Y
bg.Esplora_AccelerationY.description=
bg.Esplora_AccelerationY.description=Acc Y
bg.Esplora_AccelerationZ=Acc Z
bg.Esplora_AccelerationZ.description=
bg.Esplora_AccelerationZ.description=Acc Z
bg.Esplora_JoystickY=Y Joystick
bg.Esplora_JoystickY.description=Value between -512 and 512
bg.Esplora_JoystickX=X Joystick
bg.Esplora_JoystickX.description=Value between -512 and 512
bg.Esplora_JoystickSwitch=Joystick Center Switch
bg.Esplora_JoystickSwitch.description=LOW when pressed, HIGH when not pressed.
bg.Esplora_Slider=Linear Potentiometre
bg.Esplora_Slider.description=
bg.Esplora_Slider.description=Linear Potentiometre
bg.Esplora_Microphone=Microphone
bg.Esplora_Microphone.description=
bg.Esplora_Microphone.description=Microphone
bg.Esplora_LightSensor=Light Sensor
bg.Esplora_LightSensor.description=
bg.Esplora_LightSensor.description=Light Sensor
bg.Esplora_tone=Tone
bg.Esplora_tone.description=
bg.Esplora_notone=No Tone
Expand All @@ -1145,9 +1145,22 @@ bg.Esplora_LEFT=LEFT
bg.Esplora_UP=UP
bg.Esplora_RIGHT=RIGHT
bg.Esplora_JoystickSwitch2=Joystick Switch
bg.Esplora_JoystickSwitch2.description=
bg.Esplora_JoystickSwitch2.description=Joystick Switch
bg.Esplora_Switch=Switch
bg.Esplora_Switch.description=
bg.Esplora_Switch.description=Switch
bg.Esplora_RIGHT2=RIGHT
bg.Esplora_LEFT2=LEFT
bg.Esplora_MIDDLE=MIDDLE
bg.Esplora_Mouse_Click=Click Mouse
bg.Esplora_Mouse_Click.description=Click Mouse
bg.Esplora_Mouse_Press=Press Mouse
bg.Esplora_Mouse_Press.description=Press Mouse
bg.Esplora_Mouse_Release=Release Mouse
bg.Esplora_Mouse_Release.description=Release Mouse
bg.Esplora_Mouse_isPressed=Mouse Is Pressed
bg.Esplora_Mouse_isPressed.description=Mouse Is Pressed
bg.Esplora_Mouse_move=Mouse Move
bg.Esplora_Mouse_move.description=Mouse Move

bg.ls_10mmLEDModule.description=10mm Blue/Green/Yellow/Red LED Module
bg.ls_5mmLEDModule.description=5mm Blue/Green/Yellow/Red LED Module
Expand Down
88 changes: 87 additions & 1 deletion src/main/resources/com/ardublock/block/ardublock.xml
Expand Up @@ -6888,7 +6888,80 @@
</Image>
</Images>
</BlockGenus>

<BlockGenus name="Esplora_RIGHT2" kind="data" color="214 169 54" initlabel="bg.Esplora_RIGHT2">
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="plug"/>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="Esplora_LEFT2" kind="data" color="214 169 54" initlabel="bg.Esplora_LEFT2">
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="plug"/>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="Esplora_MIDDLE" kind="data" color="214 169 54" initlabel="bg.Esplora_MIDDLE">
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="plug"/>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="Esplora_Mouse_Click" kind="command" color="0 255 0" initlabel="bg.Esplora_Mouse_Click">
<description>
<text>Esplora_Mouse_Click
</text>
</description>
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="socket" label="">
<DefaultArg genus-name="Esplora_LEFT2" label="Gauche" />
</BlockConnector>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="Esplora_Mouse_Press" kind="command" color="0 255 0" initlabel="bg.Esplora_Mouse_Press">
<description>
<text>Esplora_Mouse_Press
</text>
</description>
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="socket" label="">
<DefaultArg genus-name="Esplora_LEFT2" label="Gauche" />
</BlockConnector>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="Esplora_Mouse_Release" kind="command" color="0 255 0" initlabel="bg.Esplora_Mouse_Release">
<description>
<text>Esplora_Mouse_Release
</text>
</description>
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="socket" label="">
<DefaultArg genus-name="Esplora_LEFT2" label="Gauche" />
</BlockConnector>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="Esplora_Mouse_isPressed" kind="data" color="0 255 0" initlabel="bg.Esplora_Mouse_isPressed">
<description>
<text>Esplora_Mouse_isPressed
</text>
</description>
<BlockConnectors>
<BlockConnector connector-type="boolean" connector-kind="plug" />
<BlockConnector connector-type="number" connector-kind="socket" label="">
<DefaultArg genus-name="Esplora_LEFT2" label="Gauche" />
</BlockConnector>
</BlockConnectors>
</BlockGenus>
<BlockGenus name="Esplora_Mouse_move" kind="command" color="0 255 0" initlabel="bg.Esplora_Mouse_move">
<description>
<text>Esplora_Mouse_move
</text>
</description>
<BlockConnectors>
<BlockConnector connector-type="number" connector-kind="socket" label="# X">
<DefaultArg genus-name="number" label="10" />
</BlockConnector>
<BlockConnector connector-type="number" connector-kind="socket" label="# Y">
<DefaultArg genus-name="number" label="10" />
</BlockConnector>
</BlockConnectors>
</BlockGenus>
<!-- end of Esplora -->

<!--**** linksprite_LinkerKit **** -->
Expand Down Expand Up @@ -10085,6 +10158,16 @@
<FamilyMember>Esplora_UP</FamilyMember>
<FamilyMember>Esplora_RIGHT</FamilyMember>
</BlockFamily>
<BlockFamily>
<FamilyMember>Esplora_LEFT2</FamilyMember>
<FamilyMember>Esplora_RIGHT2</FamilyMember>
<FamilyMember>Esplora_MIDDLE</FamilyMember>
</BlockFamily>
<BlockFamily>
<FamilyMember>Esplora_Mouse_Click</FamilyMember>
<FamilyMember>Esplora_Mouse_Press</FamilyMember>
<FamilyMember>Esplora_Mouse_Release</FamilyMember>
</BlockFamily>
<BlockFamily>
<FamilyMember>Midi_C</FamilyMember>
<FamilyMember>Midi_CS</FamilyMember>
Expand Down Expand Up @@ -10463,6 +10546,9 @@
<BlockGenusMember>Esplora_JoystickX</BlockGenusMember>
<BlockGenusMember>Esplora_JoystickSwitch</BlockGenusMember>
<BlockGenusMember>Esplora_AccelerationX</BlockGenusMember>
<BlockGenusMember>Esplora_Mouse_Click</BlockGenusMember>
<BlockGenusMember>Esplora_Mouse_isPressed</BlockGenusMember>
<BlockGenusMember>Esplora_Mouse_move</BlockGenusMember>
</BlockDrawer>
<BlockDrawer button-color="216 5 10" name="bd.adafruit" type="factory">
<BlockGenusMember>ada_dc_motor_fwd</BlockGenusMember>
Expand Down
Expand Up @@ -729,6 +729,14 @@ bg.Esplora_UP=Haut
bg.Esplora_RIGHT=Droite
bg.Esplora_JoystickSwitch2=Joystick Interrupteur
bg.Esplora_Switch=Interrupteur
bg.Esplora_RIGHT2=Droite
bg.Esplora_LEFT2=Gauche
bg.Esplora_MIDDLE=Milieu
bg.Esplora_Mouse_Click=Clique Bouton de la souris
bg.Esplora_Mouse_Press=Appuyer Bouton de la souris
bg.Esplora_Mouse_Release=Relacher Bouton de la souris
bg.Esplora_Mouse_isPressed=Bouton de souris appuyé \u00e0
bg.Esplora_Mouse_move=D\u00e9placer souris

bg.ls_10mmLEDModule.description=Module DEL 10mm bleu/vert/jaune/rouge
bg.ls_5mmLEDModule.description=Module DEL 5mm bleu/vert/jaune/rouge
Expand Down
Expand Up @@ -563,6 +563,15 @@ Esplora_UP=com.ardublock.translator.block.Esplora.Up
Esplora_RIGHT=com.ardublock.translator.block.Esplora.Right
Esplora_JoystickSwitch2=com.ardublock.translator.block.Esplora.JoystickSwitch2
Esplora_Switch=com.ardublock.translator.block.Esplora.Switch
Esplora_LEFT2=com.ardublock.translator.block.Esplora.Left
Esplora_RIGHT2=com.ardublock.translator.block.Esplora.Right
Esplora_MIDDLE=com.ardublock.translator.block.Esplora.Middle
Esplora_Mouse_Click=com.ardublock.translator.block.Esplora.Mouse_Click
Esplora_Mouse_Press=com.ardublock.translator.block.Esplora.Mouse_Press
Esplora_Mouse_Release=com.ardublock.translator.block.Esplora.Mouse_Release
Esplora_Mouse_isPressed=com.ardublock.translator.block.Esplora.Mouse_isPressed
Esplora_Mouse_move=com.ardublock.translator.block.Esplora.Mouse_move

#Panda
panda_i0=com.ardublock.translator.block.panda.PandaInputPortBlock
panda_i1=com.ardublock.translator.block.panda.PandaInputPortBlock
Expand Down

0 comments on commit 5973c36

Please sign in to comment.