From d6bef02793926baea41271c2c796b7da0a95d2a0 Mon Sep 17 00:00:00 2001
From: Charles <hallard04@free.fr>
Date: Thu, 15 Feb 2024 18:13:27 +0100
Subject: [PATCH 1/2] Added WisCore RAK4631

---
 src/boards/wiscore_rak4631/board.h     | 68 ++++++++++++++++++++++++++
 src/boards/wiscore_rak4631/board.mk    |  1 +
 src/boards/wiscore_rak4631/pinconfig.c | 19 +++++++
 3 files changed, 88 insertions(+)
 create mode 100644 src/boards/wiscore_rak4631/board.h
 create mode 100644 src/boards/wiscore_rak4631/board.mk
 create mode 100644 src/boards/wiscore_rak4631/pinconfig.c

diff --git a/src/boards/wiscore_rak4631/board.h b/src/boards/wiscore_rak4631/board.h
new file mode 100644
index 00000000..7886cc33
--- /dev/null
+++ b/src/boards/wiscore_rak4631/board.h
@@ -0,0 +1,68 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Ha Thach 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.
+ */
+
+#ifndef _WISCORE_RAK4631_BOARD_H
+#define _WISCORE_RAK4631_BOARD_H
+
+// change default 1.8v to 3.3v, add by taylor
+#define UICR_REGOUT0_VALUE UICR_REGOUT0_VOUT_3V3
+
+#define _PINNUM(port, pin)    ((port)*32 + (pin))
+
+/*------------------------------------------------------------------*/
+/* LED
+ *------------------------------------------------------------------*/
+#define LEDS_NUMBER           2
+#define LED_PRIMARY_PIN       _PINNUM(1, 3)
+#define LED_SECONDARY_PIN     _PINNUM(1, 4)
+#define LED_STATE_ON          1
+
+/*------------------------------------------------------------------*/
+/* BUTTON
+ *------------------------------------------------------------------*/
+#define BUTTONS_NUMBER        2
+#define BUTTON_1              _PINNUM(0, 8)	// change default 0.0 to 0.8, add by Michael. This pin is not connected on 4631. 
+#define BUTTON_2              _PINNUM(0, 8)	// change default 0.0 to 0.8, add by Michael. This pin is not connected on 4631. 
+#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
+
+//--------------------------------------------------------------------+
+// BLE OTA
+//--------------------------------------------------------------------+
+#define BLEDIS_MANUFACTURER   "RAKWireless"
+#define BLEDIS_MODEL          "WisBlock RAK4631"
+
+//--------------------------------------------------------------------+
+// USB
+//--------------------------------------------------------------------+
+#define USB_DESC_VID           0x239A
+#define USB_DESC_UF2_PID       0x0029
+#define USB_DESC_CDC_ONLY_PID  0x002A
+
+//------------- UF2 -------------//
+#define UF2_PRODUCT_NAME      "WisBlock RAK4631 Board"
+#define UF2_VOLUME_LABEL      "RAK4631"
+#define UF2_BOARD_ID          "WisBlock-RAK4631-Board"
+#define UF2_INDEX_URL         "https://store.rakwireless.com/collections/wisblock-core"
+
+#endif // _WISCORE_RAK4631_BOARD_H
diff --git a/src/boards/wiscore_rak4631/board.mk b/src/boards/wiscore_rak4631/board.mk
new file mode 100644
index 00000000..9d29ac69
--- /dev/null
+++ b/src/boards/wiscore_rak4631/board.mk
@@ -0,0 +1 @@
+MCU_SUB_VARIANT = nrf52840
diff --git a/src/boards/wiscore_rak4631/pinconfig.c b/src/boards/wiscore_rak4631/pinconfig.c
new file mode 100644
index 00000000..a983e4ab
--- /dev/null
+++ b/src/boards/wiscore_rak4631/pinconfig.c
@@ -0,0 +1,19 @@
+#include "boards.h"
+#include "uf2/configkeys.h"
+
+__attribute__((used, section(".bootloaderConfig")))
+const uint32_t bootloaderConfig[] =
+{
+  /* CF2 START */
+  CFG_MAGIC0, CFG_MAGIC1,                       // magic
+  5, 100,                                       // used entries, total entries
+
+  204, 0x100000,                                // FLASH_BYTES = 0x100000
+  205, 0x40000,                                 // RAM_BYTES = 0x40000
+  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
+  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
+  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
+
+  0, 0, 0, 0, 0, 0, 0, 0
+  /* CF2 END */
+};

From b3641ae0284d3f02f935c02e1f5d23cc6a15706c Mon Sep 17 00:00:00 2001
From: Charles <hallard04@free.fr>
Date: Thu, 15 Feb 2024 18:18:21 +0100
Subject: [PATCH 2/2] added wiscore_rak4631 to ci

---
 .github/workflows/githubci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml
index 5d8b275a..00d82de0 100644
--- a/.github/workflows/githubci.yml
+++ b/.github/workflows/githubci.yml
@@ -60,6 +60,7 @@ jobs:
           - 'raytac_mdbt50q_rx'
           - 'sparkfun_nrf52840_micromod'
           - 'waveshare_nrf52840_eval'
+          - 'wiscore_rak4631'
           - 'xiao_nrf52840_ble'
           - 'xiao_nrf52840_ble_sense'