Merge branch 'master' into core-ble

Author: oclyke

boards.txt

@@ -64,45 +64,45 @@ artemis.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scri
 
 ###############################################################
 
-amap3blackboard.name=SparkFun BlackBoard Artemis
-amap3blackboard.build.variant=SparkFun_BlackBoard_Artemis
-amap3blackboard.build.board=AM_AP3_SFE_BB_ARTEMIS
-amap3blackboard.upload.maximum_size=960000
-amap3blackboard.upload.sbl_baud=115200
-amap3blackboard.build.arch=APOLLO3
-amap3blackboard.build.mcu=cortex-m4
-amap3blackboard.build.f_cpu=48000000L
-amap3blackboard.build.core=arduino
-amap3blackboard.build.includes=-I{build.variant.path}/config
-amap3blackboard.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
-amap3blackboard.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
-amap3blackboard.build.preferred_export_format=axf
-amap3blackboard.build.defs=
-amap3blackboard.build.libs=
-amap3blackboard.menu.svl_baud.921600=921600
-amap3blackboard.menu.svl_baud.460800=460800
-amap3blackboard.menu.svl_baud.230400=230400
-amap3blackboard.menu.svl_baud.115200=115200
-amap3blackboard.menu.svl_baud.57600=57600
-amap3blackboard.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
-amap3blackboard.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
-
-amap3blackboard.menu.svl_baud.57600.upload.svl_baud=57600
-amap3blackboard.menu.svl_baud.115200.upload.svl_baud=115200
-amap3blackboard.menu.svl_baud.230400.upload.svl_baud=230400
-amap3blackboard.menu.svl_baud.460800.upload.svl_baud=460800
-amap3blackboard.menu.svl_baud.921600.upload.svl_baud=921600
-
-amap3blackboard.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
-amap3blackboard.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
-
-amap3blackboard.menu.loader.sparkfun_svl.upload.tool=artemis_svl
-amap3blackboard.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
+amap3redboard.name=SparkFun RedBoard Artemis
+amap3redboard.build.variant=SparkFun_RedBoard_Artemis
+amap3redboard.build.board=AM_AP3_SFE_BB_ARTEMIS
+amap3redboard.upload.maximum_size=960000
+amap3redboard.upload.sbl_baud=115200
+amap3redboard.build.arch=APOLLO3
+amap3redboard.build.mcu=cortex-m4
+amap3redboard.build.f_cpu=48000000L
+amap3redboard.build.core=arduino
+amap3redboard.build.includes=-I{build.variant.path}/config
+amap3redboard.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+amap3redboard.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
+amap3redboard.build.preferred_export_format=axf
+amap3redboard.build.defs=
+amap3redboard.build.libs=
+amap3redboard.menu.svl_baud.921600=921600
+amap3redboard.menu.svl_baud.460800=460800
+amap3redboard.menu.svl_baud.230400=230400
+amap3redboard.menu.svl_baud.115200=115200
+amap3redboard.menu.svl_baud.57600=57600
+amap3redboard.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
+amap3redboard.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
+
+amap3redboard.menu.svl_baud.57600.upload.svl_baud=57600
+amap3redboard.menu.svl_baud.115200.upload.svl_baud=115200
+amap3redboard.menu.svl_baud.230400.upload.svl_baud=230400
+amap3redboard.menu.svl_baud.460800.upload.svl_baud=460800
+amap3redboard.menu.svl_baud.921600.upload.svl_baud=921600
+
+amap3redboard.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
+amap3redboard.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
+
+amap3redboard.menu.loader.sparkfun_svl.upload.tool=artemis_svl
+amap3redboard.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
 
 ###############################################################
 
-amap3nano.name=SparkFun BlackBoard Artemis Nano
-amap3nano.build.variant=SparkFun_BlackBoard_Artemis_Nano
+amap3nano.name=SparkFun RedBoard Artemis Nano
+amap3nano.build.variant=SparkFun_RedBoard_Artemis_Nano
 amap3nano.build.board=AM_AP3_SFE_BB_ARTEMIS_NANO
 amap3nano.upload.maximum_size=960000
 amap3nano.upload.sbl_baud=115200
@@ -138,8 +138,8 @@ amap3nano.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_sc
 
 ###############################################################
 
-amap3atp.name=SparkFun BlackBoard Artemis ATP
-amap3atp.build.variant=SparkFun_BlackBoard_Artemis_ATP
+amap3atp.name=SparkFun RedBoard Artemis ATP
+amap3atp.build.variant=SparkFun_RedBoard_Artemis_ATP
 amap3atp.build.board=AM_AP3_SFE_BB_ARTEMIS_ATP
 amap3atp.upload.maximum_size=960000
 amap3atp.upload.sbl_baud=115200
@@ -175,6 +175,43 @@ amap3atp.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scr
 
 ###############################################################
 
