sparkfun · Wenn0101 · Dec 9, 2021 · Aug 15, 2021 · Sep 9, 2021 · Sep 9, 2021
diff --git a/cores/arduino/mbed-bridge b/cores/arduino/mbed-bridge
diff --git a/cores/mbed-os b/cores/mbed-os
diff --git a/...e1_DigitalWrite/Example1_DigitalWrite.ino → ...1_DigitalWrite/Example01_DigitalWrite.ino b/...e1_DigitalWrite/Example1_DigitalWrite.ino → ...1_DigitalWrite/Example01_DigitalWrite.ino
diff --git a/...ample2_AnalogRead/Example2_AnalogRead.ino → ...ple02_AnalogRead/Example02_AnalogRead.ino b/...ample2_AnalogRead/Example2_AnalogRead.ino → ...ple02_AnalogRead/Example02_AnalogRead.ino
diff --git a/...ple3_AnalogWrite/Example3_AnalogWrite.ino → ...e03_AnalogWrite/Example03_AnalogWrite.ino b/...ple3_AnalogWrite/Example3_AnalogWrite.ino → ...e03_AnalogWrite/Example03_AnalogWrite.ino
diff --git a/...mples/Example4_Serial/Example4_Serial.ino → ...les/Example04_Serial/Example04_Serial.ino b/...mples/Example4_Serial/Example4_Serial.ino → ...les/Example04_Serial/Example04_Serial.ino
diff --git a/...s/Example5_Wire_I2C/Example5_Wire_I2C.ino → ...Example05_Wire_I2C/Example05_Wire_I2C.ino b/...s/Example5_Wire_I2C/Example5_Wire_I2C.ino → ...Example05_Wire_I2C/Example05_Wire_I2C.ino
diff --git a/...o3/examples/Example6_SPI/Example6_SPI.ino → .../examples/Example06_SPI/Example06_SPI.ino b/...o3/examples/Example6_SPI/Example6_SPI.ino → .../examples/Example06_SPI/Example06_SPI.ino
diff --git a/...les/Example7_Threads/Example7_Threads.ino → ...s/Example07_Threads/Example07_Threads.ino b/...les/Example7_Threads/Example7_Threads.ino → ...s/Example07_Threads/Example07_Threads.ino
diff --git a/...achInterrupt/Example8_AttachInterrupt.ino → ...chInterrupt/Example08_AttachInterrupt.ino b/...achInterrupt/Example8_AttachInterrupt.ino → ...chInterrupt/Example08_AttachInterrupt.ino
diff --git a/...achInterrupt/Example9_DetachInterrupt.ino → ...chInterrupt/Example09_DetachInterrupt.ino b/...achInterrupt/Example9_DetachInterrupt.ino → ...chInterrupt/Example09_DetachInterrupt.ino
diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
@@ -7,7 +7,7 @@
 #define _APOLLO3_LIBRARIES_SPI_H_
 
 #include "Arduino.h"
-
+#include "core-api/api/HardwareSPI.h"
 #include "drivers/SPI.h"
 
 namespace arduino {

diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
@@ -66,7 +66,7 @@ uint8_t arduino::MbedI2C::endTransmission(bool stopBit) {
 	return 2;
 }
 
-uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
+size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
 	char buf[256];
 	int ret = master->read(address << 1, buf, len, !stopBit);
 	if (ret != 0) {
@@ -78,7 +78,7 @@ uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit)
 	return len;
 }
 
-uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
+size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
 	return requestFrom(address, len, true);
 }
 

diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h
@@ -7,6 +7,7 @@
 #define _APOLLO3_LIBRARIES_WIRE_H_
 
 #include "Arduino.h"
+#include "core-api/api/HardwareI2C.h"
 #include "drivers/I2C.h"
 #include "drivers/I2CSlave.h"
 #include "rtos.h"
@@ -32,8 +33,8 @@ class MbedI2C : public HardwareI2C
     virtual uint8_t endTransmission(bool stopBit);
     virtual uint8_t endTransmission(void);
 
