Merge branch 'master' of https://github.com/sparkfun/Arduino_Apollo3

Author: oclyke

cores/arduino/ard_sup/Arduino.h

@@ -94,6 +94,7 @@ enum BitOrder
 #include "ap3_debugging.h"
 #include "ap3_uart.h"
 #include "ap3_analog.h"
+#include "WMath.h"
 
 #include "variant.h"
 

cores/arduino/ard_sup/ard_supers/WMath.cpp

@@ -0,0 +1,68 @@
+/*
+  Copyright (c) 2014 Arduino.  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
+*/
+
+extern "C" {
+  #include "stdlib.h"
+  #include "stdint.h"
+}
+#include "WMath.h"
+
+extern void randomSeed( uint32_t dwSeed )
+{
+  if ( dwSeed != 0 )
+  {
+    srand( dwSeed ) ;
+  }
+}
+
+extern long random( long howbig )
+{
+  if ( howbig == 0 )
+  {
+    return 0 ;
+  }
+
+  return rand() % howbig;
+}
+
+extern long random( long howsmall, long howbig )
+{
+  if (howsmall >= howbig)
+  {
+    return howsmall;
+  }
+
+  long diff = howbig - howsmall;
+
+  return random(diff) + howsmall;
+}
+
+extern long map(long x, long in_min, long in_max, long out_min, long out_max)
+{
+  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
+
+extern uint16_t makeWord( uint16_t w )
+{
+  return w ;
+}
+
+extern uint16_t makeWord( uint8_t h, uint8_t l )
+{
+  return (h << 8) | l ;
+}

cores/arduino/ard_sup/ard_supers/WMath.h

@@ -0,0 +1,33 @@
+/*
+  Copyright (c) 2014 Arduino.  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
+*/
+
+#ifndef _WIRING_MATH_
+#define _WIRING_MATH_
+
+extern long random( long ) ;
+extern long random( long, long ) ;
+extern void randomSeed( uint32_t dwSeed ) ;
+extern long map( long, long, long, long, long ) ;
+
+extern uint16_t makeWord( uint16_t w ) ;
+extern uint16_t makeWord( uint8_t h, uint8_t l ) ;
+
+#define word(...) makeWord(__VA_ARGS__)
+
+
+#endif /* _WIRING_MATH_ */

variants/SparkFun_Artemis/config/variant.cpp

@@ -22,7 +22,7 @@ SOFTWARE.
 
 #include "variant.h"
 
-// This is the actual pinmap. 
+// This is the actual pinmap.
 // For a variant pin X the corresponding Apollo3 pad Y is stored in ap3_variant_pinmap[X]
 // X [0, (AP3_VARIANT_NUM_PINS - 1)]
 // Y [0, 49]
@@ -86,12 +86,9 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
 
 // Uart Definitions
 //Serial(instance, RX, TX)
-//
-// Commented out because we don't know which pins should be used on the Artemis module
-//
-// Uart Serial(0, 23, 22); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 23 and TX on pin 24 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
-// Uart Serial1(1, 0, 1);  // Declares a Uart object called Serial1 using instance 1 of Apollo3 UART peripherals with RX on pin 0 and TX on pin 1 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
-
+//We default Serial to 22/23 but can be moved to any TX0/RX0 pin
+Uart Serial(0, 23, 22); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 23 and TX on pin 24 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
+                        // Uart Serial1(1, 0, 1);  // Declares a Uart object called Serial1 using instance 1 of Apollo3 UART peripherals with RX on pin 0 and TX on pin 1 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
 
 // Pin aliasing using the const uint8_t approach
 //
@@ -102,7 +99,6 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
 // const uint8_t A4 = 20;
 // const uint8_t A5 = 21;
 
-
 // Indirect pinmap example
 //
 // const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {

variants/SparkFun_Artemis/config/variant.h

@@ -32,22 +32,21 @@ explained so that this file can serve as a starting point for creating new varia
 
 */
 
-
 #ifndef _AP3_VARIANT_H_
 #define _AP3_VARIANT_H_
 
 #include "Arduino.h"
 
-// In the Apollo3 Arduino core *pins* refer to the connections that can be accessed 
+// In the Apollo3 Arduino core *pins* refer to the connections that can be accessed
 // via Arduino code. This may be, for example, an exposed connection that the user could
-// utilize directly or it may be a connection to an onboard sensor. 
-// 
+// utilize directly or it may be a connection to an onboard sensor.
+//
 // *pads* on the other hand refer directly to the pad numbers of the Apollo3 microcontroller
 //
 // When developing a variant you might connect *pin* x of your board to *pad* y on the
 // Apollo3. When a user asks to write to *pin* x the core will use a map to determine which
-// *pad* to control. 
-// 
+// *pad* to control.
+//
 // AP3_VARIANT_NUM_PINS determines the size of this map and its value must be N+1 where N
 // is the largest _pin_id_ of your variant. Let's try an example:
 //
@@ -67,25 +66,25 @@ extern const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS];
 
 // Uart declarations
 // - "HardwareSerial" is the class that is built into Arduino to allow "Serial.print()"