+amap3thing.name=SparkFun Artemis Thing Plus
+amap3thing.build.variant=SparkFun_Artemis_Thing_Plus
+amap3thing.build.board=AM_AP3_SFE_THING_PLUS
+amap3thing.upload.maximum_size=960000
+amap3thing.upload.sbl_baud=115200
+amap3thing.build.arch=APOLLO3
+amap3thing.build.mcu=cortex-m4
+amap3thing.build.f_cpu=48000000L
+amap3thing.build.core=arduino
+amap3thing.build.includes=-I{build.variant.path}/config
+amap3thing.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+amap3thing.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3
+amap3thing.build.preferred_export_format=axf
+amap3thing.build.defs=
+amap3thing.build.libs=
+amap3thing.menu.svl_baud.921600=921600
+amap3thing.menu.svl_baud.460800=460800
+amap3thing.menu.svl_baud.230400=230400
+amap3thing.menu.svl_baud.115200=115200
+amap3thing.menu.svl_baud.57600=57600
+amap3thing.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
+amap3thing.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
+
+amap3thing.menu.svl_baud.57600.upload.svl_baud=57600
+amap3thing.menu.svl_baud.115200.upload.svl_baud=115200
+amap3thing.menu.svl_baud.230400.upload.svl_baud=230400
+amap3thing.menu.svl_baud.460800.upload.svl_baud=460800
+amap3thing.menu.svl_baud.921600.upload.svl_baud=921600
+
+amap3thing.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
+amap3thing.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
+
+amap3thing.menu.loader.sparkfun_svl.upload.tool=artemis_svl
+amap3thing.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
+
+###############################################################
+
 edge.name=SparkFun Edge
 edge.build.variant=SparkFun_Edge
 edge.build.board=SFE_EDGE

docs/CHANGELOG.md

@@ -5,6 +5,12 @@ This is a record of the major changes between versions of the SparkFun Arduino A
 
 Each log entry will use the version number of the release that contains the changes listed. Newest version at the top of the file (just below this line)
 
+1.0.8
+===================
+- Wire library requestFrom address bug fix (previously required address to be set with 'beginTransmission')
+- Correct variant definition for Artemis module (Serial mis-definition)
+- Correct variant definition for Edge (Wire1 redefinition)
+
 1.0.7 - 
 ===================
 - Rectified error in Artemis variant pin map (pad 46 was listed as available when it is in fact not)

libraries/Wire/src/Wire.cpp

@@ -108,7 +108,7 @@ uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
 	_rxBuffer.clear();
 
 	am_hal_iom_transfer_t iomTransfer = {0};
-    iomTransfer.uPeerInfo.ui32I2CDevAddr = _txAddress; 
+    iomTransfer.uPeerInfo.ui32I2CDevAddr = address; 
     iomTransfer.ui32InstrLen = 0;           // 8-bit transfers
     iomTransfer.ui32Instr = 0;   // Offset;
     iomTransfer.ui32NumBytes = quantity;         // How many bytes to receive
@@ -137,14 +137,9 @@ uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
 	return byteRead;
 }
 
-uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity)
-{
-	return requestFrom(address, quantity, true);
-}
-
 void TwoWire::beginTransmission(uint8_t address) {
 	// save address of target and clear buffer
-	_txAddress = address;
+	_transmissionAddress = address;
 	_txBuffer.clear();
 
 	_transmissionBegun = true;
@@ -161,7 +156,7 @@ uint8_t TwoWire::endTransmission(bool stopBit)
 	_transmissionBegun = false ;
 
 	am_hal_iom_transfer_t iomTransfer = {0};
-	iomTransfer.uPeerInfo.ui32I2CDevAddr = _txAddress; 
+	iomTransfer.uPeerInfo.ui32I2CDevAddr = _transmissionAddress; 
     iomTransfer.ui32InstrLen = 0;           // Use only data phase
     iomTransfer.ui32Instr = 0;    			// 
     // iomTransfer.ui32NumBytes = ;         // 
@@ -205,11 +200,6 @@ uint8_t TwoWire::endTransmission(bool stopBit)
 	}
 }
 
