8000 add TG-Watch02A board def · rbrian/circuitpython@50b451a · GitHub
[go: up one dir, main page]
Skip to content

Commit 50b451a

Browse files
TG-TechieTG-Techie
committed
add TG-Watch02A board def
1 parent fec8405 commit 50b451a

File tree

3 files changed

+29
-39
lines changed

3 files changed

+29
-39
lines changed

‎ports/nrf/boards/TG-Watch02A/mpconfigboard.h

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,16 @@
2727

2828
#include "nrfx/hal/nrf_gpio.h"
2929

30-
<<<<<<< HEAD
31-
#define MICROPY_HW_BOARD_NAME "TG-Techie's TG-Watch02A"
32-
#define MICROPY_HW_MCU_NAME "nRF52840"
3330

34-
=======
35-
#define MICROPY_HW_BOARD_NAME "TG-Watch02A-rev00"
31+
#define MICROPY_HW_BOARD_NAME "TG-Techie's TG-Watch02A Rev:00"
3632
#define MICROPY_HW_MCU_NAME "nRF52840"
3733

38-
#define FLASH_SIZE (0x100000)
39-
#define FLASH_PAGE_SIZE (4096)
34+
//#define FLASH_SIZE (0x100000)
35+
//#define FLASH_PAGE_SIZE (4096)
4036

41-
>>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
4237
#define MICROPY_HW_NEOPIXEL (&pin_P0_16)
4338

44-
#define MICROPY_HW_LED_STATUS (&pin_P1_15)
39+
#define MICROPY_HW_LED_STATUS (&pin_P0_07)
4540

4641
#if QSPI_FLASH_FILESYSTEM
4742
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 17)
@@ -59,15 +54,14 @@
5954
#define SPI_FLASH_CS_PIN &pin_P0_20
6055
#endif
6156

62-
<<<<<<< HEAD
63-
=======
57+
/*
6458
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
6559
6660
#define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
6761
6862
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
63+
*/
6964

70-
>>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
7165
#define BOARD_HAS_CRYSTAL 0
7266

7367
#define DEFAULT_I2C_BUS_SCL (&pin_P0_11)

‎ports/nrf/boards/TG-Watch02A/mpconfigboard.mk

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
USB_VID = 0x239A
22
USB_PID = 0x802A
3-
<<<<<<< HEAD
3+
44
USB_PRODUCT = "TG-Watch02A"
55
USB_MANUFACTURER = "TG-Tech"
66

@@ -9,29 +9,29 @@ MCU_CHIP = nrf52840
99
QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICE_COUNT = 2
1111
EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q128JV_SQ"
12-
=======
13-
USB_PRODUCT = "TG-Watch02"
14-
USB_MANUFACTURER = "TG-Tech
1512

16-
MCU_SERIES = m4
17-
MCU_VARIANT = nrf52
18-
MCU_SUB_VARIANT = nrf52840
19-
MCU_CHIP = nrf52840
20-
SD ?= s140
21-
SOFTDEV_VERSION ?= 6.1.0
2213

23-
BOOT_SETTING_ADDR = 0xFF000
14+
#USB_PRODUCT = "TG-Watch02"
15+
#USB_MANUFACTURER = "TG-Tech
2416

25-
ifeq ($(SD),)
26-
LD_FILE = boards/nrf52840_1M_256k.ld
27-
else
28-
LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
29-
CIRCUITPY_BLEIO = 1
30-
endif
17+
#MCU_SERIES = m4
18+
#MCU_VARIANT = nrf52
19+
#MCU_SUB_VARIANT = nrf52840
20+
#MCU_CHIP = nrf52840
21+
#SD ?= s140
22+
#SOFTDEV_VERSION ?= 6.1.0
3123

32-
NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
24+
#BOOT_SETTING_ADDR = 0xFF000
3325

34-
QSPI_FLASH_FILESYSTEM = 1
35-
EXTERNAL_FLASH_DEVICE_COUNT = 1
36-
EXTERNAL_FLASH_DEVICES = "GD25Q16C"
37-
>>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
26+
#ifeq ($(SD),)
27+
# LD_FILE = boards/nrf52840_1M_256k.ld
28+
#else
29+
# LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
30+
# CIRCUITPY_BLEIO = 1
31+
#endif
32+
33+
#NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
34+
35+
#QSPI_FLASH_FILESYSTEM = 1
36+
#EXTERNAL_FLASH_DEVICE_COUNT = 1
37+
#EXTERNAL_FLASH_DEVICES = "GD25Q16C"

‎ports/nrf/boards/TG-Watch02A/pins.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4848
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
4949
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
5050
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
51-
<<<<<<< HEAD
52-
5351
/*TG-Watch02A specific pins*/
5452

5553
//tft / display pins
@@ -74,16 +72,14 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
7472

7573
{ MP_ROM_QSTR(MP_QSTR_ACCEL_INT1), MP_ROM_PTR(&pin_P1_11) },
7674
{ MP_ROM_QSTR(MP_QSTR_ACCEL_INT2), MP_ROM_PTR(&pin_P1_10) },
77-
75+
7876
{ MP_ROM_QSTR(MP_QSTR_HAPTIC_INT), MP_ROM_PTR(&pin_P1_07) },
7977
{ MP_ROM_QSTR(MP_QSTR_HAPTIC_ENABLE), MP_ROM_PTR(&pin_P1_06) },
8078

8179
//smc pins
8280
{ MP_ROM_QSTR(MP_QSTR_SMC_RESET), MP_ROM_PTR(&pin_P0_08) },
8381
{ MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_P1_08) },
8482
{ MP_ROM_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_P1_09) },
85-
=======
86-
>>>>>>> 7198056bc31ebae22337af119c07c7dca03e85d5
8783
};
8884

8985
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)
0