Merge branch 'release-1.0.0'

gregcorbett · Mar 5, 2016 · a6729c0 · a6729c0
2 parents b758410 + 6a03f09
commit a6729c0
Show file tree

Hide file tree

Showing 10 changed files with 363 additions and 889 deletions.
diff --git a/README.markdown b/README.markdown
@@ -1,21 +1,34 @@
-ArduBlock
-======
+#ArduBlock
+
 
 ArduBlock is a Block Programming Language for Arduino. The language and functions model closely to [Arduino Language Reference](http://arduino.cc/en/Reference/HomePage)
 
-Installation
-----
+##Users
+Ardublock is a free graphical programming environment to make programming physical computing with Arduino as easy as drag and drop. It is based on the popular ‘scratch’ programming language, which many will already be familiar with.  Ardublock generates code in C, a text based language used by the Arduino IDE, which can then be studied and modified if desired. Ardublock is an extension to the Arduino IDE so that will need to be downloaded as well (found here https://www.arduino.cc/en/Main/Software).  Code written in the Arduino IDE has the file extension .abp.
+
+####Getting Started with ArduBlock
+1. Install the Arduino IDE, from https://www.arduino.cc/en/Main/Software
+2. Download ardublock-all.jar from https://github.com/gregcorbett/ardublock/releases/latest
+3. Copy ardublock-all.jar to C:/Users/<username>/Arduino/tools/ArduBlockTool/tool/ardublock-all.jar under
+    * Be careful, the name of folder “ArduBlockTool” under tools folder is case sensitive. 
+    * In Mac, /Users/<username>/Documents/Arduino/tools/ArduBlockTool/tool/ardublock-all.jar
+    * In Linux, /home/<username>/sketchbook/tools/ArduBlockTool/tool/ardublock-all.jar
+4. Start the Arduino IDE and find ArduBlock under the Tool menu
+
+##Developers
+If you wish to develop ardublock, follow the instructions below. A prerequsite is openblocks, which can be found here https://github.com/gregcorbett/openblocks/archive/v1.0.zip
+###Installation
+
 The project is managed by Maven. After checking out the source for the first time, one should run the following to install Arduino's pde.jar into the local repository. 
 
 	$ mvn validate
 
-Usage
-----
+###Usage
 
 	$ mvn exec:java -Dexec.mainClass="com.ardublock.Main"
 
-Development
-----
+###Development
+
 Change the /src/main/resources/com/ardublock/block/ardublock_def.xml to add new blocks to ArduBlock
 
 	$ mvn clean package
@@ -24,27 +37,24 @@ Change the /src/main/resources/com/ardublock/block/ardublock_def.xml to add new
 
 The Visual Block environment should show up. Happy Hacking! ;) 
 
-Deploy
-----
+###Deploy
+
 Edit code of ardublock
 
 	$ mvn clean package
 
 copy the target/ardublock-all.jar to Arduino\tools\ArduBlockTool\tool
 
-Authors
-----
-* David Li [email protected]
-* HE Qichen [email protected]
+##Authors
 
+The original code (https://github.com/taweili/ardublock) was developed at MIT and the authors can be contacted below.
 
-ToDo
-----
-* Integrate the [scripting engine](http://java.sun.com/developer/technicalArticles/J2SE/Desktop/scripting/) into the language blocks for code generation
+* David Li [email protected]
+* HE Qichen [email protected]
 
-License
-----
+The author/maintainer of this branch can be contacted at [email protected].
 
+##License
 Copyright (C) 2011 David Li and He Qichen
 
 This file is part of ArduBlock.
@@ -60,4 +70,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with ArduBlock.  If not, see <http://www.gnu.org/licenses/>.
+along with ArduBlock.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/com/ardublock/translator/block/tinker/AbstractTinkerReadAnalogBlock.java b/src/main/java/com/ardublock/translator/block/tinker/AbstractTinkerReadAnalogBlock.java
@@ -13,7 +13,7 @@ public abstract class AbstractTinkerReadAnalogBlock extends TranslatorBlock
 	AbstractTinkerReadAnalogBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
 	{
 		super(blockId, translator, codePrefix, codeSuffix, label);
-		translator.addHeaderFile("TinkerKit.h");
+		//translator.addHeaderFile("TinkerKit.h");
 	}
 
 	@Override

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

diff --git a/src/main/java/com/ardublock/translator/block/tinker/AbstractTinkerWriteAnalogBlock.java b/src/main/java/com/ardublock/translator/block/tinker/AbstractTinkerWriteAnalogBlock.java
@@ -11,7 +11,7 @@ public abstract class AbstractTinkerWriteAnalogBlock extends TranslatorBlock
 	AbstractTinkerWriteAnalogBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
 	{
 		super(blockId, translator, codePrefix, codeSuffix, label);
-		translator.addHeaderFile("TinkerKit.h");
+		//translator.addHeaderFile("TinkerKit.h");
 	}
 
 	@Override

diff --git a/src/main/java/com/ardublock/translator/block/tinker/AbstractTinkerWriteDigitalBlock.java b/src/main/java/com/ardublock/translator/block/tinker/AbstractTinkerWriteDigitalBlock.java
@@ -13,7 +13,7 @@ public abstract class AbstractTinkerWriteDigitalBlock extends TranslatorBlock
 	AbstractTinkerWriteDigitalBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
 	{
 		super(blockId, translator, codePrefix, codeSuffix, label);
-		translator.addHeaderFile("TinkerKit.h");
+		//translator.addHeaderFile("TinkerKit.h");
 	}
 
 	@Override

diff --git a/src/main/java/com/ardublock/translator/block/tinker/TinkerInputPortBlock.java b/src/main/java/com/ardublock/translator/block/tinker/TinkerInputPortBlock.java
@@ -10,7 +10,7 @@ public class TinkerInputPortBlock extends TranslatorBlock
 	public TinkerInputPortBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
 	{
 		super(blockId, translator, codePrefix, codeSuffix, label);
-		translator.addHeaderFile("TinkerKit.h");
+		//translator.addHeaderFile("TinkerKit.h");
 	}
 
 	@Override

diff --git a/src/main/java/com/ardublock/translator/block/tinker/TinkerOutputPortBlock.java b/src/main/java/com/ardublock/translator/block/tinker/TinkerOutputPortBlock.java
@@ -9,7 +9,7 @@ public class TinkerOutputPortBlock extends TranslatorBlock
 
 	public TinkerOutputPortBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label) {
 		super(blockId, translator, codePrefix, codeSuffix, label);
-		translator.addHeaderFile("TinkerKit.h");
+		// translator.addHeaderFile("TinkerKit.h");
 		//translator.addSetupCommand("pinMode( " + label + ", OUTPUT);");
 	}
 

diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -160,7 +160,7 @@ public void actionPerformed(ActionEvent e) {
 			    URL url;
 			    if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
 			        try {
-						url = new URL("http://ardublock.com");
+						url = new URL("https://github.com/gregcorbett/ardublock");
 			            desktop.browse(url.toURI());
 			        } catch (Exception e1) {
 			            e1.printStackTrace();

diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties
@@ -26,7 +26,7 @@ bc.watchdog_enable=enable
 bc.eeprom_address=address
 bc.eeprom_data=data
 bc.ln=new line
-bc.message=message2
+bc.message=message
 bc.print=print
 bc.line_number=line#
 bc.character_number=char#
@@ -119,7 +119,7 @@ bc.scoop_event_flag=Event
 bd.control=Control
 bd.scoop=SCoop (Multitask)
 bd.dfrobot=DFRobot
-bd.number=Variables/Constants
+bd.number=Numbers/Constants
 bd.operators=Math Operators
 bd.pins=Pins
 bd.seeedstudio=Seeed Studio Grove
@@ -131,7 +131,7 @@ bd.storage=Storage
 bd.linksprite_LinkerKit=Linker Kit
 
 bd.tinkerkit=TinkerKit
-bd.utilities=Generic Hardware
+bd.utilities=Utilities
 # BlockGenus initlabel
 bg.df_lcd_keypad=DFRobot LCD Keypad
 bg.Tinker_Accmeter=Accelerometer
@@ -176,8 +176,8 @@ bg.scoop_event_falling=Event: FALLING
 bg.scoop_event_rising=Event: RISING
 bg.scoop_event_change=Event: CHANGE
 
-bg.delay=delay MILLIS
-bg.delay_microseconds=delay MICROS
+bg.delay=delay
+bg.delay_microseconds=delay
 
 bg.df_360_degree_rotation_motor=360 degree rotation motor
 bg.df_adjustable_infrared_sensor_switch=Adjustable Infrared Sensor Switch
@@ -336,8 +336,8 @@ bg.not_equal_digital=!=
 bg.repeat=repeat and count
 bg.glue_msg=glue message
 bg.servo=Servo
-bg.servo_prefix=Servo: 
-bg.servo_default=Default
+bg.servo_prefix=Servo
+bg.servo_default=
 bg.servo_sg90=SG90
 bg.servo_mg996r=MG996R
 bg.setter_variable_digital=set digital variable
@@ -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=21040826 (beta)
+ardublock.ui.version=1.0.0
 
 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 'Integer' variable name.\nHint: Look at the 'variable' socket on the highlighted block