-// and related functions to work. 
+// and related functions to work.
 // - The "Uart" class inherits from HardwareSerial and contains Apollo3-specific code
 // - Declaring your Uart objects here makes them available in any Arduino code and you
 // can give them extra descriptive names
-// - The maximum number of Uarts is 2 (instances 0 and 1) 
+// - The maximum number of Uarts is 2 (instances 0 and 1)
 //
 // In this case the declarations are commented out because we don't know which pins of
 // the Artemis module you would like to use
 class Uart; // Forward declaration of Uart class
-// extern Uart Serial;
+extern Uart Serial;
 // extern Uart Serial1;
 
 // A note about IOMaster peripherals:
 // - IOMaster peripherals are used to provide either SPI or I2C communications. The pads
 // of the Apollo3 that a given IOMaster [0,5] use are not configurable
 
 // Wire defines
-// - Wire is the I2C class for Arduino. 
-// - Wire is handled differently than HardwareSerial/Uart because Wire is a library that 
+// - Wire is the I2C class for Arduino.
+// - Wire is handled differently than HardwareSerial/Uart because Wire is a library that
 // you have to include manually (saves space if you won't be using I2C)
 // - In this case we rely on communication between the variant.h file and the Wire library
 // through the use of #define statements
@@ -107,7 +106,7 @@ class Uart; // Forward declaration of Uart class
 #define AP3_Wire5_IOM 5 // Secify that Wire5 uses IOMaster instance 5
 // This is also a convenient location to provide some aliased names for certain Wire objects
 // For example: (examples commented out because they aren't real)
-// 
+//
 // #define WireQwiic Wire  // Giving Wire an alias of "WireQwiic" to indicat that it is the I2C controller for the Qwiic bus
 // #define WireAccel Wire1 // Useful if the variant has an onboard accelerometer connected to the Wire1 bus
 
@@ -121,19 +120,18 @@ class Uart; // Forward declaration of Uart class
 // you need to specify two settings:
 // - - AP3_SPI_IOM - which IOMaster peripher the SPI object will use
 // - - AP3_SPI_DUP - which duplex mode the SPI object will use (full duplex is the most common, ap3_spi_tx_only and ap3_spi_rx_only are the other options )
-#define AP3_SPI_IOM     0
-#define AP3_SPI_DUP     ap3_spi_full_duplex 
-#define AP3_SPI1_IOM    1
-#define AP3_SPI1_DUP    ap3_spi_full_duplex
-#define AP3_SPI2_IOM    2
-#define AP3_SPI2_DUP    ap3_spi_full_duplex
-#define AP3_SPI3_IOM    3
-#define AP3_SPI3_DUP    ap3_spi_full_duplex
-#define AP3_SPI4_IOM    4
-#define AP3_SPI4_DUP    ap3_spi_full_duplex
-#define AP3_SPI5_IOM    5
-#define AP3_SPI5_DUP    ap3_spi_full_duplex
-
+#define AP3_SPI_IOM 0
+#define AP3_SPI_DUP ap3_spi_full_duplex
+#define AP3_SPI1_IOM 1
+#define AP3_SPI1_DUP ap3_spi_full_duplex
+#define AP3_SPI2_IOM 2
+#define AP3_SPI2_DUP ap3_spi_full_duplex
+#define AP3_SPI3_IOM 3
+#define AP3_SPI3_DUP ap3_spi_full_duplex
+#define AP3_SPI4_IOM 4
+#define AP3_SPI4_DUP ap3_spi_full_duplex
+#define AP3_SPI5_IOM 5
+#define AP3_SPI5_DUP ap3_spi_full_duplex
 
 // Additional Pin Aliasing
 // - It is required that every pin is accessible by a number between 0 and (AP3_VARIANT_NUM_PINS - 1)