-uint8_t TwoWire::endTransmission()
-{
-	return endTransmission(true);
-}
-
 size_t TwoWire::write(uint8_t ucData)
 {
 	// No writing, without begun transmission or a full buffer

libraries/Wire/src/Wire.h

@@ -43,12 +43,10 @@ class TwoWire : public Stream, public IOMaster {
     void end();
     void setClock(uint32_t);
 
-    void beginTransmission(uint8_t);
-    uint8_t endTransmission(bool stopBit);
-    uint8_t endTransmission(void);
+    void beginTransmission(uint8_t address);
+    uint8_t endTransmission(bool stopBit = true);
 
-    uint8_t requestFrom(uint8_t address, size_t quantity, bool stopBit);
-    uint8_t requestFrom(uint8_t address, size_t quantity);
+    uint8_t requestFrom(uint8_t address, size_t quantity, bool stopBit = true);
 
     size_t write(uint8_t data);
     size_t write(const uint8_t * data, size_t quantity);
@@ -73,11 +71,11 @@ class TwoWire : public Stream, public IOMaster {
     ap3_gpio_pin_t  _padSCL;
 
     bool _transmissionBegun;
-    uint8_t _txAddress;
+    uint8_t _transmissionAddress;
 
 
     RingBufferN<AP3_WIRE_RX_BUFFER_LEN> _rxBuffer;// RX Buffer    
-    RingBufferN<AP3_WIRE_TX_BUFFER_LEN> _txBuffer;//TX buffer
+    RingBufferN<AP3_WIRE_TX_BUFFER_LEN> _txBuffer;// TX buffer
     uint8_t _linearBugger[AP3_WIRE_LINEAR_BUFFER_LEN]; // ToDo: choose a more efficient way to handle this
     uint8_t txAddress;
 

variants/SparkFun_Artemis/config/variant.cpp

@@ -87,8 +87,7 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
 // Uart Definitions
 //Serial(instance, RX, TX)
 //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)
+Uart Serial(0, 49, 48); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 49 and TX on pin 48 (note, in this variant the pins map directly to pad, so pin === pad when talking about the pure Artemis module)
 
 // Pin aliasing using the const uint8_t approach
 //
@@ -143,4 +142,4 @@ Uart Serial(0, 23, 22); // Declares a Uart object called Serial using instance 0
 //     AP3_ADC_TEMP_PAD,       //34 - Not a real pad, ADC_TEMP
 //     AP3_ADC_DIV3_PAD,       //35 - Not a real pad, ADC_DIV3
 //     AP3_ADC_VSS_PAD,        //36 - Not a real pad, ADC_VSS
-// };
+// };

variants/SparkFun_Artemis_Thing_Plus/bsp/README.md

@@ -0,0 +1,15 @@
+# Variant BSP
+The Board Support Package (BSP) is a feature of the AmbiqSuite SDK that allows you to:
+- define names and default configurations for pins
+- write globally-accessible routines for common functions
+
+These features are potentially useful when:
+- designing an Apollo3-based board for a custom purpose where pin functions will be mainly static
+- using AmbiqSuite examples within Arduino
+
+For an example of a BSP see the AmbiqSuite release 2.1.0 SDK under 'SDK/boards/Apollo3_EVB/bsp'
+
+To include BSP files (i.e. am_bsp.h, am_bsp.c, am_bsp_pins.h, am_bsp_pins.c, as well as 
+bsp_pins.src and pinconfig.py) add " -I{build.variant.path}/bsp" to the board definition in 
+boards.txt as part of the board.build.includes parameter.
+

variants/SparkFun_Artemis_Thing_Plus/config/variant.cpp

@@ -0,0 +1,62 @@
+/*
+Copyright (c) 2019 SparkFun Electronics
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include "variant.h"
+
+const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
+    //~ = PWM, A = ADC
+    //Apollo Pad,      //Silkscreen indicator - Pin functions
+    25,                //0     - ~RX1/SDA2/MISO2
+    24,                //1     - ~TX1/32kHz/SWO
+    44,                //2     - ~MOSI4
+    35,                //3/A6  - ~A/TX1/I2SDAT/PDMCLK
+    4,                 //4     - ~RX1/SLINT
+    22,                //5     - ~PDMCLK/SWO
+    23,                //6     - ~I2SWCLK/CMPOUT
+    27,                //7     - ~SCL2/SCK2
+    28,                //8     - ~MOSI2/I2SWCLK
+    32,                //9/A7  - ~A/SCCIO
+    14,                //10    -  SWCH/ADCD1N/TX1/PDMCLK
+    7,                 //11    - ~MOSI0/CLKOUT
+    6,                 //12    - ~MISO0/SDA0/I2SDAT
+    5,                 //13    - ~SCK0/SCL0
+    40,                //14    -  SDA4/MISO4/RX1
+    39,                //15    - ~SCL4/SCK4/TX1
+    43,                //16    - ~SDA3/MISO3/RX1
+    42,                //17    - ~SCL3/SCK3/TX1
+    26,                //18    - ~LED/SCCRST
+    33,                //19/A0 - ~A/SWO/32KHZ
+    13,                //20/A1 - ~A/I2SBCLK/RX1
+    11,                //21/A2 - ~A/PDMDATA
+    29,                //22/A3 - ~A/PDMDATA
+    12,                //23/A4 - ~A/PDMCLK/TX1
+	31,                //24/A5 - ~A/SCCCLK
+	48,                //25    - Not exposed, TX0
+	49,                //26    - Not exposed, RX0
+    36,                //27    - Not exposed, PDMDATA of Mic
+    37,                //28    - Not exposed, PDMCLK of Mic
+};
+
+// Uart Definitions
+//Serial(instance, RX, TX)
+Uart Serial(0, 26, 25); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 26 and TX on pin 25 (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)