diff --git a/src/main/java/com/ardublock/translator/block/DuinoEDU/Led_Bar.java b/src/main/java/com/ardublock/translator/block/DuinoEDU/Led_Bar.java index db4336808..7e61ea527 100644 --- a/src/main/java/com/ardublock/translator/block/DuinoEDU/Led_Bar.java +++ b/src/main/java/com/ardublock/translator/block/DuinoEDU/Led_Bar.java @@ -16,12 +16,18 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio String Clk; String Dio; String Niveau; + String Min; + String Max; TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); Dio = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(1); Clk = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(2); Niveau = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(3); + Min = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(4); + Max = translatorBlock.toCode(); translator.addHeaderFile("LED_Bar.h"); @@ -30,7 +36,7 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/grove/EDU_LedBar_Grove/ \n// Pin Led Bar\n" + "LED_Bar mesLeds_pin"+Dio+Clk+"(" + Clk + "," + Dio + ");"); - String ret = "mesLeds_pin"+Dio+Clk+".displayVoltage("+ Niveau +");\n"; + String ret = "mesLeds_pin"+Dio+Clk+".afficherTension("+ Niveau +","+ Min+","+ Max+");\n"; return codePrefix + ret + codeSuffix; } diff --git a/src/main/java/com/ardublock/translator/block/DuinoEDU/Ultrasonic.java b/src/main/java/com/ardublock/translator/block/DuinoEDU/Ultrasonic.java index 6d59fa75f..e2de248ba 100644 --- a/src/main/java/com/ardublock/translator/block/DuinoEDU/Ultrasonic.java +++ b/src/main/java/com/ardublock/translator/block/DuinoEDU/Ultrasonic.java @@ -14,14 +14,17 @@ public Ultrasonic(Long blockId, Translator translator, String codePrefix, String public String toCode() throws SocketNullException, SubroutineNotDeclaredException { String Pin; + String Sample; TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); Pin = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(1); + Sample = translatorBlock.toCode(); translator.addHeaderFile("Ultrasonic.h"); translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/grove/EDU_Ultrasonic_Grove/ \nUltrasonic monUltrasonic_pin"+Pin+"("+Pin +");" ); - String ret = "monUltrasonic_pin"+Pin+".mesurer()"; + String ret = "monUltrasonic_pin"+Pin+".mesurer("+Sample+")"; return codePrefix + ret + codeSuffix; diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A0.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A0.java new file mode 100644 index 000000000..302aeb190 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A0.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A0 extends TranslatorBlock +{ + + public A0(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "0" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A1.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A1.java new file mode 100644 index 000000000..5d8ca1bc9 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A1.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A1 extends TranslatorBlock +{ + + public A1(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "1" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A10.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A10.java new file mode 100644 index 000000000..7b91e6467 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A10.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A10 extends TranslatorBlock +{ + + public A10(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "10" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A11.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A11.java new file mode 100644 index 000000000..7c0fa3f40 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A11.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A11 extends TranslatorBlock +{ + + public A11(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "11" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A12.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A12.java new file mode 100644 index 000000000..504de668d --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A12.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A12 extends TranslatorBlock +{ + + public A12(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "12" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A13.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A13.java new file mode 100644 index 000000000..8399395f2 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A13.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A13 extends TranslatorBlock +{ + + public A13(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "13" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A14.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A14.java new file mode 100644 index 000000000..06a2147b0 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A14.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A14 extends TranslatorBlock +{ + + public A14(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "14" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A15.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A15.java new file mode 100644 index 000000000..72aa863a0 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A15.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A15 extends TranslatorBlock +{ + + public A15(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "15" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A2.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A2.java new file mode 100644 index 000000000..6dd51e284 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A2.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A2 extends TranslatorBlock +{ + + public A2(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "2" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A3.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A3.java new file mode 100644 index 000000000..0d1d475ac --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A3.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A3 extends TranslatorBlock +{ + + public A3(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "3" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A4.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A4.java new file mode 100644 index 000000000..88f4ae84d --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A4.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A4 extends TranslatorBlock +{ + + public A4(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "4" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A5.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A5.java new file mode 100644 index 000000000..cfac22633 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A5.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A5 extends TranslatorBlock +{ + + public A5(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "6" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A6.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A6.java new file mode 100644 index 000000000..b138debc9 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A6.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A6 extends TranslatorBlock +{ + + public A6(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "0" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A7.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A7.java new file mode 100644 index 000000000..1c615d250 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A7.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A7 extends TranslatorBlock +{ + + public A7(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "7" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A8.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A8.java new file mode 100644 index 000000000..feb38e0d7 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A8.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A8 extends TranslatorBlock +{ + + public A8(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "8" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/A9.java b/src/main/java/com/ardublock/translator/block/Duinoedu/A9.java new file mode 100644 index 000000000..492ce6b53 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/A9.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class A9 extends TranslatorBlock +{ + + public A9(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "9" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D10.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D10.java new file mode 100644 index 000000000..f2bf15d2b --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D10.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D10 extends TranslatorBlock +{ + + public D10(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "10" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D11.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D11.java new file mode 100644 index 000000000..f5136e343 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D11.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D11 extends TranslatorBlock +{ + + public D11(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "11" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D12.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D12.java new file mode 100644 index 000000000..a2eda7b37 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D12.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D12 extends TranslatorBlock +{ + + public D12(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "12" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D13.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D13.java new file mode 100644 index 000000000..2f7080823 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D13.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D13 extends TranslatorBlock +{ + + public D13(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "13" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D14.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D14.java new file mode 100644 index 000000000..eb547dff3 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D14.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D14 extends TranslatorBlock +{ + + public D14(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "14" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D15.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D15.java new file mode 100644 index 000000000..17ce918d0 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D15.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D15 extends TranslatorBlock +{ + + public D15(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "15" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D16.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D16.java new file mode 100644 index 000000000..db646c9ee --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D16.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D16 extends TranslatorBlock +{ + + public D16(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "16" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D17.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D17.java new file mode 100644 index 000000000..f94f3dc28 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D17.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D17 extends TranslatorBlock +{ + + public D17(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "17" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D18.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D18.java new file mode 100644 index 000000000..aeef6802e --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D18.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D18 extends TranslatorBlock +{ + + public D18(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "18" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D19.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D19.java new file mode 100644 index 000000000..435d5929f --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D19.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D19 extends TranslatorBlock +{ + + public D19(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "19" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D2.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D2.java new file mode 100644 index 000000000..f7daacb5f --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D2.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D2 extends TranslatorBlock +{ + + public D2(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "2" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D20.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D20.java new file mode 100644 index 000000000..492e8a55a --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D20.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D20 extends TranslatorBlock +{ + + public D20(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "20" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D21.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D21.java new file mode 100644 index 000000000..396918d89 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D21.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D21 extends TranslatorBlock +{ + + public D21(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "21" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D3.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D3.java new file mode 100644 index 000000000..e091e7934 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D3.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D3 extends TranslatorBlock +{ + + public D3(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "3" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D4.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D4.java new file mode 100644 index 000000000..04f16f031 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D4.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D4 extends TranslatorBlock +{ + + public D4(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "4" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D5.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D5.java new file mode 100644 index 000000000..04455dd7a --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D5.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D5 extends TranslatorBlock +{ + + public D5(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "5" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D6.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D6.java new file mode 100644 index 000000000..1df37d627 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D6.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D6 extends TranslatorBlock +{ + + public D6(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "6" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D7.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D7.java new file mode 100644 index 000000000..dcccf4258 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D7.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D7 extends TranslatorBlock +{ + + public D7(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "7" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D8.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D8.java new file mode 100644 index 000000000..57dc05a33 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D8.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D8 extends TranslatorBlock +{ + + public D8(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "8" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/D9.java b/src/main/java/com/ardublock/translator/block/Duinoedu/D9.java new file mode 100644 index 000000000..1853a1bb1 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/D9.java @@ -0,0 +1,19 @@ +package com.ardublock.translator.block.Duinoedu; + +import com.ardublock.translator.Translator; +import com.ardublock.translator.block.TranslatorBlock; +import com.ardublock.translator.block.exception.SocketNullException; + +public class D9 extends TranslatorBlock +{ + + public D9(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) { + super(blockId, translator, codePrefix, codeSuffix, label); + } + + @Override + public String toCode() throws SocketNullException { + return codePrefix + "9" + codeSuffix; + } + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/DuinoEDU_MP3_Pause.java b/src/main/java/com/ardublock/translator/block/Duinoedu/DuinoEDU_MP3_Pause.java new file mode 100644 index 000000000..f6b1e9819 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/DuinoEDU_MP3_Pause.java @@ -0,0 +1,51 @@ +package com.ardublock.translator.block.Duinoedu; + +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 DuinoEDU_MP3_Pause extends TranslatorBlock { + public DuinoEDU_MP3_Pause(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) + { + super(blockId, translator, codePrefix, codeSuffix, label); + } + @Override + public String toCode() throws SocketNullException, SubroutineNotDeclaredException + { + String Clk; + String Dio; + String Volume; + String Track; + TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); + Clk = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(1); + Dio = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(2); + Volume = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(3); + Track = translatorBlock.toCode(); + + translator.addHeaderFile("EduMp3.h"); + translator.addHeaderFile("SoftwareSerial.h"); + + translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/grove/ \n" + + "EduMp3 monMp3_"+Clk+Dio+"(" + Clk + "," + Dio + ");"); + translator.addSetupCommand(" monMp3_"+Clk+Dio+".brancher();"); + + + String ret = "monMp3_"+Clk+Dio+".lireMorceau(" + Track+ ");\n" + +"monMp3_"+Clk+Dio+".reglerVolume(" + Volume+ ");"; + + return codePrefix + ret + codeSuffix; + } + + + + + + + + + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/MP3_Pause.java b/src/main/java/com/ardublock/translator/block/Duinoedu/MP3_Pause.java new file mode 100644 index 000000000..9707748ba --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/MP3_Pause.java @@ -0,0 +1,44 @@ +package com.ardublock.translator.block.Duinoedu; + +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 MP3_Pause extends TranslatorBlock { + public MP3_Pause(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) + { + super(blockId, translator, codePrefix, codeSuffix, label); + } + @Override + public String toCode() throws SocketNullException, SubroutineNotDeclaredException + { + String Clk; + String Dio; + TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); + Clk = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(1); + Dio = translatorBlock.toCode(); + + translator.addHeaderFile("EduMp3.h"); + translator.addHeaderFile("SoftwareSerial.h"); + + translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/grove/ \n" + + "EduMp3 monMp3_"+Clk+Dio+"(" + Clk + "," + Dio + ");"); + translator.addSetupCommand(" monMp3_"+Clk+Dio+".brancher();"); + + + String ret = "monMp3_"+Clk+Dio+".mettreEnPause();"; + + return codePrefix + ret + codeSuffix; + } + + + + + + + + + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/MP3_Player.java b/src/main/java/com/ardublock/translator/block/Duinoedu/MP3_Player.java new file mode 100644 index 000000000..2fb59bdc7 --- /dev/null +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/MP3_Player.java @@ -0,0 +1,51 @@ +package com.ardublock.translator.block.Duinoedu; + +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 MP3_Player extends TranslatorBlock { + public MP3_Player(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) + { + super(blockId, translator, codePrefix, codeSuffix, label); + } + @Override + public String toCode() throws SocketNullException, SubroutineNotDeclaredException + { + String Clk; + String Dio; + String Volume; + String Track; + TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); + Clk = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(1); + Dio = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(2); + Volume = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(3); + Track = translatorBlock.toCode(); + + translator.addHeaderFile("EduMp3.h"); + translator.addHeaderFile("SoftwareSerial.h"); + + translator.addDefinitionCommand("//libraries at http://duinoedu.com/dl/lib/grove/ \n" + + "EduMp3 monMp3_"+Clk+Dio+"(" + Clk + "," + Dio + ");"); + translator.addSetupCommand(" monMp3_"+Clk+Dio+".brancher();"); + + + String ret = "monMp3_"+Clk+Dio+".lireMorceau(" + Track+ ");\n" + +"monMp3_"+Clk+Dio+".reglerVolume(" + Volume+ ");"; + + return codePrefix + ret + codeSuffix; + } + + + + + + + + + +} diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorGRB.java b/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorGRB.java index bdf43a3f9..5faa58d81 100644 --- a/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorGRB.java +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorGRB.java @@ -17,22 +17,38 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio { String Pin ; String Pixel_Nb; - String Red; - String Blue; - String Green; + String Red_start; + String Blue_start; + String Green_start; + String Nb_Led; + String Step; + String Red_end; + String Blue_end; + String Green_end; + TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); Pin = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(1); Pixel_Nb = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(2); - Red = translatorBlock.toCode(); + Red_start = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(3); - Green = translatorBlock.toCode(); + Green_start = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(4); - Blue = translatorBlock.toCode(); + Blue_start = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(5); + Nb_Led = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(6); + Step = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(7); + Red_end = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(8); + Green_end = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(9); + Blue_end = translatorBlock.toCode(); - String ret = "monRuban_pin"+Pin+".preparerPixel("+Pixel_Nb+","+Green+" ,"+Red+" ,"+Blue+" );\n"; + String ret = "monRuban_pin"+Pin+".preparerPixel("+Pixel_Nb+","+Green_start+" ,"+Red_start+" ,"+Blue_start+" ,"+Nb_Led+" ,"+Step+" ,"+Green_end+" ,"+Red_end+" ,"+Blue_end+" );\n"; return codePrefix + ret + codeSuffix; diff --git a/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorRGB.java b/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorRGB.java index dc1320e26..7b368982c 100644 --- a/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorRGB.java +++ b/src/main/java/com/ardublock/translator/block/Duinoedu/Neopixel_pixel_colorRGB.java @@ -17,22 +17,37 @@ public String toCode() throws SocketNullException, SubroutineNotDeclaredExceptio { String Pin ; String Pixel_Nb; - String Red; - String Blue; - String Green; + String Red_start; + String Blue_start; + String Green_start; + String Nb_Led; + String Step; + String Red_end; + String Blue_end; + String Green_end; + TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0); Pin = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(1); Pixel_Nb = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(2); - Red = translatorBlock.toCode(); + Red_start = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(3); - Green = translatorBlock.toCode(); + Green_start = translatorBlock.toCode(); translatorBlock = this.getRequiredTranslatorBlockAtSocket(4); - Blue = translatorBlock.toCode(); - + Blue_start = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(5); + Nb_Led = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(6); + Step = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(7); + Red_end = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(8); + Green_end = translatorBlock.toCode(); + translatorBlock = this.getRequiredTranslatorBlockAtSocket(9); + Blue_end = translatorBlock.toCode(); - String ret = "monRuban_pin"+Pin+".preparerPixel("+Pixel_Nb+","+Red+" ,"+Green+" ,"+Blue+" );\n"; + String ret = "monRuban_pin"+Pin+".preparerPixel("+Pixel_Nb+","+Red_start+" ,"+Green_start+" ,"+Blue_start +" ,"+Nb_Led+" ,"+Step+" ,"+Red_end+" ,"+Green_end+" ,"+Blue_end+ " );\n"; return codePrefix + ret + codeSuffix; diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties index 8e88adde6..e5d6c089b 100644 --- a/src/main/resources/com/ardublock/block/ardublock.properties +++ b/src/main/resources/com/ardublock/block/ardublock.properties @@ -856,6 +856,7 @@ bg.DuinoEDU_Aix_Acc_mesurerVariation=Variation bg.DuinoEDU_Aix_Acc_mesurerVariation.description=Variation bg.DuinoEDU_Ultrasonic=Ultrasonic bg.DuinoEDU_Ultrasonic.description=Ultrasonic +bc.sample=Nb Sample bg.DuinoEDU_Partie_Emetteur=Emetteur bg.DuinoEDU_Partie_Emetteur.description=Emetteur bg.DuinoEDU_Partie_Recepteur=Recepteur @@ -941,7 +942,48 @@ bg.DuinoEDU_Guino_switch=Guino Switch bg.DuinoEDU_Guino_switch.description=add a Switch in Guino bg.DuinoEDU_Guino_pause= bg.DuinoEDU_Guino_pause.description=Pause - +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 +bc.step2=Step +bc.name=Name +bg.DuinoEDU_D2=D2 +bg.DuinoEDU_D3=D3 +bg.DuinoEDU_D4=D4 +bg.DuinoEDU_D5=D5 +bg.DuinoEDU_D6=D6 +bg.DuinoEDU_D7=D7 +bg.DuinoEDU_D8=D8 +bg.DuinoEDU_D9=D9 +bg.DuinoEDU_D10=D10 +bg.DuinoEDU_D11=D11 +bg.DuinoEDU_D12=D12 +bg.DuinoEDU_D13=D13 +bg.DuinoEDU_D14=D14 +bg.DuinoEDU_D15=D15 +bg.DuinoEDU_D16=D16 +bg.DuinoEDU_D17=D17 +bg.DuinoEDU_D18=D18 +bg.DuinoEDU_D19=D19 +bg.DuinoEDU_D20=D20 +bg.DuinoEDU_D21=D21 +bg.DuinoEDU_A0=A0 +bg.DuinoEDU_A1=A1 +bg.DuinoEDU_A2=A2 +bg.DuinoEDU_A3=A3 +bg.DuinoEDU_A4=A4 +bg.DuinoEDU_A5=A5 +bg.DuinoEDU_A6=A6 +bg.DuinoEDU_A7=A7 +bg.DuinoEDU_A8=A8 +bg.DuinoEDU_A9=A9 +bg.DuinoEDU_A10=A10 +bg.DuinoEDU_A11=A11 +bg.DuinoEDU_A12=A12 +bg.DuinoEDU_A13=A13 +bg.DuinoEDU_A14=A14 +bg.DuinoEDU_A15=A15 bc.DuinoEDU_Brightness=Brightness bc.DuinoEDU_Display=Display bg.DuinoEDU_On_digit1=1 @@ -957,9 +999,12 @@ bc.DuinoEDU_Display_Point=Display Point bg.DuinoEDU_setSerialInfosOn=ON bg.DuinoEDU_setSerialInfosOff=OFF bc.DuinoEDU_serial_display=Display on serial -bc.red=Red -bc.blue=Blue -bc.green=Green +bc.red=Red Start +bc.blue=Blue Start +bc.green=Green Start +bc.red_end=Red End +bc.blue_end=Blue End +bc.green_end=Green End bc.stepperround=Step per Round bc.step=Nb Step bg.DuinoEDU_greater=> @@ -975,6 +1020,7 @@ bg.DuinoEDU_S2=S2 bg.DuinoEDU_S3=S3 bg.DuinoEDU_S4=S4 bg.DuinoEDU_S5=S5 +bc.track=Read Track bg.ls_10mmLEDModule.description=10mm Blue/Green/Yellow/Red LED Module bg.ls_5mmLEDModule.description=5mm Blue/Green/Yellow/Red LED Module diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml index 771e23bf2..e32d0fd8d 100644 --- a/src/main/resources/com/ardublock/block/ardublock.xml +++ b/src/main/resources/com/ardublock/block/ardublock.xml @@ -314,7 +314,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -396,7 +396,7 @@ - + @@ -414,7 +414,7 @@ - + @@ -1553,7 +1553,7 @@ - + @@ -1567,7 +1567,7 @@ - + @@ -1586,7 +1586,7 @@ - + @@ -1606,10 +1606,10 @@ - + - + @@ -3458,7 +3458,7 @@ - + @@ -3475,7 +3475,7 @@ - + @@ -3492,7 +3492,7 @@ - + @@ -3508,7 +3508,7 @@ - + @@ -3524,7 +3524,7 @@ - + @@ -3540,7 +3540,7 @@ - + @@ -3556,7 +3556,7 @@ - + @@ -3572,7 +3572,7 @@ - + @@ -3588,7 +3588,7 @@ - + @@ -3604,7 +3604,7 @@ - + @@ -3620,7 +3620,7 @@ - + @@ -3636,7 +3636,7 @@ - + @@ -3652,7 +3652,7 @@ - + @@ -3668,7 +3668,7 @@ - + @@ -3684,7 +3684,7 @@ - + @@ -3700,7 +3700,7 @@ - + @@ -3716,7 +3716,7 @@ - + @@ -3734,7 +3734,7 @@ - + @@ -3751,7 +3751,7 @@ - + @@ -3768,7 +3768,7 @@ - + @@ -3784,7 +3784,7 @@ - + @@ -3800,7 +3800,7 @@ - + @@ -3817,7 +3817,7 @@ - + @@ -3834,7 +3834,7 @@ - + @@ -3850,7 +3850,7 @@ - + @@ -3867,7 +3867,7 @@ - + @@ -3884,7 +3884,7 @@ - + @@ -3901,7 +3901,7 @@ - + @@ -3918,7 +3918,7 @@ - + @@ -3935,7 +3935,7 @@ - + @@ -3952,7 +3952,7 @@ - + @@ -3969,7 +3969,7 @@ - + @@ -3986,7 +3986,7 @@ - + @@ -4003,7 +4003,7 @@ - + @@ -4019,7 +4019,7 @@ - + @@ -4038,7 +4038,7 @@ - + @@ -4057,7 +4057,7 @@ - + @@ -4076,7 +4076,7 @@ - + @@ -4095,7 +4095,7 @@ - + @@ -4114,7 +4114,7 @@ - + @@ -4133,7 +4133,7 @@ - + @@ -4152,7 +4152,7 @@ - + @@ -4171,7 +4171,7 @@ - + @@ -4190,7 +4190,7 @@ - + @@ -4215,7 +4215,7 @@ - + @@ -4232,7 +4232,7 @@ - + @@ -4249,7 +4249,7 @@ - + @@ -4266,7 +4266,7 @@ - + @@ -4283,7 +4283,7 @@ - + @@ -4299,7 +4299,10 @@ - + + + + @@ -4317,13 +4320,19 @@ - + - + - + + + + + + + @@ -4428,10 +4437,10 @@ - + - + @@ -4449,10 +4458,10 @@ - + - + @@ -4506,10 +4515,10 @@ - + - + @@ -4526,10 +4535,10 @@ - + - + @@ -4546,10 +4555,10 @@ - + - + @@ -4603,10 +4612,10 @@ - + - + @@ -4627,10 +4636,10 @@ - + - + @@ -4650,10 +4659,10 @@ - + - + @@ -4722,10 +4731,10 @@ - + - + @@ -4925,7 +4934,7 @@ - + @@ -4942,7 +4951,7 @@ - + @@ -4958,10 +4967,10 @@ - + - + @@ -4980,10 +4989,10 @@ - + - + @@ -5048,7 +5057,7 @@ - + @@ -5057,7 +5066,7 @@ - + @@ -5073,7 +5082,7 @@ - + @@ -5087,6 +5096,21 @@ + + + + + + + + + + + + + + + @@ -5101,7 +5125,7 @@ - + @@ -5115,6 +5139,21 @@ + + + + + + + + + + + + + + + @@ -5128,7 +5167,7 @@ - + @@ -5143,7 +5182,7 @@ - + @@ -5161,7 +5200,7 @@ - + @@ -5177,16 +5216,16 @@ - + - + - + - + @@ -5204,16 +5243,16 @@ - + - + - + - + @@ -5234,13 +5273,13 @@ - + - + - + @@ -5264,13 +5303,13 @@ - + - + - + @@ -5285,13 +5324,13 @@ - + - + - + @@ -5310,7 +5349,7 @@ - + @@ -5329,7 +5368,7 @@ - + @@ -5663,7 +5702,7 @@ Guino Read - + @@ -5698,7 +5737,7 @@ - + @@ -5720,7 +5759,7 @@ - + @@ -5730,6 +5769,228 @@ + + + MP3 Player + + + + + + + + + + + + + + + + + + com/ardublock/block/seeedstudio/Mp3Player.png + + + + + + MP3 Player + + + + + + + + + + + + com/ardublock/block/seeedstudio/Mp3Player.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6337,7 +6598,7 @@ - + @@ -8814,6 +9075,46 @@ DuinoEDU_Barometer_Pression DuinoEDU_Barometer_Altitude + + DuinoEDU_D2 + DuinoEDU_D3 + DuinoEDU_D4 + DuinoEDU_D5 + DuinoEDU_D6 + DuinoEDU_D7 + DuinoEDU_D8 + DuinoEDU_D9 + DuinoEDU_D10 + DuinoEDU_D11 + DuinoEDU_D12 + DuinoEDU_D13 + DuinoEDU_D14 + DuinoEDU_D15 + DuinoEDU_D16 + DuinoEDU_D17 + DuinoEDU_D18 + DuinoEDU_D19 + DuinoEDU_D20 + DuinoEDU_D21 + + + DuinoEDU_A0 + DuinoEDU_A1 + DuinoEDU_A2 + DuinoEDU_A3 + DuinoEDU_A4 + DuinoEDU_A5 + DuinoEDU_A6 + DuinoEDU_A7 + DuinoEDU_A8 + DuinoEDU_A9 + DuinoEDU_A10 + DuinoEDU_A11 + DuinoEDU_A12 + DuinoEDU_A13 + DuinoEDU_A14 + DuinoEDU_A15 + Midi_C Midi_CS @@ -9060,6 +9361,8 @@ df_romeo_motor_stop + seeed_button + seeed_led seeed_o2_sensor seeed_uv_sensor seeed_single_gyro @@ -9078,7 +9381,6 @@ seeed_light_sensor seeed_voltage_divider seeed_flame_sensor - seeed_button seeed_switch seeed_ir_refl_sensor seeed_heart_rate_sensor @@ -9098,7 +9400,6 @@ seeed_solid_relay seeed_circle_led seeed_led_strip - seeed_led seeed_var_led seeed_vib seeed_relay @@ -9153,7 +9454,9 @@ DuinoEDU_matrice_clear DuinoEDU_Servo_Plus DuinoEDU_Nunchuck_BoutonC - DuinoEDU_Barometer_Pression + DuinoEDU_Barometer_Pression + DuinoEDU_MP3_Player + DuinoEDU_MP3_Pause ada_dc_motor_fwd diff --git a/src/main/resources/com/ardublock/block/ardublock_fr.properties b/src/main/resources/com/ardublock/block/ardublock_fr.properties index 4ea16b7a1..dfe961dbd 100644 --- a/src/main/resources/com/ardublock/block/ardublock_fr.properties +++ b/src/main/resources/com/ardublock/block/ardublock_fr.properties @@ -567,6 +567,7 @@ bg.DuinoEDU_Aix_Acc_mesurerXYZ=Acc XYZ mesurer bg.DuinoEDU_Aix_Acc_mesurerVariation=Variation d'Acc bg.DuinoEDU_Ultrasonic=Ultrasonic Grove bg.DuinoEDU_Ultrasonic.description=Renvoie la distance en Cm +bc.sample=Nb éch bg.DuinoEDU_Partie_Emetteur=Emetteur bg.DuinoEDU_Partie_Emetteur.description=Emet un texte bg.DuinoEDU_Partie_Recepteur=Recepteur @@ -635,14 +636,21 @@ bc.DuinoEDU_Display_Point=Afficher les : bg.DuinoEDU_setSerialInfosOn=activer bg.DuinoEDU_setSerialInfosOff=desactiver bc.DuinoEDU_serial_display=affichage port série -bc.red=Rouge -bc.blue=Bleu -bc.green=Vert +bc.red=Rouge Début +bc.blue=Bleu Début +bc.green=Vert Début +bc.red_end=Rouge Fin +bc.blue_end=Bleu Fin +bc.green_end=Vert Fin bc.stepperround=Nb pas\u005cTour bc.step=Nb Pas bc.speed_number=Vitesse bc.DuinoEDU_motor_run_leftspeed=Vitesse Moteur Gauche bc.DuinoEDU_motor_run_rightspeed=Moteur Droit +bc.track=Lire Morceau +bg.DuinoEDU_MP3_Player.description=Fixe un volume entre 0 et 1000. lance la lecture du morceau entre 0 et 255. +bc.step2=Pas +bc.name=Nom bg.ls_10mmLEDModule.description=Module DEL 10mm bleu/vert/jaune/rouge bg.ls_5mmLEDModule.description=Module DEL 5mm bleu/vert/jaune/rouge diff --git a/src/main/resources/com/ardublock/block/block-mapping.properties b/src/main/resources/com/ardublock/block/block-mapping.properties index d0a9972e5..44b06e8d6 100644 --- a/src/main/resources/com/ardublock/block/block-mapping.properties +++ b/src/main/resources/com/ardublock/block/block-mapping.properties @@ -455,6 +455,44 @@ DuinoEDU_Guino_Slider=com.ardublock.translator.block.Duinoedu.Guino_Slider DuinoEDU_Guino_column=com.ardublock.translator.block.Duinoedu.Guino_Column DuinoEDU_Guino_switch=com.ardublock.translator.block.Duinoedu.Guino_Switch DuinoEDU_Guino_pause=com.ardublock.translator.block.Duinoedu.Guino_Pause +DuinoEDU_MP3_Player=com.ardublock.translator.block.Duinoedu.MP3_Player +DuinoEDU_MP3_Pause=com.ardublock.translator.block.Duinoedu.MP3_Pause +DuinoEDU_D2=com.ardublock.translator.block.Duinoedu.D2 +DuinoEDU_D3=com.ardublock.translator.block.Duinoedu.D3 +DuinoEDU_D4=com.ardublock.translator.block.Duinoedu.D4 +DuinoEDU_D5=com.ardublock.translator.block.Duinoedu.D5 +DuinoEDU_D6=com.ardublock.translator.block.Duinoedu.D6 +DuinoEDU_D7=com.ardublock.translator.block.Duinoedu.D7 +DuinoEDU_D8=com.ardublock.translator.block.Duinoedu.D8 +DuinoEDU_D9=com.ardublock.translator.block.Duinoedu.D9 +DuinoEDU_D10=com.ardublock.translator.block.Duinoedu.D10 +DuinoEDU_D11=com.ardublock.translator.block.Duinoedu.D11 +DuinoEDU_D12=com.ardublock.translator.block.Duinoedu.D12 +DuinoEDU_D13=com.ardublock.translator.block.Duinoedu.D13 +DuinoEDU_D14=com.ardublock.translator.block.Duinoedu.D14 +DuinoEDU_D15=com.ardublock.translator.block.Duinoedu.D15 +DuinoEDU_D16=com.ardublock.translator.block.Duinoedu.D16 +DuinoEDU_D17=com.ardublock.translator.block.Duinoedu.D17 +DuinoEDU_D18=com.ardublock.translator.block.Duinoedu.D18 +DuinoEDU_D19=com.ardublock.translator.block.Duinoedu.D19 +DuinoEDU_D20=com.ardublock.translator.block.Duinoedu.D20 +DuinoEDU_D10=com.ardublock.translator.block.Duinoedu.D21 +DuinoEDU_A0=com.ardublock.translator.block.Duinoedu.A0 +DuinoEDU_A1=com.ardublock.translator.block.Duinoedu.A1 +DuinoEDU_A2=com.ardublock.translator.block.Duinoedu.A2 +DuinoEDU_A3=com.ardublock.translator.block.Duinoedu.A3 +DuinoEDU_A4=com.ardublock.translator.block.Duinoedu.A4 +DuinoEDU_A5=com.ardublock.translator.block.Duinoedu.A5 +DuinoEDU_A6=com.ardublock.translator.block.Duinoedu.A6 +DuinoEDU_A7=com.ardublock.translator.block.Duinoedu.A7 +DuinoEDU_A8=com.ardublock.translator.block.Duinoedu.A8 +DuinoEDU_A9=com.ardublock.translator.block.Duinoedu.A9 +DuinoEDU_A10=com.ardublock.translator.block.Duinoedu.A10 +DuinoEDU_A11=com.ardublock.translator.block.Duinoedu.A11 +DuinoEDU_A12=com.ardublock.translator.block.Duinoedu.A12 +DuinoEDU_A13=com.ardublock.translator.block.Duinoedu.A13 +DuinoEDU_A14=com.ardublock.translator.block.Duinoedu.A14 +DuinoEDU_A15=com.ardublock.translator.block.Duinoedu.A15 #Panda panda_i0=com.ardublock.translator.block.panda.PandaInputPortBlock panda_i1=com.ardublock.translator.block.panda.PandaInputPortBlock diff --git a/src/main/resources/com/ardublock/block/seeedstudio/Mp3Player.png b/src/main/resources/com/ardublock/block/seeedstudio/Mp3Player.png new file mode 100644 index 000000000..a5b3beb84 Binary files /dev/null and b/src/main/resources/com/ardublock/block/seeedstudio/Mp3Player.png differ