Merge pull request #1 from letsgoING/master

README.md

@@ -1,6 +1,6 @@
 # ArduBlock 2 Source (for Arduino IDE 1.8+) #
 
-Source-Code for ArduBlock V2 for letsgoING Project.
+Source-Code for ArduBlock V2 tetrapix workshop, forked from the letsgoING Project.
 
 ## Setting up Eclipse ##
 1. Download the files
@@ -10,4 +10,4 @@ Source-Code for ArduBlock V2 for letsgoING Project.
 5. Test ArduBlock by running ArduBlock-Main as Java-Application (src/main/java/com/ardublock)
 
 For more information click here:
-http://blog.ardublock.com/2012/06/11/setup-ardublock-development-in-eclipse/
+http://blog.ardublock.com/2012/06/11/setup-ardublock-development-in-eclipse/

ardublock-master/ardublock-master/README.markdown

@@ -44,6 +44,7 @@ Authors
 ----
 * David Li taweili@gmail.com
 * HE Qichen heqichen@gmail.com
+* Bastian Brabec bastian@tetrapix.de (for the Tetrapix Fork)
 
 
 ToDo
@@ -55,6 +56,8 @@ License
 
 Copyright (C) 2011 David Li and He Qichen
 
+Copyright (C) 2019 Bastian Brabec
+
 This file is part of ArduBlock.
 
 ArduBlock is free software: you can redistribute it and/or modify
@@ -93,3 +96,13 @@ Source:		github.com/letsgoing
 - hack to remove \n at array declaration -> AutoFormat.java line 602-606
 - removed \n after function declaration  -> AutoFormat.java line 845
 - removed headerCommand for subroutines (now done in BlockFiles)-> Translator.java line 78-85
+
+
+Changes by Tetrapix
+=====================
+
+Contact: 	bastian@tetrapix.de
+Source:		github.com/tetrapix
+
+- added the blocks for the tetrapix Workshop
+- removed some other blocks

ardublock-master/ardublock-master/pom.xml

@@ -14,6 +14,43 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<build>
+		<pluginManagement>
+        <plugins>
+            <!--This plugin's configuration is used to store Eclipse m2e settings 
+                only. It has no influence on the Maven build itself. -->
+            <plugin>
+                <groupId>org.eclipse.m2e</groupId>
+                <artifactId>lifecycle-mapping</artifactId>
+                <version>1.0.0</version>
+                <configuration>
+                    <lifecycleMappingMetadata>
+                        <pluginExecutions>
+
+                            <pluginExecution>
+                                <pluginExecutionFilter>
+                                    <groupId>
+                                        org.apache.maven.plugins
+                                    </groupId>
+                                    <artifactId>
+                                        maven-install-plugin
+                                    </artifactId>
+                                    <versionRange>
+                                        [2.5,)
+                                    </versionRange>
+                                    <goals>
+                                        <goal>install-file</goal>
+                                    </goals>
+                                </pluginExecutionFilter>
+                                <action>
+                                    <ignore></ignore>
+                                </action>
+                            </pluginExecution>
+                        </pluginExecutions>
+                    </lifecycleMappingMetadata>
+                </configuration>
+            </plugin>
+        </plugins>
+    </pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

ardublock-master/ardublock-master/src/main/java/com/ardublock/translator/block/output/NeopixelColorBlock.java

