From c919e9c2cc9767f0936e571e97fe9751c55cf692 Mon Sep 17 00:00:00 2001
From: BigTuna94 <zach.richard94@gmail.com>
Date: Mon, 14 Mar 2022 21:02:14 -0400
Subject: [PATCH 1/4] fix duplicate reference names for DSN export

---
 .../boards/zrichard_rp2.65-f/board.c          | 45 +++++++++++++++++++
 .../boards/zrichard_rp2.65-f/mpconfigboard.h  |  4 ++
 .../boards/zrichard_rp2.65-f/mpconfigboard.mk | 13 ++++++
 .../zrichard_rp2.65-f/pico-sdk-configboard.h  |  4 ++
 .../boards/zrichard_rp2.65-f/pins.c           | 32 +++++++++++++
 5 files changed, 98 insertions(+)
 create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/board.c
 create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h
 create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
 create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h
 create mode 100644 ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c

diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c b/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c
new file mode 100644
index 000000000000..635e767a8fd6
--- /dev/null
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/board.c
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/board.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "supervisor/shared/board.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+    // turn off any left over LED
+    board_reset_user_neopixels(&pin_GPIO25, 62);
+}
+
+void board_deinit(void) {
+}
diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h
new file mode 100644
index 000000000000..5acfceba9df1
--- /dev/null
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.h
@@ -0,0 +1,4 @@
+#define MICROPY_HW_BOARD_NAME "RP2.65-F"
+#define MICROPY_HW_MCU_NAME "rp2040"
+
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO25)
diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
new file mode 100644
index 000000000000..79970a1a1b0d
--- /dev/null
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
@@ -0,0 +1,13 @@
+# ZR 6F
+USB_VID = 0x5a52
+USB_PID = 0x3646
+
+USB_PRODUCT = "RP2.65-F"
+USB_MANUFACTURER = "ZRichard"
+
+CHIP_VARIANT = RP2040
+CHIP_FAMILY = rp2
+
+EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ,W25Q128JVxQ"
+
+CIRCUITPY__EVE = 1
diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h b/ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h
new file mode 100644
index 000000000000..a41131dd22b7
--- /dev/null
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/pico-sdk-configboard.h
@@ -0,0 +1,4 @@
+// Put board-specific pico-sdk definitions here. This file must exist.
+
+// Allow extra time for xosc to start.
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c b/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c
new file mode 100644
index 000000000000..02c69c014f56
--- /dev/null
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c
@@ -0,0 +1,32 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    { MP_ROM_QSTR(MP_QSTR_ROW0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_COL0), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_ROW1), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_ROW2), MP_ROM_PTR(&pin_GPIO4) },
+    { MP_ROM_QSTR(MP_QSTR_COL2), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_ROW3), MP_ROM_PTR(&pin_GPIO6) },
+    { MP_ROM_QSTR(MP_QSTR_COL3), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_ROW4), MP_ROM_PTR(&pin_GPIO8) },
+    { MP_ROM_QSTR(MP_QSTR_COL4), MP_ROM_PTR(&pin_GPIO9) },
+    { MP_ROM_QSTR(MP_QSTR_ROW5), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_COL5), MP_ROM_PTR(&pin_GPIO11) },
+    { MP_ROM_QSTR(MP_QSTR_ROW6), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_COL6), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_ROW7), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_COL7), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_ROW8), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_ROW9), MP_ROM_PTR(&pin_GPIO17) },
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
+
+    { MP_ROM_QSTR(MP_QSTR_RV1), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_RV2), MP_ROM_PTR(&pin_GPIO28) },
+    { MP_ROM_QSTR(MP_QSTR_RV3), MP_ROM_PTR(&pin_GPIO29) },
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

From dd933c7d0638d9d42cdeea886e4a7274fbe1f943 Mon Sep 17 00:00:00 2001
From: BigTuna94 <zach.richard94@gmail.com>
Date: Wed, 30 Mar 2022 09:17:26 -0400
Subject: [PATCH 2/4] add NeoPixel lib to firmware

---
 ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
index 79970a1a1b0d..65fc82f7ff49 100644
--- a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
@@ -11,3 +11,6 @@ CHIP_FAMILY = rp2
 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ,W25Q128JVxQ"
 
 CIRCUITPY__EVE = 1
+
+
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

From 01cff3c4f8e7f43b84eba74213549a1f3be17f4a Mon Sep 17 00:00:00 2001
From: BigTuna94 <zach.richard94@gmail.com>
Date: Sun, 10 Apr 2022 14:10:07 -0400
Subject: [PATCH 3/4] add MIDI to frozen libs

---
 ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
index 65fc82f7ff49..6614b75fe346 100644
--- a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
@@ -14,3 +14,4 @@ CIRCUITPY__EVE = 1
 
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_MIDI

From a23ede8bc450632d6160707b3def344b03e25993 Mon Sep 17 00:00:00 2001
From: Zach Richard <Zach.Richard94@gmail.com>
Date: Mon, 2 May 2022 19:49:30 -0400
Subject: [PATCH 4/4] update USB VID/PID codes to match pidcodes request

---
 ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
index 6614b75fe346..4cba650ec462 100644
--- a/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/mpconfigboard.mk
@@ -1,6 +1,6 @@
-# ZR 6F
-USB_VID = 0x5a52
-USB_PID = 0x3646
+# pid.codes ZR
+USB_VID = 0x1209
+USB_PID = 0x5a52
 
 USB_PRODUCT = "RP2.65-F"
 USB_MANUFACTURER = "ZRichard"