Upgraded to Arduino 1.5.x+ library specifications.

Author: peterpolidoro

.gitignore

@@ -1,28 +1,8 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
+.DS_Store
+/.idea
+/build
+/bin
+/lib
+/sftp-config.json
+.tags
+.tags_sorted_by_file

examples/AdvancedArrayTester/AdvancedArrayTester.ino

@@ -1,9 +1,9 @@
-#include "Arduino.h"
-#include "Streaming.h"
-#include "Array.h"
+#include <Arduino.h>
+#include <Streaming.h>
+#include <Array.h>
 
 
-const unsigned int BAUDRATE = 9600;
+const long BAUDRATE = 115200;
 const unsigned int MAX_SIZE = 10;
 
 Array<int, MAX_SIZE> array;

examples/ArrayTester/ArrayTester.ino

@@ -1,9 +1,9 @@
-#include "Arduino.h"
-#include "Streaming.h"
-#include "Array.h"
+#include <Arduino.h>
+#include <Streaming.h>
+#include <Array.h>
 
 
-const int BAUDRATE = 9600;
+const long BAUDRATE = 115200;
 
 const int ELEMENT_COUNT = 5;
 

examples/MultiArrayPrinter/Constants.cpp

@@ -3,7 +3,7 @@
 
 namespace constants
 {
-const unsigned int baudrate = 9600;
+const long baudrate = 115200;
 
 const int x_default[] = {10};
 const int y_default[] = {11,12};

examples/MultiArrayPrinter/Constants.h

@@ -12,7 +12,7 @@ enum {RESERVED_X_COUNT=3};
 enum {RESERVED_Y_COUNT=0};
 enum {RESERVED_Z_COUNT=1};
 
-extern const unsigned int baudrate;
+extern const long baudrate;
 
 extern const int x_default[X_SIZE];
 extern const int y_default[Y_SIZE];

examples/MultiArrayPrinter/MultiArrayPrinter.ino

@@ -1,6 +1,7 @@
-#include "Arduino.h"
-#include "Streaming.h"
-#include "Array.h"
+#include <Arduino.h>
+#include <Streaming.h>
+#include <Array.h>
+
 #include "Constants.h"
 #include "Device.h"
 

examples/MultiArrayPrinter/Server.h

@@ -7,9 +7,10 @@
 // ----------------------------------------------------------------------------
 #ifndef SERVER_H
 #define SERVER_H
-#include "Arduino.h"
-#include "Streaming.h"
-#include "Array.h"
+#include <Arduino.h>
+#include <Streaming.h>
+#include <Array.h>
+
 #include "Constants.h"
 
 

examples/MultiArrayPrinter/ServerDefinitions.h

@@ -8,6 +8,7 @@
 #ifndef SERVER_DEFINITIONS_H
 #define SERVER_DEFINITIONS_H
 
+
 template <typename T,
           unsigned int X_SIZE,
           unsigned int Y_SIZE,

examples/MultiArrayTester/Constants.cpp

@@ -3,7 +3,7 @@
 
 namespace constants
 {
-const unsigned int baudrate = 9600;
+const long baudrate = 115200;
 
 const int x_default[] = {1,2,3};
 const int y_default[] = {4,5,6,7};

examples/MultiArrayTester/Constants.h

@@ -8,7 +8,7 @@ enum {X_SIZE=3};
 enum {Y_SIZE=4};
 enum {Z_SIZE=5};
 
-extern const unsigned int baudrate;
+extern const long baudrate;
 
 extern const int x_default[X_SIZE];
 extern const int y_default[Y_SIZE];

examples/MultiArrayTester/MultiArray.h

@@ -7,11 +7,13 @@
 // ----------------------------------------------------------------------------
 #ifndef MULTI_ARRAY_H
 #define MULTI_ARRAY_H
-#include "Arduino.h"
-#include "Streaming.h"
-#include "Array.h"
+#include <Arduino.h>
+#include <Streaming.h>
+#include <Array.h>
+
 #include "Constants.h"
 
+
 class MultiArray
 {
 public:

examples/MultiArrayTester/MultiArrayTester.ino

@@ -1,6 +1,7 @@
-#include "Arduino.h"
-#include "Streaming.h"
-#include "Array.h"
+#include <Arduino.h>
+#include <Streaming.h>
+#include <Array.h>
+
 #include "Constants.h"
 #include "MultiArray.h"
 #include "TemplatedMultiArray.h"

examples/MultiArrayTester/TemplatedMultiArray.h

@@ -7,9 +7,9 @@
 // ----------------------------------------------------------------------------
 #ifndef TEMPLATED_MULTI_ARRAY_H
 #define TEMPLATED_MULTI_ARRAY_H
-#include "Arduino.h"
-#include "Streaming.h"
-#include "Array.h"
+#include <Arduino.h>
+#include <Streaming.h>
+#include <Array.h>
 
 
 template <typename T,

examples/MultiArrayTester/TemplatedMultiArrayDefinitions.h

@@ -8,6 +8,7 @@
 #ifndef TEMPLATED_MULTI_ARRAY_DEFINITIONS_H
 #define TEMPLATED_MULTI_ARRAY_DEFINITIONS_H
 
+
 template <typename T,
           unsigned int X_SIZE,
           unsigned int Y_SIZE,

library.properties

@@ -0,0 +1,9 @@
+name=Array
+version=1.0.0
+author=Peter Polidoro <polidorop@janelia.hhmi.org>
+maintainer=Peter Polidoro <polidorop@janelia.hhmi.org>
+sentence=An array container similar to the C++ std::array
+paragraph=Like this project? Please star it on GitHub!
+category=Data Storage
+url=https://github.com/janelia-arduino/Array.git
+architectures=*

Array.h renamed to src/Array.h

@@ -9,15 +9,12 @@
 #define ARRAY_H
 
 #ifdef ARDUINO
-    #if ARDUINO >= 100
-        #include <Arduino.h>
-    #else
-        #include <WProgram.h>
-    #endif
+#include <Arduino.h>
 #else
-    #include <cstddef>
+#include <cstddef>
 #endif
 
+
 template <typename T, size_t MAX_SIZE>
 class Array
 {
@@ -75,6 +72,6 @@ inline Print & operator <<(Print & stream, Array<T,MAX_SIZE> & array)
   return stream;
 }
 
-#include "ArrayDefinitions.h"
+#include "Array/ArrayDefinitions.h"
 
 #endif

Array.cpp renamed to src/Array/Array.cpp

@@ -5,6 +5,4 @@
 // Authors:
 // Peter Polidoro polidorop@janelia.hhmi.org
 // ----------------------------------------------------------------------------
-#include "Array.h"
-
-
+#include "../Array.h"

ArrayDefinitions.h renamed to src/Array/ArrayDefinitions.h

@@ -12,6 +12,7 @@
 #include <cstring>
 #endif
 
+
 template <typename T, size_t MAX_SIZE>
 Array<T, MAX_SIZE>::Array()
 {