Skip to content

Commit

Permalink
Merge branch 'ide-1.5.x' of github.com:arduino/Arduino into ide-1.5.x…
Browse files Browse the repository at this point in the history
…-java7
  • Loading branch information
cmaglie committed Jan 20, 2015
2 parents 529e2ed + 136c04a commit 4e66cd2
Show file tree
Hide file tree
Showing 23 changed files with 454 additions and 1 deletion.
2 changes: 2 additions & 0 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,8 @@
<param name="dest_folder" value="${staging_folder}" />
</antcall>
<copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
<copy file="windows/msvcp100.dll" todir="windows/work" />
<copy file="windows/msvcr100.dll" todir="windows/work" />

<!-- Copy bossac.exe tool -->
<copy todir="windows/work/hardware/tools">
Expand Down
3 changes: 2 additions & 1 deletion build/shared/revisions.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

ARDUINO 1.6.0 - 2015.01.19
ARDUINO 1.6.0rc2 - 2015.01.20

[ide]
* Reenabled speed of 38400 on serial monitor
* Improved Find/Replace dialog layout (Eberhard Fahle)
* Fixed missing .dll error on some Windows box

[core]
* Arduino "boolean" type is now mapped to "bool" instead of "uint8_t" (Christopher Andrews)
Expand Down
Binary file added build/windows/msvcp100.dll
Binary file not shown.
Binary file added build/windows/msvcr100.dll
Binary file not shown.
24 changes: 24 additions & 0 deletions libraries/Audio/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Audio Library for Arduino =

The Audio library enables an Arduino Due board to play back .wav files from a storage device like an SD card.

For more information about this library please visit us at
http://arduino.cc/en/Reference/Audio

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Bridge/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Bridge Library for Arduino =

The Bridge library simplifies communication between the ATmega32U4 and the AR9331.

For more information about this library please visit us at
http://arduino.cc/en/Reference/YunBridgeLibrary

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Esplora/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Esplora Library for Arduino =

The library offers easy access to the data from the onboard Esplora's sensors, and provides the ability to change the state of the outputs.

For more information about this library please visit us at
http://arduino.cc/en/Reference/EsploraLibrary

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Ethernet/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Ethernet Library for Arduino =

With the Arduino Ethernet Shield, this library allows an Arduino board to connect to the internet.

For more information about this library please visit us at
http://arduino.cc/en/Reference/Ethernet

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Firmata/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Firmata Library for Arduino =

The Firmata library implements the Firmata protocol for communicating with software on the host computer. This allows you to write custom firmware without having to create your own protocol and objects for the programming environment that you are using.

For more information about this library please visit us at
http://arduino.cc/en/Reference/Firmata

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/GSM/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= GSM Library for Arduino =

With the Arduino GSM Shield, this library enables an Arduino board to do most of the operations you can do with a GSM phone: place and receive voice calls, send and receive SMS, and connect to the internet over a GPRS network.

For more information about this library please visit us at
http://arduino.cc/en/Reference/GSM

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/LiquidCrystal/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Liquid Crystal Library for Arduino =

This library allows an Arduino board to control LiquidCrystal displays (LCDs) based on the Hitachi HD44780 (or a compatible) chipset, which is found on most text-based LCDs.

For more information about this library please visit us at
http://arduino.cc/en/Reference/LiquidCrystal

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/RobotIRremote/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Robot IR Remote Library for Arduino =

The Robot has a number of built in sensors and actuators. The library is designed to easily access the robot's functionality.

For more information about this library please visit us at
http://arduino.cc/en/Reference/RobotLibrary

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Robot_Control/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Robot Control Library for Arduino =

The Robot has a number of built in sensors and actuators. The library is designed to easily access the robot's functionality.

For more information about this library please visit us at
http://arduino.cc/en/Reference/RobotLibrary

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Robot_Motor/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Robot Motor Library for Arduino =

The Robot has a number of built in sensors and actuators. The library is designed to easily access the robot's functionality.

For more information about this library please visit us at
http://arduino.cc/en/Reference/RobotLibrary

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/SD/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= SD Library for Arduino =

The SD library allows for reading from and writing to SD cards.

For more information about this library please visit us at
http://arduino.cc/en/Reference/SD

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Scheduler/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Scheduler Library for Arduino =

The Scheduler library enables the Arduino Due to run multiple functions at the same time. This allows tasks to happen without interrupting each other.

For more information about this library please visit us at
http://arduino.cc/en/Reference/Scheduler

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Servo/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Servo Library for Arduino =

This library allows an Arduino board to control RC (hobby) servo motors.

For more information about this library please visit us at
http://arduino.cc/en/Reference/Servo

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21 changes: 21 additions & 0 deletions libraries/SpacebrewYun/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
= Spacebrew Library for Arduino =

This library allows an Arduino Yun to connect to the Spacebrew service.

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24 changes: 24 additions & 0 deletions libraries/Stepper/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
= Stepper Library for Arduino =

This library allows you to control unipolar or bipolar stepper motors. To use it you will need a stepper motor, and the appropriate hardware to control it.

For more information about this library please visit us at
http://arduino.cc/en/Reference/Stepper

== License ==

Copyright (c) Arduino LLC. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Loading

0 comments on commit 4e66cd2

Please sign in to comment.