- Fixed USB issues. REPL & CIRCUITPY: drive now function correctly! - Fixed bugs with Internal Flash filesystem. Files now write & read back correctly. - Added copyright headers for all files.

Brandon-Hurst · Brandon-Hurst · commit 0fa04e9ff180 · 2024-11-25T15:28:41.000-08:00
diff --git a/ports/analog/Makefile b/ports/analog/Makefile
@@ -1,6 +1,7 @@
 # This file is part of the CircuitPython project: https://circuitpython.org
 #
 # SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
 #
 # SPDX-License-Identifier: MIT
 
diff --git a/ports/analog/README.md b/ports/analog/README.md
@@ -38,7 +38,9 @@ Universal instructions on flashing MAX32 devices this project can be found in th
 
 In addition, a user may flash the device by calling `make` with the `flash-msdk` target from within the `ports/analog` directory, as below:
 
-    $ make BOARD=<target board> flash-msdk
+```
+$ make BOARD=<target board> flash-msdk
+```
 
 This requires the following:
 - A MAX32625PICO is connected to the PC via USB
@@ -48,4 +50,10 @@ This requires the following:
 
 ### Using the REPL
 
-[**Section in Progress. USB support needs implementation & test.**]
+Once the device is plugged in, it will enumerate via USB as both a USB Serial Device (CDC) and a Mass Storage Device (MSC). You can connect to the Python REPL with your favorite Serial Monitor program e.g. TeraTerm, VS Code, Putty, etc. Use any buadrate with 8-bit, No Parity, 1 Stop Bit (8N1) settings. From this point forward, you can run Python code on the MCU! If you want help with learning CircuitPython-specific code or learning Python in general, a good place to start is Adafruit's ["Welcome to CircuitPython"](https://learn.adafruit.com/welcome-to-circuitpython/) guide.
+
+### Editing code.py
+
+Python code may be executed from `code.py` the `CIRCUITPY:` drive. When editing this file, please be aware that some text editors will work better than others. A list of suggested text editors can be found at Adafruit's guide here: https://learn.adafruit.com/welcome-to-circuitpython/recommended-editors
+
+Once you save `code.py`, it gets written back to the device you are running Circuitpython on, and will automatically run and output it's result to the REPL. You can also automatically reload and run code.py any time from the REPL by pressing CTRL+D.
diff --git a/ports/analog/background.c b/ports/analog/background.c
@@ -1,6 +1,7 @@
 // This file is part of the CircuitPython project: https://circuitpython.org
 //
 // SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
 //
 // SPDX-License-Identifier: MIT
 
diff --git a/ports/analog/background.h b/ports/analog/background.h
@@ -1,6 +1,7 @@
 // This file is part of the CircuitPython project: https://circuitpython.org
 //
 // SPDX-FileCopyrightText: Copyright (c) 2019 Dan Halbert for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
 //
 // SPDX-License-Identifier: MIT
 
