Skip to content

Commit 342ba78

Browse files
author
oclyke
committed
update utils
1 parent d3aa732 commit 342ba78

18 files changed

+265
-1587
lines changed

‎cores/arduino/am_sdk_ap3/utils/am_util.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@
1010

1111
//*****************************************************************************
1212
//
13-
// Copyright (c) 2019, Ambiq Micro
13+
// Copyright (c) 2020, Ambiq Micro
1414
// All rights reserved.
15-
//
15+
//
1616
// Redistribution and use in source and binary forms, with or without
1717
// modification, are permitted provided that the following conditions are met:
18-
//
18+
//
1919
// 1. Redistributions of source code must retain the above copyright notice,
2020
// this list of conditions and the following disclaimer.
21-
//
21+
//
2222
// 2. Redistributions in binary form must reproduce the above copyright
2323
// notice, this list of conditions and the following disclaimer in the
2424
// documentation and/or other materials provided with the distribution.
25-
//
25+
//
2626
// 3. Neither the name of the copyright holder nor the names of its
2727
// contributors may be used to endorse or promote products derived from this
2828
// software without specific prior written permission.
29-
//
29+
//
3030
// Third party software included in this distribution is subject to the
3131
// additional license terms as defined in the /docs/licenses directory.
32-
//
32+
//
3333
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3434
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3535
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -42,7 +42,7 @@
4242
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4343
// POSSIBILITY OF SUCH DAMAGE.
4444
//
45-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
45+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
4646
//
4747
//*****************************************************************************
4848
#ifndef AM_UTIL_H
@@ -69,7 +69,7 @@
6969
#include "am_util_string.h"
7070
#include "am_util_time.h"
7171

72-
#if AM_PART_APOLLO3
72+
#if defined(AM_PART_APOLLO3) || defined(AM_PART_APOLLO3P)
7373
#include "am_util_ble.h"
7474
#endif
7575

‎cores/arduino/am_sdk_ap3/utils/am_util_ble.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212

1313
//*****************************************************************************
1414
//
15-
// Copyright (c) 2019, Ambiq Micro
15+
// Copyright (c) 2020, Ambiq Micro
1616
// All rights reserved.
17-
//
17+
//
1818
// Redistribution and use in source and binary forms, with or without
1919
// modification, are permitted provided that the following conditions are met:
20-
//
20+
//
2121
// 1. Redistributions of source code must retain the above copyright notice,
2222
// this list of conditions and the following disclaimer.
23-
//
23+
//
2424
// 2. Redistributions in binary form must reproduce the above copyright
2525
// notice, this list of conditions and the following disclaimer in the
2626
// documentation and/or other materials provided with the distribution.
27-
//
27+
//
2828
// 3. Neither the name of the copyright holder nor the names of its
2929
// contributors may be used to endorse or promote products derived from this
3030
// software without specific prior written permission.
31-
//
31+
//
3232
// Third party software included in this distribution is subject to the
3333
// additional license terms as defined in the /docs/licenses directory.
34-
//
34+
//
3535
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3636
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3737
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -44,7 +44,7 @@
4444
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4545
// POSSIBILITY OF SUCH DAMAGE.
4646
//
47-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
47+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
4848
//
4949
//*****************************************************************************
5050

‎cores/arduino/am_sdk_ap3/utils/am_util_ble.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212

1313
//*****************************************************************************
1414
//
15-
// Copyright (c) 2019, Ambiq Micro
15+
// Copyright (c) 2020, Ambiq Micro
1616
// All rights reserved.
17-
//
17+
//
1818
// Redistribution and use in source and binary forms, with or without
1919
// modification, are permitted provided that the following conditions are met:
20-
//
20+
//
2121
// 1. Redistributions of source code must retain the above copyright notice,
2222
// this list of conditions and the following disclaimer.
23-
//
23+
//
2424
// 2. Redistributions in binary form must reproduce the above copyright
2525
// notice, this list of conditions and the following disclaimer in the
2626
// documentation and/or other materials provided with the distribution.
27-
//
27+
//
2828
// 3. Neither the name of the copyright holder nor the names of its
2929
// contributors may be used to endorse or promote products derived from this
3030
// software without specific prior written permission.
31-
//
31+
//
3232
// Third party software included in this distribution is subject to the
3333
// additional license terms as defined in the /docs/licenses directory.
34-
//
34+
//
3535
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3636
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3737
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -44,7 +44,7 @@
4444
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4545
// POSSIBILITY OF SUCH DAMAGE.
4646
//
47-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
47+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
4848
//
4949
//*****************************************************************************
5050

