Skip to content

Commit 8776265

Browse files
author
oclyke
committed
clean up comments
contributions are tracked by commit history and contributors are acknowledged in the ACKNOWLEDGEMENTS.md file
1 parent e70ae52 commit 8776265

File tree

3 files changed

+14
-29
lines changed

3 files changed

+14
-29
lines changed

‎cores/arduino/am_sdk_ap3/mcu/apollo3/hal/am_hal_pin.h‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
//
4949
//*****************************************************************************
5050

51-
//2020-03-25, Stephen Fordyce: Checked against Apollo3 datasheet DS-A3-0p9p1 Table 559 (p381) and fixed. To see fixes, search "Fixed" in the below.
52-
53-
5451
#ifndef AM_HAL_PIN_H
5552
#define AM_HAL_PIN_H
5653

@@ -73,7 +70,7 @@
7370
#define AM_HAL_PIN_1_MSPI5 (5)
7471
#define AM_HAL_PIN_1_NCE1 (7)
7572

76-
#define AM_HAL_PIN_2_UART1RX (0) //Fixed (added) SF 2020-03-25
73+
#define AM_HAL_PIN_2_UART1RX (0)
7774
#define AM_HAL_PIN_2_SLMISO (1)
7875
#define AM_HAL_PIN_2_UART0RX (2)
7976
#define AM_HAL_PIN_2_GPIO (3)
@@ -89,12 +86,11 @@
8986
#define AM_HAL_PIN_3_I2S_WCLK (7)
9087
#define AM_HAL_PIN_3_PSOURCE (3)
9188

92-
#define AM_HAL_PIN_4_UART0CTS (0)
89+
#define AM_HAL_PIN_4_UART0CTS (0)
9390
#define AM_HAL_PIN_4_SLINT (1)
9491
#define AM_HAL_PIN_4_NCE4 (2)
9592
#define AM_HAL_PIN_4_GPIO (3)
96-
//#define AM_HAL_PIN_4_UART0RX (5) //Fixed (removed) SF 2020-03-25
97-
#define AM_HAL_PIN_4_UART1RX (5) //Fixed (added) SF 2020-03-25
93+
#define AM_HAL_PIN_4_UART1RX (5)
9894
#define AM_HAL_PIN_4_CTIM17 (6)
9995
#define AM_HAL_PIN_4_MSPI2 (7)
10096

@@ -134,7 +130,7 @@
134130
#define AM_HAL_PIN_9_SCCIO (4)
135131
#define AM_HAL_PIN_9_UART1RX (6)
136132

137-
#define AM_HAL_PIN_10_UART1TX (0) //Fixed (added) SF 2020-03-25
133+
#define AM_HAL_PIN_10_UART1TX (0)
138134
#define AM_HAL_PIN_10_M1MOSI (1)
139135
#define AM_HAL_PIN_10_NCE10 (2)
140136
#define AM_HAL_PIN_10_GPIO (3)
@@ -443,8 +439,7 @@
443439
#define AM_HAL_PIN_44_CTIM20 (2)
444440
#define AM_HAL_PIN_44_GPIO (3)
445441
#define AM_HAL_PIN_44_M4MOSI (5)
446-
#define AM_HAL_PIN_44_M5nCE6 (6) //Original, doesn't match Apollo 3 pin mapping table
447-
#define AM_HAL_PIN_44_UART0TX (6) //Fixed (added) SF 2020-03-25
442+
#define AM_HAL_PIN_44_UART0TX (6)
448443

449444
#if defined (AM_PACKAGE_BGA)
450445
#define AM_HAL_PIN_45_UART1CTS (0)

‎cores/arduino/ard_sup/ap3_uart_types.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,18 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2020
SOFTWARE.
2121
*/
2222

23-
//2020-03-25, Stephen Fordyce: Checked against Apollo3 datasheet DS-A3-0p9p1 Table 559 (p381) and fixed. To see fixes, search "Fixed" in the below.
24-
2523
#ifndef _AP3_UART_TYPES_H_
2624
#define _AP3_UART_TYPES_H_
2725

2826
#define AP3_UART_PIN_UNUSED 0xFF
2927

30-
//#define AP3_UART0_NUM_TX_PADS 11 //Fixed (removed) SF 2020-03-25
31-
#define AP3_UART0_NUM_TX_PADS 12 //Fixed (added) SF 2020-03-25
32-
//#define AP3_UART0_NUM_RX_PADS 13 //Fixed (removed) SF 2020-03-25
33-
#define AP3_UART0_NUM_RX_PADS 12 //Fixed (added) SF 2020-03-25
28+
#define AP3_UART0_NUM_TX_PADS 12
29+
#define AP3_UART0_NUM_RX_PADS 12
3430
#define AP3_UART0_NUM_RTS_PADS 8
3531
#define AP3_UART0_NUM_CTS_PADS 8
3632

