Skip to content

Commit fea40e8

Browse files
Wenn0101Wenn0101
authored
Merge pull request #455 from sparkfun/release-candidate
Release candidate
2 parents 4e24a02 + 9d3a755 commit fea40e8

File tree

27 files changed

+47
-18
lines changed

27 files changed

+47
-18
lines changed

‎cores/arduino/mbed-bridge‎

‎cores/arduino/sdk/core-implement/CommonAnalog.cpp‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,20 @@ ap3_err_t ap3_pwm_output(ap3_gpio_pad_t pad, uint32_t th, uint32_t fw, uint32_t
570570
AM_HAL_GPIO_PIN_DRIVESTRENGTH_12MA); //
571571

572572
// if timer is running wait for timer value to roll over (will indicate that at least one pulse has been emitted)
573+
uint32_t timer_enabled;
574+
573575
AM_CRITICAL_BEGIN // critical section when reading / writing config registers
574-
if ((segment == AM_HAL_CTIMER_TIMERA && *((uint32_t *)CTIMERADDRn(CTIMER, timer, CTRL0)) & (CTIMER_CTRL0_TMRA0EN_Msk)) ||
575-
(segment == AM_HAL_CTIMER_TIMERB && *((uint32_t *)CTIMERADDRn(CTIMER, timer, CTRL0)) & (CTIMER_CTRL0_TMRB0EN_Msk)))
576+
if(segment == AM_HAL_CTIMER_TIMERA)
577+
{
578+
timer_enabled = *((uint32_t *)CTIMERADDRn(CTIMER, timer, CTRL0)) & (CTIMER_CTRL0_TMRA0EN_Msk);
579+
}
580+
else
581+
{
582+
timer_enabled = *((uint32_t *)CTIMERADDRn(CTIMER, timer, CTRL0)) & (CTIMER_CTRL0_TMRB0EN_Msk);
583+
}
584+
AM_CRITICAL_END // end critical section
585+
586+
if (timer_enabled)
576587
{
577588
uint32_t current = 0;
578589
uint32_t last = 0;
@@ -582,7 +593,7 @@ ap3_err_t ap3_pwm_output(ap3_gpio_pad_t pad, uint32_t th, uint32_t fw, uint32_t
582593
current = am_hal_ctimer_read(timer, segment);
583594
} while (current >= last);
584595
}
585-
AM_CRITICAL_END // end critical section
596+
586597

587598
// clear timer (also stops the timer)
588599
am_hal_ctimer_clear(timer, segment);

‎cores/mbed-os‎

‎libraries/Apollo3/examples/Example10_DisplayICRevision/Example10_DisplayICRevision.ino‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@ void setup()
3232
{
3333
Serial.print("Unknown revision");
3434
}
35+
Serial.println();
36+
37+
//Unique ChipID
38+
am_hal_mcuctrl_device_t sDevice;
39+
am_hal_mcuctrl_info_get(AM_HAL_MCUCTRL_INFO_DEVICEID, &sDevice);
40+
41+
Serial.print("ChipID0 : 0x");
42+
Serial.println(sDevice.ui32ChipID0, HEX);
43+
44+
Serial.print("ChipID1 : 0x");
45+
Serial.println(sDevice.ui32ChipID1, HEX);
46+
3547
Serial.println();
3648
Serial.println("All done");
3749
}

‎libraries/SPI/src/SPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void arduino::MbedSPI::begin() {
8484
}
8585

8686
void arduino::MbedSPI::end() {
87-
if (!dev) {
87+
if (dev) {
8888
delete dev;
8989
}
9090
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "framework-arduinoapollo3",
33
"description": "An mbed-os enabled Arduino core for Ambiq Apollo3 based boards",
4-
"version": "2.2.0",
4+
"version": "2.2.1",
55
"url": "https://github.com/sparkfun/Arduino_Apollo3"
66
}

‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.ld-symbols‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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=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
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=1647533733.2307262 -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

‎variants/LoRa_THING_PLUS_expLoRaBLE/mbed/libmbed-os.a‎

4 Bytes
Binary file not shown.

‎variants/SFE_ARTEMIS/config/pins.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "bridge/pins.h"
77

8-
const pin_size_t variantPinCount = 17;
8+
const pin_size_t variantPinCount = 22;
99

1010
PinState variantPinStates[variantPinCount] = {
1111
{D0, 0, NULL, /*NULL, NULL, NULL,*/ NULL},
@@ -25,4 +25,10 @@ PinState variantPinStates[variantPinCount] = {
2525
{D14, 14, NULL, /*NULL, NULL, NULL,*/ NULL},
2626
{D15, 15, NULL, /*NULL, NULL, NULL,*/ NULL},
2727
{D16, 16, NULL, /*NULL, NULL, NULL,*/ NULL},
28+
{D17, 17, NULL, /*NULL, NULL, NULL,*/ NULL},
29+
{D18, 18, NULL, /*NULL, NULL, NULL,*/ NULL},
30+
{D19, 19, NULL, /*NULL, NULL, NULL,*/ NULL},
31+
{D20, 20, NULL, /*NULL, NULL, NULL,*/ NULL},
32+
{D21, 21, NULL, /*NULL, NULL, NULL,*/ NULL},
2833
};
34+

‎variants/SFE_ARTEMIS/mbed/.ld-symbols‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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=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
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=1647533921.9748533 -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 commit comments

Comments
 (0)