-    virtual uint8_t requestFrom(uint8_t address, size_t len, bool stopBit);
-    virtual uint8_t requestFrom(uint8_t address, size_t len);
+    virtual size_t requestFrom(uint8_t address, size_t len, bool stopBit);
+    virtual size_t requestFrom(uint8_t address, size_t len);
 
     virtual void onReceive(void(*)(int));
     virtual void onRequest(void(*)(void));

diff --git a/package.json b/package.json
@@ -0,0 +1,6 @@
+{
+    "name": "framework-arduinoapollo3",
+    "description": "An mbed-os enabled Arduino core for Ambiq Apollo3 based boards",
+    "version": "2.2.0",
+    "url": "https://github.com/sparkfun/Arduino_Apollo3"
+}
diff --git a/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.ld-symbols b/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625745529.6730196 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060156.7070057 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
diff --git a/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/libmbed-os.a b/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/libmbed-os.a
diff --git a/variants/LoRa_THING_PLUS_expLoRaBLE/variant.h b/variants/LoRa_THING_PLUS_expLoRaBLE/variant.h
@@ -11,7 +11,7 @@
 #include "config/pins.h"
 
 #define VARIANT_SPI_INTFCS  2
-#define VARIANT_WIRE_INTFCS 1
+#define VARIANT_WIRE_INTFCS 2
 
 // SPI
 #define VARIANT_SPI_SDI     SPI_SDI
@@ -26,6 +26,8 @@
 // Wire
 #define VARIANT_Wire_SDA    I2C_SDA
 #define VARIANT_Wire_SCL    I2C_SCL
+#define VARIANT_Wire1_SDA 	I2C1_SDA
+#define VARIANT_Wire1_SCL 	I2C1_SCL
 
 // UART
 extern UART Serial1;

diff --git a/variants/SFE_ARTEMIS/mbed/.ld-symbols b/variants/SFE_ARTEMIS/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625745691.784154 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060310.9699843 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1
+0 −3		.gitmodules
+0 −1		core-api
+57 −0		core-api/api/ArduinoAPI.h
+552 −0		core-api/api/Binary.h
+46 −0		core-api/api/Client.h
+10 −0		core-api/api/Common.cpp
+169 −0		core-api/api/Common.h
+16 −0		core-api/api/Compat.h
+47 −0		core-api/api/HardwareI2C.h
+130 −0		core-api/api/HardwareSPI.h
+105 −0		core-api/api/HardwareSerial.h
+127 −0		core-api/api/IPAddress.cpp
+85 −0		core-api/api/IPAddress.h
+44 −0		core-api/api/Interrupts.h
+101 −0		core-api/api/PluggableUSB.cpp
+78 −0		core-api/api/PluggableUSB.h
+381 −0		core-api/api/Print.cpp
+96 −0		core-api/api/Print.h
+39 −0		core-api/api/Printable.h
+141 −0		core-api/api/RingBuffer.h
+31 −0		core-api/api/Server.h
+320 −0		core-api/api/Stream.cpp
+131 −0		core-api/api/Stream.h
+765 −0		core-api/api/String.cpp
+256 −0		core-api/api/String.h
+64 −0		core-api/api/USBAPI.h
+92 −0		core-api/api/Udp.h
+171 −0		core-api/api/WCharacter.h
+37 −0		core-api/api/deprecated-avr-comp/avr/dtostrf.c.impl
+34 −0		core-api/api/deprecated-avr-comp/avr/dtostrf.h
+23 −0		core-api/api/deprecated-avr-comp/avr/interrupt.h
+122 −0		core-api/api/deprecated-avr-comp/avr/pgmspace.h
+25 −0		core-api/api/deprecated/Client.h
+25 −0		core-api/api/deprecated/HardwareSerial.h
+25 −0		core-api/api/deprecated/IPAddress.h
+24 −0		core-api/api/deprecated/Print.h
+24 −0		core-api/api/deprecated/Printable.h
+25 −0		core-api/api/deprecated/Server.h
+25 −0		core-api/api/deprecated/Stream.h
+25 −0		core-api/api/deprecated/Udp.h
+24 −0		core-api/api/deprecated/WString.h
+37 −0		core-api/api/itoa.h
+1 −0		core-extend/HardwareSerial.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625745529.6730196 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1
		-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060156.7070057 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1