@@ -15,24 +15,24 @@ public NeopixelColorBlock (Long blockId, Translator translator, String codePrefi
 	//@Override
 		public String toCode() throws SocketNullException, SubroutineNotDeclaredException
 		{
-			String Pin ;
+			//String Pin ;
 			String Pixel_Nb;
 			String Red;
 			String Blue;
 			String Green;
 			TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
-			Pin = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
-			translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
+			//Pin = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
+			//translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
 			Pixel_Nb = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
-			translatorBlock = this.getRequiredTranslatorBlockAtSocket(2);
+			translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
 			Red = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
-			translatorBlock = this.getRequiredTranslatorBlockAtSocket(3);
+			translatorBlock = this.getRequiredTranslatorBlockAtSocket(2);
 			Green = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
-			translatorBlock = this.getRequiredTranslatorBlockAtSocket(4);
+			translatorBlock = this.getRequiredTranslatorBlockAtSocket(3);
 			Blue = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
 
 
-			String ret = "strip_pin"+Pin+".setPixelColor("+Pixel_Nb+","+Red+" ,"+Green+" ,"+Blue+" );\n";
+			String ret = "strip.setPixelColor("+Pixel_Nb+","+Red+" ,"+Green+" ,"+Blue+" );\n strip.show();\n";
 
 			return codePrefix + ret + codeSuffix;
 

ardublock-master/ardublock-master/src/main/java/com/ardublock/translator/block/output/NeopixelInitBlock.java

@@ -15,23 +15,23 @@ public NeopixelInitBlock (Long blockId, Translator translator, String codePrefix
 	//@Override
 		public String toCode() throws SocketNullException, SubroutineNotDeclaredException
 		{
-			String Pin ;
+			//String Pin ;
 			String NbLed;
-			String NEO_KHZ;
-			String NEO_MODE;
+			//String NEO_KHZ;
+			//String NEO_MODE;
 			TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
-			Pin = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
-			translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
+			//Pin = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
+			//translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
 			NbLed = translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
-			translatorBlock = this.getRequiredTranslatorBlockAtSocket(2);
-			NEO_KHZ = translatorBlock.toCode().replaceAll("\"", "");
-			translatorBlock = this.getRequiredTranslatorBlockAtSocket(3);
-			NEO_MODE = translatorBlock.toCode().replaceAll("\"", "");
+			//translatorBlock = this.getRequiredTranslatorBlockAtSocket(2);
+			//NEO_KHZ = translatorBlock.toCode().replaceAll("\"", "");
+			//translatorBlock = this.getRequiredTranslatorBlockAtSocket(3);
+			//NEO_MODE = translatorBlock.toCode().replaceAll("\"", "");
 
 			translator.addHeaderFile("Adafruit_NeoPixel.h");
-			translator.addDefinitionCommand("Adafruit_NeoPixel strip_pin"+Pin+" = Adafruit_NeoPixel("+NbLed+","+ Pin +", " +NEO_MODE+ " + "+NEO_KHZ +");");
-			translator.addSetupCommand("strip_pin"+Pin+".begin();\n" +
-			"strip_pin"+Pin+".show();");
+			translator.addDefinitionCommand("Adafruit_NeoPixel strip= Adafruit_NeoPixel("+NbLed+", 0, NEO_RGB + NEO_KHZ800);");//,"+ Pin +", " +NEO_MODE+ " + "+NEO_KHZ +");");
+			translator.addSetupCommand("strip.begin();\n" +
+			"strip.show();");
 
 
 			return "" ;	

ardublock-master/ardublock-master/src/main/resources/com/ardublock/block/ardublock.xml

@@ -511,22 +511,22 @@
 				<text>neopixel_init</text>
 			</description>
 			<BlockConnectors>
-				<BlockConnector connector-type="number"
+				<!--<BlockConnector connector-type="number"
 					connector-kind="socket" label="bc.pin_number">
 					<DefaultArg genus-name="number" label="2" />
-				</BlockConnector>
+				</BlockConnector>-->
 				<BlockConnector connector-type="number"
 					connector-kind="socket" label="bc.Nb_of_Led">
 					<DefaultArg genus-name="number" label="1" />
 				</BlockConnector>
-				<BlockConnector connector-type="string"
+				<!--<BlockConnector connector-type="string"
 					connector-kind="socket" label="bc.schnittstelle">
 					<DefaultArg genus-name="string" label="NEO_KHZ800" />
 				</BlockConnector>
 				<BlockConnector connector-type="string"
 					connector-kind="socket" label="bc.farbfolge">
 					<DefaultArg genus-name="string" label="NEO_RGB" />
-				</BlockConnector>
+				</BlockConnector>-->
 			</BlockConnectors>
 			<Images>
 				<Image>
@@ -539,25 +539,25 @@
 				<text>neopixel_pixel_colorRGB</text>
 			</description>
 			<BlockConnectors>
-				<BlockConnector connector-type="number"
+				<!--<BlockConnector connector-type="number"
 					connector-kind="socket" label="bc.pin_number">
 					<DefaultArg genus-name="number" label="2" />
-				</BlockConnector>
+				</BlockConnector>-->
 				<BlockConnector connector-type="number"
 					connector-kind="socket" label="bc.Pixel_Nb">
 					<DefaultArg genus-name="number" label="0" />
 				</BlockConnector>
 				<BlockConnector connector-type="number"
 					connector-kind="socket" label="bc.red">
-					<DefaultArg genus-name="number" label="100" />
+					<DefaultArg genus-name="number" label="255" />
 				</BlockConnector>
 				<BlockConnector connector-type="number"
 					connector-kind="socket" label="bc.green">
-					<DefaultArg genus-name="number" label="100" />
+					<DefaultArg genus-name="number" label="255" />
 				</BlockConnector>
 				<BlockConnector connector-type="number"
 					connector-kind="socket" label="bc.blue">
-					<DefaultArg genus-name="number" label="100" />
+					<DefaultArg genus-name="number" label="255" />
 				</BlockConnector>
 			</BlockConnectors>
 			<Images>
@@ -2442,9 +2442,24 @@
 			<FamilyMember>LGI_Qtouch_Button3_getRaw</FamilyMember>			
 		</BlockFamily>
 	</BlockFamilies>
-
-	<BlockDrawerSets>
+		<BlockDrawerSets>	
 		<BlockDrawerSet name="factory" type="stack" location="southwest" window-per-drawer="no" drawer-draggable="no">
+			<BlockDrawer button-color="74 108 212" name="bd.tetrapix" type="default">
+				<BlockGenusMember>neopixel_init</BlockGenusMember>
+				<BlockGenusMember>neopixel_pixel_color</BlockGenusMember>
+				<!-- <BlockGenusMember>neopixel_brightness</BlockGenusMember>
+				<BlockGenusMember>neopixel_show</BlockGenusMember>	-->
+				<BlockGenusMember>repeat_times</BlockGenusMember>
+				<BlockGenusMember>repeat_control</BlockGenusMember>
+				<BlockGenusMember>delay</BlockGenusMember>
+
+			</BlockDrawer>
+			<BlockDrawer button-color="74 108 212" name="bd.tetrapix" type="custom">
+				<BlockGenusMember>if</BlockGenusMember>
+				<BlockGenusMember>ifelse</BlockGenusMember>
+				<BlockGenusMember>while</BlockGenusMember>
+
+			</BlockDrawer>
 			<BlockDrawer button-color="255 215 0" name="bd.control" type="default"> 
 				<!-- <BlockGenusMember>program</BlockGenusMember> -->
 				<BlockGenusMember>loop</BlockGenusMember>
@@ -2489,7 +2504,6 @@
 
 				<BlockGenusMember>interrupt</BlockGenusMember>
 			</BlockDrawer>
-
 			<BlockDrawer button-color="74 108 212" name="bd.output"	type="default">
 				<BlockGenusMember>pin-write-digital</BlockGenusMember>
 				<BlockGenusMember>pin-write-analog</BlockGenusMember>
@@ -2793,4 +2807,4 @@
 		<ClosedTrashImage>com/ardublock/block/trash.png</ClosedTrashImage>
 	</TrashCan>
 
-</BlockLangDef>
+</BlockLangDef>

ardublock-master/ardublock-master/src/main/resources/com/ardublock/block/ardublock_de.properties

@@ -114,6 +114,10 @@ bc.pwm_pin_number=~Pin
 bc.value=Wert
 bc.variable=Variable
 
+#TETRAPIX
+#****************************
+bd.tetrapix=Tetrapix
+
 #CONTROL
 #****************************
 bd.control=Steuerung

ardublock-master/ardublock-master/src/main/resources/com/ardublock/block/ardublock_en.properties

@@ -84,6 +84,10 @@ bc.pwm_pin_number=~pin#
 bc.value=value
 bc.variable=variable
 
+#TETRAPIX
+#****************************
+bd.tetrapix=Tetrapix
+
 #CONTROL
 #****************************
 bd.control=Control

openblocks-master/openblocks-master/bin/.gitignore

@@ -0,0 +1,9 @@
+build/
+target/
+.DS_Store
+.classpath
+.idea
+.project
+.settings
+openblocks.iml
+

openblocks-master/openblocks-master/bin/LICENSE.MIT

@@ -0,0 +1,26 @@
+MIT LICENSE
+
+Copyright (c)  2009
+
+MIT Scheller Teacher Education Program
+
+Eric Klopfer, Daniel Wendel, Ricarose Roque, Corey McCaffrey, Lunduo Ye, Aidan Ho, Brett Warne, Xudan 
+Liu, Hout Nga
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.