37-
//#define AP3_UART1_NUM_TX_PADS 11 //Fixed (removed) SF 2020-03-25
38-
#define AP3_UART1_NUM_TX_PADS 12 //Fixed (added) SF 2020-03-25
39-
//#define AP3_UART1_NUM_RX_PADS 11 //Fixed (removed) SF 2020-03-25
40-
#define AP3_UART1_NUM_RX_PADS 13 //Fixed (added) SF 2020-03-25
33+
#define AP3_UART1_NUM_TX_PADS 12
34+
#define AP3_UART1_NUM_RX_PADS 13
4135
#define AP3_UART1_NUM_RTS_PADS 8
4236
#define AP3_UART1_NUM_CTS_PADS 8
4337

‎cores/arduino/ard_sup/uart/ap3_uart_structures.c‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2020
SOFTWARE.
2121
*/
2222

23-
//2020-03-25, Stephen Fordyce: Checked against Apollo3 datasheet DS-A3-0p9p1 Table 559 (p381) and fixed. To see fixes, search "Fixed" in the below.
24-
2523
// #include "ap3_uart.h"
2624
#include "ap3_types.h"
2725
#include "ap3_uart_types.h"
@@ -37,13 +35,12 @@ const ap3_uart_pad_map_elem_t ap3_uart0_tx_map[AP3_UART0_NUM_TX_PADS] = {
3735
{.pad = 30, .funcsel = AM_HAL_PIN_30_UART0TX},
3836
{.pad = 39, .funcsel = AM_HAL_PIN_39_UART0TX},
3937
{.pad = 41, .funcsel = AM_HAL_PIN_41_UART0TX},
40-
{.pad = 44, .funcsel = AM_HAL_PIN_44_UART0TX}, //Fixed (added) SF 2020-03-25
38+
{.pad = 44, .funcsel = AM_HAL_PIN_44_UART0TX},
4139
{.pad = 48, .funcsel = AM_HAL_PIN_48_UART0TX},
4240
};
4341

4442
const ap3_uart_pad_map_elem_t ap3_uart0_rx_map[AP3_UART0_NUM_RX_PADS] = {
4543
{.pad = 2, .funcsel = AM_HAL_PIN_2_UART0RX},
46-
//{.pad = 4, .funcsel = AM_HAL_PIN_4_UART0RX}, //Fixed (removed) SF 2020-03-25
4744
{.pad = 11, .funcsel = AM_HAL_PIN_11_UART0RX},
4845
{.pad = 17, .funcsel = AM_HAL_PIN_17_UART0RX},
4946
{.pad = 21, .funcsel = AM_HAL_PIN_21_UART0RX},
@@ -75,14 +72,13 @@ const ap3_uart_pad_map_elem_t ap3_uart0_cts_map[AP3_UART0_NUM_CTS_PADS] = {
7572
{.pad = 24, .funcsel = AM_HAL_PIN_24_UART0CTS},
7673
{.pad = 29, .funcsel = AM_HAL_PIN_29_UART0CTS},
7774
{.pad = 33, .funcsel = AM_HAL_PIN_33_UART0CTS},
78-
//{.pad = 26, .funcsel = AM_HAL_PIN_36_UART0CTS}, //Fixed (removed) SF 2020-03-25
79-
{.pad = 36, .funcsel = AM_HAL_PIN_36_UART0CTS}, //Fixed (replaced with .pad=36 instead of =26) SF 2020-03-25
75+
{.pad = 36, .funcsel = AM_HAL_PIN_36_UART0CTS},
8076
{.pad = 38, .funcsel = AM_HAL_PIN_38_UART0CTS},
8177
};
8278

8379
const ap3_uart_pad_map_elem_t ap3_uart1_tx_map[AP3_UART1_NUM_TX_PADS] = {
8480
{.pad = 8, .funcsel = AM_HAL_PIN_8_UART1TX},
85-
{.pad = 10, .funcsel = AM_HAL_PIN_10_UART1TX}, //Fixed (added) SF 2020-03-25
81+
{.pad = 10, .funcsel = AM_HAL_PIN_10_UART1TX},
8682
{.pad = 12, .funcsel = AM_HAL_PIN_12_UART1TX},
8783
{.pad = 14, .funcsel = AM_HAL_PIN_14_UART1TX},
8884
{.pad = 18, .funcsel = AM_HAL_PIN_18_UART1TX},
@@ -96,8 +92,8 @@ const ap3_uart_pad_map_elem_t ap3_uart1_tx_map[AP3_UART1_NUM_TX_PADS] = {
9692
};
9793

9894
const ap3_uart_pad_map_elem_t ap3_uart1_rx_map[AP3_UART1_NUM_RX_PADS] = {
99-
{.pad = 2, .funcsel = AM_HAL_PIN_2_UART1RX}, //Fixed (added) SF 2020-03-25
100-
{.pad = 4, .funcsel = AM_HAL_PIN_4_UART1RX}, //Fixed (added) SF 2020-03-25
95+
{.pad = 2, .funcsel = AM_HAL_PIN_2_UART1RX},
96+
{.pad = 4, .funcsel = AM_HAL_PIN_4_UART1RX},
10197
{.pad = 9, .funcsel = AM_HAL_PIN_9_UART1RX},
10298
{.pad = 13, .funcsel = AM_HAL_PIN_13_UART1RX},
10399
{.pad = 15, .funcsel = AM_HAL_PIN_15_UART1RX},

0 commit comments

Comments
 (0)