From 155dedb04830bbfb811cea85d2e20ced18c691f8 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Fri, 12 Jul 2024 08:55:57 +0200 Subject: [PATCH 1/4] Add files via upload --- src/boards/t1000_e/board.h | 67 ++++++++++++++++++++++++++++++++++ src/boards/t1000_e/board.mk | 3 ++ src/boards/t1000_e/pinconfig.c | 19 ++++++++++ 3 files changed, 89 insertions(+) create mode 100644 src/boards/t1000_e/board.h create mode 100644 src/boards/t1000_e/board.mk create mode 100644 src/boards/t1000_e/pinconfig.c diff --git a/src/boards/t1000_e/board.h b/src/boards/t1000_e/board.h new file mode 100644 index 00000000..9b532036 --- /dev/null +++ b/src/boards/t1000_e/board.h @@ -0,0 +1,67 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2020 Yihui Xiong for Makerdiary + * + * 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 _T1000_E_H +#define _T1000_E_H + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 1 +#define LED_PRIMARY_PIN _PINNUM(0, 24) // Green +#define LED_STATE_ON 0 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 +#define BUTTON_1 _PINNUM(0, 6) // Primary Button +#define BUTTON_2 _PINNUM(0, 18) // unusable: RESET +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "Seeed Studio" +#define BLEDIS_MODEL "T1000-E" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x2886 +#define USB_DESC_UF2_PID 0x0057 +#define USB_DESC_CDC_ONLY_PID 0x0057 + +//--------------------------------------------------------------------+ +// UF2 +//--------------------------------------------------------------------+ +#define UF2_PRODUCT_NAME "T1000-E" +#define UF2_VOLUME_LABEL "T1000-E" +#define UF2_BOARD_ID "T1000-E" +#define UF2_INDEX_URL "https://www.seeedstudio.com/SenseCAP-Card-Tracker-T1000-E-for-Meshtastic-p-5913.html" + + +#endif /* _T1000_E_H */ diff --git a/src/boards/t1000_e/board.mk b/src/boards/t1000_e/board.mk new file mode 100644 index 00000000..0fa44906 --- /dev/null +++ b/src/boards/t1000_e/board.mk @@ -0,0 +1,3 @@ +MCU_SUB_VARIANT = nrf52840 +SD_VERSION = 7.3.0 + diff --git a/src/boards/t1000_e/pinconfig.c b/src/boards/t1000_e/pinconfig.c new file mode 100644 index 00000000..a983e4ab --- /dev/null +++ b/src/boards/t1000_e/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 4f747e416b9b74e9d43cc8bf1ef3294abc700225 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Fri, 12 Jul 2024 09:02:34 +0200 Subject: [PATCH 2/4] Update board.h --- src/boards/t1000_e/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boards/t1000_e/board.h b/src/boards/t1000_e/board.h index 9b532036..db22150f 100644 --- a/src/boards/t1000_e/board.h +++ b/src/boards/t1000_e/board.h @@ -60,7 +60,7 @@ //--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "T1000-E" #define UF2_VOLUME_LABEL "T1000-E" -#define UF2_BOARD_ID "T1000-E" +#define UF2_BOARD_ID "nRF52840-T1000-E" #define UF2_INDEX_URL "https://www.seeedstudio.com/SenseCAP-Card-Tracker-T1000-E-for-Meshtastic-p-5913.html" From 6b62aacdc9a7773f0c6f83a46700c493c8750d14 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Fri, 12 Jul 2024 09:20:53 +0200 Subject: [PATCH 3/4] Update board.h --- src/boards/t1000_e/board.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boards/t1000_e/board.h b/src/boards/t1000_e/board.h index db22150f..7c4db649 100644 --- a/src/boards/t1000_e/board.h +++ b/src/boards/t1000_e/board.h @@ -58,9 +58,9 @@ //--------------------------------------------------------------------+ // UF2 //--------------------------------------------------------------------+ -#define UF2_PRODUCT_NAME "T1000-E" +#define UF2_PRODUCT_NAME "Seeed T1000-E for Meshtastic" #define UF2_VOLUME_LABEL "T1000-E" -#define UF2_BOARD_ID "nRF52840-T1000-E" +#define UF2_BOARD_ID "Seeed-nRF52840-T1000-E" #define UF2_INDEX_URL "https://www.seeedstudio.com/SenseCAP-Card-Tracker-T1000-E-for-Meshtastic-p-5913.html" From 91fc6735e97d9889cbb3f41795f6d4ada460bcd6 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Fri, 12 Jul 2024 12:34:49 +0200 Subject: [PATCH 4/4] Update board.h --- src/boards/t1000_e/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boards/t1000_e/board.h b/src/boards/t1000_e/board.h index 7c4db649..1a087416 100644 --- a/src/boards/t1000_e/board.h +++ b/src/boards/t1000_e/board.h @@ -60,7 +60,7 @@ //--------------------------------------------------------------------+ #define UF2_PRODUCT_NAME "Seeed T1000-E for Meshtastic" #define UF2_VOLUME_LABEL "T1000-E" -#define UF2_BOARD_ID "Seeed-nRF52840-T1000-E" +#define UF2_BOARD_ID "nRF52840-T1000-E-v1" #define UF2_INDEX_URL "https://www.seeedstudio.com/SenseCAP-Card-Tracker-T1000-E-for-Meshtastic-p-5913.html"