diff --git a/ports/analog/boards/APARD/README.md b/ports/analog/boards/APARD/README.md
@@ -12,3 +12,25 @@ For more info about AD-APARD32690-SL, visit our product webpages for datasheets,
 
 [AD-APARD32690-SL Product Webpage](https://www.analog.com/en/resources/evaluation-hardware-and-software/evaluation-boards-kits/ad-apard32690-sl.html)
 [AD-APARD32690-SL User Guide](https://wiki.analog.com/resources/eval/user-guides/ad-apard32690-sl)
+
+#### Building for this board
+
+To build for this board, ensure you are in the `ports/analog` directory and run the following command. Note that passing in the `-jN` flag, where N is the # of cores on your machine, can speed up compile times.
+
+```
+make BOARD=APARD
+```
+
+#### Flashing this board
+
+To flash the board, run the following command if using the MAX32625PICO:
+
+```
+make BOARD=APARD flash-msdk
+```
+
+If using Segger JLink, please run the following command instead:
+
+```
+make BOARD=APARD flash-jlink
+```
diff --git a/ports/analog/boards/APARD/board.c b/ports/analog/boards/APARD/board.c
@@ -1,6 +1,6 @@
 // This file is part of the CircuitPython project: https://circuitpython.org
 //
-// SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
 //
 // SPDX-License-Identifier: MIT
 
@@ -26,7 +26,7 @@ const int num_leds = (sizeof(led_pin) / sizeof(mxc_gpio_cfg_t));
 
 // DEFAULT:  Using the weak-defined supervisor/shared/board.c functions
 
-/***** OPTIONAL BOARD-SPECIFIC FUNTIONS from supervisor/board.h *****/
+/***** OPTIONAL BOARD-SPECIFIC FUNCTIONS from supervisor/board.h *****/
 // Returns true if the user initiates safe mode in a board specific way.
 // Also add BOARD_USER_SAFE_MODE in mpconfigboard.h to explain the board specific
 // way.
diff --git a/ports/analog/boards/APARD/mpconfigboard.h b/ports/analog/boards/APARD/mpconfigboard.h
@@ -1,6 +1,7 @@
 // This file is part of the CircuitPython project: https://circuitpython.org
 //
 // SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices Inc.
 //
 // SPDX-License-Identifier: MIT
 
@@ -20,18 +21,18 @@
 #define FLASH_SIZE                  (0x300000) // 3MiB
 #define FLASH_PAGE_SIZE             (0x4000)   // 16384 byte pages (16 KiB)
 
-#define BOARD_HAS_CRYSTAL 1
+#define BOARD_HAS_CRYSTAL           1
+#define NUM_GPIO_PORTS              4
+#define CONSOLE_UART                MXC_UART0
 
-#define NUM_GPIO_PORTS 4
-
-#if INTERNAL_FLASH_FILESYSTEM
-#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_START_ADDR (0x102FC000) // for MAX32690
-#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (64 * 1024)        // 64K
+// #if INTERNAL_FLASH_FILESYSTEM
+#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_START_ADDR (0x102E0000) // for MAX32690
+#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (128 * 1024)        // 64K
 
 #define MAX32_FLASH_SIZE  0x300000 // 3 MiB
-#define INTERNAL_FLASH_FILESYSTEM_SIZE 0x10000 // 64KiB
-#define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x102FC000 // Load into the last MiB of code/data storage
+#define INTERNAL_FLASH_FILESYSTEM_SIZE CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE
+#define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x102E0000 // Load into the last MiB of code/data storage
 
-#else
-#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (0)
-#endif
+// #else
+// #define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (0)
+// #endif
diff --git a/ports/analog/boards/APARD/mpconfigboard.mk b/ports/analog/boards/APARD/mpconfigboard.mk
@@ -1,6 +1,7 @@
 # This file is part of the CircuitPython project: https://circuitpython.org
 #
 # SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
 #
 # SPDX-License-Identifier: MIT
 
diff --git a/ports/analog/boards/APARD/pins.c b/ports/analog/boards/APARD/pins.c
@@ -1,6 +1,7 @@
 // This file is part of the CircuitPython project: https://circuitpython.org
 //
 // SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
 //
 // SPDX-License-Identifier: MIT
 
diff --git a/ports/analog/common-hal/microcontroller/Pin.c b/ports/analog/common-hal/microcontroller/Pin.c
@@ -1,3 +1,8 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
+//
+// SPDX-License-Identifier: MIT
 
 #include <stdbool.h>
 
diff --git a/ports/analog/common-hal/microcontroller/Pin.h b/ports/analog/common-hal/microcontroller/Pin.h
@@ -1,3 +1,8 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
+//
+// SPDX-License-Identifier: MIT
 
 #pragma once
 
diff --git a/ports/analog/common-hal/microcontroller/Processor.c b/ports/analog/common-hal/microcontroller/Processor.c
@@ -1,4 +1,8 @@
-
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
+//
+// SPDX-License-Identifier: MIT
 
 #include <math.h>
 #include "py/runtime.h"
diff --git a/ports/analog/common-hal/microcontroller/__init__.c b/ports/analog/common-hal/microcontroller/__init__.c
@@ -2,6 +2,7 @@
 //
 // SPDX-FileCopyrightText: Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
 // SPDX-FileCopyrightText: Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
 //
 // SPDX-License-Identifier: MIT
 
diff --git a/ports/analog/linking/max32690_cktpy.ld b/ports/analog/linking/max32690_cktpy.ld
@@ -1,9 +1,15 @@
+/** This file is part of the CircuitPython project: https://circuitpython.org
+*
+* SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices Inc.
+*
+* SPDX-License-Identifier: MIT
+*/
+
 MEMORY {
     ROM             (rx) : ORIGIN = 0x00000000,    LENGTH = 128K
     FLASH           (rx) : ORIGIN = 0x10000000,    LENGTH = 3M
     FLASH_FIRMWARE  (rx) : ORIGIN = 0x10000000,    LENGTH = 2992K
-    FLASH_ISR       (rx) : ORIGIN = 0x102EC000,    LENGTH = 16K
-    FLASH_FS        (rx) : ORIGIN = 0x102FC000,    LENGTH = 64K
+    FLASH_FS        (rx) : ORIGIN = 0x102E0000,    LENGTH = 128K
     RAM            (rwx) : ORIGIN = 0x20000000,    LENGTH = 1M
 }
 /* Minimum flash page is 16K */
diff --git a/ports/analog/max32_port.h b/ports/analog/max32_port.h
@@ -1,3 +1,8 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
+//
+// SPDX-License-Identifier: MIT
 
 #ifndef MAX32_PORT_H
 #define MAX32_PORT_H
diff --git a/ports/analog/mpconfigport.mk b/ports/analog/mpconfigport.mk
@@ -1,6 +1,7 @@
 # This file is part of the CircuitPython project: https://circuitpython.org
 #
 # SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
+# SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
 #
 # SPDX-License-Identifier: MIT
 
@@ -14,11 +15,6 @@ INTERNAL_LIBM ?= 1
 CFLAGS += -DHAS_TRNG=1
 
 INTERNAL_FLASH_FILESYSTEM = 1
-SPI_FLASH_FILESYSTEM = 0
-QSPI_FLASH_FILESYSTEM = 0
-
-# TODO: Test/Debug FS
-DISABLE_FILESYSTEM = 0
 
 ####################################################################################
 # Suggested config for first-time porting
diff --git a/ports/analog/mphalport.c b/ports/analog/mphalport.c
@@ -1,3 +1,8 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
+//
+// SPDX-License-Identifier: MIT
 
 #include "mphalport.h"
 #include "py/mphal.h"
diff --git a/ports/analog/mphalport.h b/ports/analog/mphalport.h
@@ -1,6 +1,6 @@
 // This file is part of the CircuitPython project: https://circuitpython.org
 //
-// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
 //
 // SPDX-License-Identifier: MIT
 
diff --git a/ports/analog/peripherals/led.h b/ports/analog/peripherals/led.h
@@ -0,0 +1,5 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
+//
+// SPDX-License-Identifier: MIT
diff --git a/ports/analog/peripherals/max32690/pins.c b/ports/analog/peripherals/max32690/pins.c
@@ -1,3 +1,9 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
+//
+// SPDX-License-Identifier: MIT
+
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "peripherals/pins.h"
diff --git a/ports/analog/peripherals/max32690/pins.h b/ports/analog/peripherals/max32690/pins.h
@@ -1,3 +1,9 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
+//
+// SPDX-License-Identifier: MIT
+
 #pragma once
 
 extern const mcu_pin_obj_t pin_P0_00;
diff --git a/ports/analog/peripherals/pins.h b/ports/analog/peripherals/pins.h
@@ -1,4 +1,8 @@
-
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
+//
+// SPDX-License-Identifier: MIT
 
 #pragma once
 
diff --git a/ports/analog/supervisor/cpu.s b/ports/analog/supervisor/cpu.s
@@ -1,3 +1,10 @@
+// This file is part of the CircuitPython project: https://circuitpython.org
+//
+// SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+// SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc
+//
+// SPDX-License-Identifier: MIT
+
 .syntax unified
 .cpu cortex-m4
 .thumb
diff --git a/ports/analog/supervisor/internal_flash.c b/ports/analog/supervisor/internal_flash.c
diff --git a/ports/analog/supervisor/internal_flash.h b/ports/analog/supervisor/internal_flash.h
diff --git a/ports/analog/supervisor/serial.c b/ports/analog/supervisor/serial.c
diff --git a/ports/analog/supervisor/usb.c b/ports/analog/supervisor/usb.c

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`# This file is part of the CircuitPython project: https://circuitpython.org`
`2`	`2`	`#`
`3`	`3`	`# SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries`
	`4`	`+# SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.`
`4`	`5`	`#`
`5`	`6`	`# SPDX-License-Identifier: MIT`
`6`	`7`