Merge branch 'release-2.0.1'

stfc · Nov 13, 2016 · b423d48 · b423d48
2 parents c625bc0 + ba313e1
commit b423d48
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 20 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,11 @@
 Changelog
 
+========== Version 2.0.1 ==========
+
+Patches and Bug Fixes:
+- Remove servo block family
+- Remove unneeded tinker.h import
+- Change TinkerButtonBlock to be an AbstractTinkerReadDigitalBlock
 
 ========== Version 2.0.0 ==========
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>org.ardublock</groupId>
 	<artifactId>ardublock</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<name>ArduBlock</name>
 	<description>A Block Programming Language for Arduino</description>
 	<properties>

diff --git a/src/main/java/com/ardublock/translator/block/tinker/TinkerButtonBlock.java b/src/main/java/com/ardublock/translator/block/tinker/TinkerButtonBlock.java
@@ -7,26 +7,13 @@
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
-/*
 public class TinkerButtonBlock extends AbstractTinkerReadDigitalBlock
 {
 
 	public TinkerButtonBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
 	{
 		super(blockId, translator, codePrefix, codeSuffix, label);
 	}
-}
-
-*/
-
-public class TinkerButtonBlock extends TranslatorBlock
-{
-
-	public TinkerButtonBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
-	{
-		super(blockId, translator, codePrefix, codeSuffix, label);
-		translator.addHeaderFile("TinkerKit.h");
-	}
 
 	@Override
 	public String toCode() throws SocketNullException, SubroutineNotDeclaredException

diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties
@@ -437,7 +437,7 @@ ardublock.ui.create_refer=create reference
 ardublock.ui.website=Go to Web Site
 ardublock.ui.serialMonitor=Serial Monitor
 ardublock.ui.saveImage=Save as image...
-ardublock.ui.version=2.0.0
+ardublock.ui.version=2.0.1
 
 ardublock.error_msg.digital_var_slot=Digital variable slot must take a 'digital variable' name.\nHint: Look at the 'variable' socket on the highlighted block
 ardublock.error_msg.number_var_slot=Standard variable slot must take a standard 'numeric' variable name.\nHint: Look at the 'variable' socket on the highlighted block

diff --git a/src/main/resources/com/ardublock/block/ardublock.xml b/src/main/resources/com/ardublock/block/ardublock.xml
@@ -8846,11 +8846,6 @@
 			<FamilyMember>LCD_command_blinkOn</FamilyMember>
 			<FamilyMember>LCD_command_blinkOff</FamilyMember>
 		</BlockFamily>
-		<BlockFamily>
-			<FamilyMember>servo_default</FamilyMember>
-			<FamilyMember>servo_sg90</FamilyMember>
-			<FamilyMember>servo_mg996r</FamilyMember>
-		</BlockFamily>
 		<BlockFamily>
 			<FamilyMember>df_joystick_module_x</FamilyMember>
 			<FamilyMember>df_joystick_module_y</FamilyMember>