‎cores/arduino/am_sdk_ap3/utils/am_util_debug.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212

1313
//*****************************************************************************
1414
//
15-
// Copyright (c) 2019, Ambiq Micro
15+
// Copyright (c) 2020, Ambiq Micro
1616
// All rights reserved.
17-
//
17+
//
1818
// Redistribution and use in source and binary forms, with or without
1919
// modification, are permitted provided that the following conditions are met:
20-
//
20+
//
2121
// 1. Redistributions of source code must retain the above copyright notice,
2222
// this list of conditions and the following disclaimer.
23-
//
23+
//
2424
// 2. Redistributions in binary form must reproduce the above copyright
2525
// notice, this list of conditions and the following disclaimer in the
2626
// documentation and/or other materials provided with the distribution.
27-
//
27+
//
2828
// 3. Neither the name of the copyright holder nor the names of its
2929
// contributors may be used to endorse or promote products derived from this
3030
// software without specific prior written permission.
31-
//
31+
//
3232
// Third party software included in this distribution is subject to the
3333
// additional license terms as defined in the /docs/licenses directory.
34-
//
34+
//
3535
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3636
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3737
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -44,7 +44,7 @@
4444
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4545
// POSSIBILITY OF SUCH DAMAGE.
4646
//
47-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
47+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
4848
//
4949
//*****************************************************************************
5050

‎cores/arduino/am_sdk_ap3/utils/am_util_debug.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212

1313
//*****************************************************************************
1414
//
15-
// Copyright (c) 2019, Ambiq Micro
15+
// Copyright (c) 2020, Ambiq Micro
1616
// All rights reserved.
17-
//
17+
//
1818
// Redistribution and use in source and binary forms, with or without
1919
// modification, are permitted provided that the following conditions are met:
20-
//
20+
//
2121
// 1. Redistributions of source code must retain the above copyright notice,
2222
// this list of conditions and the following disclaimer.
23-
//
23+
//
2424
// 2. Redistributions in binary form must reproduce the above copyright
2525
// notice, this list of conditions and the following disclaimer in the
2626
// documentation and/or other materials provided with the distribution.
27-
//
27+
//
2828
// 3. Neither the name of the copyright holder nor the names of its
2929
// contributors may be used to endorse or promote products derived from this
3030
// software without specific prior written permission.
31-
//
31+
//
3232
// Third party software included in this distribution is subject to the
3333
// additional license terms as defined in the /docs/licenses directory.
34-
//
34+
//
3535
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3636
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3737
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -44,7 +44,7 @@
4444
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4545
// POSSIBILITY OF SUCH DAMAGE.
4646
//
47-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
47+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
4848
//
4949
//*****************************************************************************
5050
#ifndef AM_UTIL_DEBUG_H

‎cores/arduino/am_sdk_ap3/utils/am_util_delay.c‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@
1010

1111
//*****************************************************************************
1212
//
13-
// Copyright (c) 2019, Ambiq Micro
13+
// Copyright (c) 2020, Ambiq Micro
1414
// All rights reserved.
15-
//
15+
//
1616
// Redistribution and use in source and binary forms, with or without
1717
// modification, are permitted provided that the following conditions are met:
18-
//
18+
//
1919
// 1. Redistributions of source code must retain the above copyright notice,
2020
// this list of conditions and the following disclaimer.
21-
//
21+
//
2222
// 2. Redistributions in binary form must reproduce the above copyright
2323
// notice, this list of conditions and the following disclaimer in the
2424
// documentation and/or other materials provided with the distribution.
25-
//
25+
//
2626
// 3. Neither the name of the copyright holder nor the names of its
2727
// contributors may be used to endorse or promote products derived from this
2828
// software without specific prior written permission.
29-
//
29+
//
3030
// Third party software included in this distribution is subject to the
3131
// additional license terms as defined in the /docs/licenses directory.
32-
//
32+
//
3333
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3434
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3535
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -42,7 +42,7 @@
4242
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4343
// POSSIBILITY OF SUCH DAMAGE.
4444
//
45-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
45+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
4646
//
4747
//*****************************************************************************
4848
#include <stdint.h>
@@ -90,7 +90,6 @@ void
9090
am_util_delay_ms(uint32_t ui32MilliSeconds)
9191
{
9292
uint32_t ui32Loops, ui32HFRC;
93-
9493
#if AM_APOLLO3_CLKGEN
9594
am_hal_clkgen_status_t sClkgenStatus;
9695
am_hal_clkgen_status_get(&sClkgenStatus);

‎cores/arduino/am_sdk_ap3/utils/am_util_delay.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@
88

99
//*****************************************************************************
1010
//
11-
// Copyright (c) 2019, Ambiq Micro
11+
// Copyright (c) 2020, Ambiq Micro
1212
// All rights reserved.
13-
//
13+
//
1414
// Redistribution and use in source and binary forms, with or without
1515
// modification, are permitted provided that the following conditions are met:
16-
//
16+
//
1717
// 1. Redistributions of source code must retain the above copyright notice,
1818
// this list of conditions and the following disclaimer.
19-
//
19+
//
2020
// 2. Redistributions in binary form must reproduce the above copyright
2121
// notice, this list of conditions and the following disclaimer in the
2222
// documentation and/or other materials provided with the distribution.
23-
//
23+
//
2424
// 3. Neither the name of the copyright holder nor the names of its
2525
// contributors may be used to endorse or promote products derived from this
2626
// software without specific prior written permission.
27-
//
27+
//
2828
// Third party software included in this distribution is subject to the
2929
// additional license terms as defined in the /docs/licenses directory.
30-
//
30+
//
3131
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3232
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3333
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,7 +40,7 @@
4040
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4141
// POSSIBILITY OF SUCH DAMAGE.
4242
//
43-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
43+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
4444
//
4545
//*****************************************************************************
4646
#ifndef AM_UTIL_DELAY_H

‎cores/arduino/am_sdk_ap3/utils/am_util_faultisr.c‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414

1515
//*****************************************************************************
1616
//
17-
// Copyright (c) 2019, Ambiq Micro
17+
// Copyright (c) 2020, Ambiq Micro
1818
// All rights reserved.
19-
//
19+
//
2020
// Redistribution and use in source and binary forms, with or without
2121
// modification, are permitted provided that the following conditions are met:
22-
//
22+
//
2323
// 1. Redistributions of source code must retain the above copyright notice,
2424
// this list of conditions and the following disclaimer.
25-
//
25+
//
2626
// 2. Redistributions in binary form must reproduce the above copyright
2727
// notice, this list of conditions and the following disclaimer in the
2828
// documentation and/or other materials provided with the distribution.
29-
//
29+
//
3030
// 3. Neither the name of the copyright holder nor the names of its
3131
// contributors may be used to endorse or promote products derived from this
3232
// software without specific prior written permission.
33-
//
33+
//
3434
// Third party software included in this distribution is subject to the
3535
// additional license terms as defined in the /docs/licenses directory.
36-
//
36+
//
3737
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3838
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3939
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -46,7 +46,7 @@
4646
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
4747
// POSSIBILITY OF SUCH DAMAGE.
4848
//
49-
// This is part of revision v2.2.0-7-g63f7c2ba1 of the AmbiqSuite Development Package.
49+
// This is part of revision 2.4.2 of the AmbiqSuite Development Package.
5050
//
5151
//*****************************************************************************
5252

@@ -429,7 +429,6 @@ am_util_faultisr_collect_data(uint32_t u32IsrSP)
429429
am_util_stdio_printf(" SYS Fault Address: 0x%08X\n", sHalFaultData.ui32SYS);
430430
}
431431

432-
433432
#endif
434433

435434
u32Mask = 0;

0 commit comments

Comments
 (0)