8000 Merge pull request #3991 from TG-Techie/main · rpavlik/circuitpython@c4f0325 · GitHub
[go: up one dir, main page]
Skip to content

Commit c4f0325

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#3991 from TG-Techie/main
Revision to TG-Watch
2 parents 8c0a9a2 + c63d5a4 commit c4f0325

12 files changed

+109
-58
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
board:
177177
- "8086_commander"
178178
- "ADM_B_NRF52840_1"
179-
- "TG-Watch02A"
179+
- "TG-Watch"
180180
- "aloriumtech_evo_m51"
181181
- "aramcon_badge_2019"
182182
- "arduino_mkr1300"

‎.gitmodules

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,18 @@
156156
[submodule "ports/esp32s2/certificates/nina-fw"]
157157
path = ports/esp32s2/certificates/nina-fw
158158
url = https://github.com/adafruit/nina-fw.git
159+
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
160+
path = frozen/Adafruit_CircuitPython_ST7789
161+
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
162+
[submodule "frozen/Adafruit_CircuitPython_Display_Shapes"]
163+
path = frozen/Adafruit_CircuitPython_Display_Shapes
164+
url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Shapes
165+
[submodule "frozen/Adafruit_CircuitPython_Display_Text"]
166+
path = frozen/Adafruit_CircuitPython_Display_Text
167+
url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Text
168+
[submodule "frozen/Adafruit_CircuitPython_ProgressBar"]
169+
path = frozen/Adafruit_CircuitPython_ProgressBar
170+
url = https://github.com/adafruit/Adafruit_CircuitPython_ProgressBar
171+
[submodule "frozen/Adafruit_CircuitPython_LC709203F"]
172+
path = frozen/Adafruit_CircuitPython_LC709203F
173+
url = https://github.com/adafruit/Adafruit_CircuitPython_LC709203F

‎frozen/Adafruit_CircuitPython_Display_Shapes

‎frozen/Adafruit_CircuitPython_Display_Text

‎frozen/Adafruit_CircuitPython_LC709203F

‎frozen/Adafruit_CircuitPython_ProgressBar

‎frozen/Adafruit_CircuitPython_ST7789

‎ports/nrf/boards/TG-Watch02A/board.c renamed to ‎ports/nrf/boards/TG-Watch/board.c

File renamed without changes.

‎ports/nrf/boards/TG-Watch02A/mpconfigboard.h 8000 renamed to ‎ports/nrf/boards/TG-Watch/mpconfigboard.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,15 @@
2727

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

30-
#define MICROPY_HW_BOARD_NAME "TG-Techie's TG-Watch02A"
30+
#define MICROPY_HW_BOARD_NAME "TG-Watch"
3131
#define MICROPY_HW_MCU_NAME "nRF52840"
3232

33-
#define MICROPY_HW_LED_STATUS (&pin_P0_07)
33+
#define MICROPY_HW_NEOPIXEL (&pin_P0_16)
34+
#define MICROPY_HW_LED_STATUS (&pin_P1_15)
35+
36+
// TG-Gui requires a deeper call stack than normal CircuitPython
37+
#define CIRCUITPY_PYSTACK_SIZE 8192 // 1536 is the normal size, (32 bytes/frame * 48 frames)
38+
#define BOARD_HAS_CRYSTAL 0
3439

3540
#if QSPI_FLASH_FILESYSTEM
3641
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 17)
@@ -48,8 +53,6 @@
4853
#define SPI_FLASH_CS_PIN &pin_P0_20
4954
#endif
5055

51-
#define BOARD_HAS_CRYSTAL 0
52-
5356
#define DEFAULT_I2C_BUS_SCL (&pin_P0_11)
5457
#define DEFAULT_I2C_BUS_SDA (&pin_P0_12)
5558

‎ports/nrf/boards/TG-Watch02A/mpconfigboard.mk renamed to ‎ports/nrf/boards/TG-Watch/mpconfigboard.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
USB_VID = 0x239A
22
USB_PID = 0x80DB
3-
USB_PRODUCT = "TG-Watch02A"
4-
USB_MANUFACTURER = "TG-Tech"
3+
USB_PRODUCT = "TG-Watch"
4+
USB_MANUFACTURER = "TG-Techie"
55

66
MCU_CHIP = nrf52840
77

@@ -11,9 +11,14 @@ EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q128JV_SQ"
1111

1212
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
1313
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
14+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ST7789
15+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes
16+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
17+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ProgressBar
1418
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS
1519
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FocalTouch
1620
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DS3231
21+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LC709203F
1722
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DRV2605
1823
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
1924
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center

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

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
5+
/* default ports */
6+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
7+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
8+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
9+
10+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_14) },
11+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_13) },
12+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_15) },
13+
14+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_25) },
15+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_24) },
16+
17+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_11) },
18+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_12) },
19+
20+
/* TG-Watch specific pins */
21+
{ MP_ROM_QSTR(MP_QSTR_VBUS_PRESENT), MP_ROM_PTR(&pin_P1_04) },
22+
{ MP_ROM_QSTR(MP_QSTR_HAPTIC_ENABLE), MP_ROM_PTR(&pin_P1_06) },
23+
{ MP_ROM_QSTR(MP_QSTR_HAPTIC_INT), MP_ROM_PTR(&pin_P1_07) },
24+
{ MP_ROM_QSTR(MP_QSTR_CTP_INT), MP_ROM_PTR(&pin_P1_05) },
25+
{ MP_ROM_QSTR(MP_QSTR_CTP_RST), MP_ROM_PTR(&pin_P1_03) },
26+
{ MP_ROM_QSTR(MP_QSTR_TFT_RST), MP_ROM_PTR(&pin_P1_01) },
27+
28+
{ MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_P1_12) },
29+
{ MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_P1_13) },
30+
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_P1_14) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_ACCEL_INT1), MP_ROM_PTR(&pin_P1_11) },
33+
{ MP_ROM_QSTR(MP_QSTR_ACCEL_INT2), MP_ROM_PTR(&pin_P1_10) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_BATTERY_DIV), MP_ROM_PTR(&pin_P0_29) },
36+
37+
{ MP_ROM_QSTR(MP_QSTR_RTC_INT), MP_ROM_PTR(&pin_P0_27) },
38+
{ MP_ROM_QSTR(MP_QSTR_RTC_RST), MP_ROM_PTR(&pin_P0_26) },
39+
{ MP_ROM_QSTR(MP_QSTR_CHRG_STAT), MP_ROM_PTR(&pin_P0_06) },
40+
{ MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_P0_07) },
41+
{ MP_ROM_QSTR(MP_QSTR_BAT_INT), MP_ROM_PTR(&pin_P0_08) },
42+
{ MP_ROM_QSTR(MP_QSTR_SMC_RST), MP_ROM_PTR(&pin_P0_04) },
43+
44+
/* nrf52840 compatible pins */
45+
{ MP_ROM_QSTR(MP_QSTR__A0), MP_ROM_PTR(&pin_P0_04) },
46+
{ MP_ROM_QSTR(MP_QSTR__A1), MP_ROM_PTR(&pin_P0_05) },
47+
{ MP_ROM_QSTR(MP_QSTR__A2), MP_ROM_PTR(&pin_P0_30) },
48+
{ MP_ROM_QSTR(MP_QSTR__A3), MP_ROM_PTR(&pin_P0_28) },
49+
{ MP_ROM_QSTR(MP_QSTR__A4), MP_ROM_PTR(&pin_P0_02) },
50+
{ MP_ROM_QSTR(MP_QSTR__A5), MP_ROM_PTR(&pin_P0_03) },
51+
52+
{ MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_P0_31) },
53+
54+
{ MP_ROM_QSTR(MP_QSTR__VOLTAGE_MONITOR), MP_ROM_PTR(&pin_P0_29) },
55+
{ MP_ROM_QSTR(MP_QSTR__BATTERY), MP_ROM_PTR(&pin_P0_29) },
56+
57+
{ MP_ROM_QSTR(MP_QSTR__SWITCH), MP_ROM_PTR(&pin_P1_02) },
58+
59+
{ MP_ROM_QSTR(MP_QSTR__NFC1), MP_ROM_PTR(&pin_P0_09) },
60+
{ MP_ROM_QSTR(MP_QSTR__NFC2), MP_ROM_PTR(&pin_P0_10) },
61+
62+
{ MP_ROM_QSTR(MP_QSTR__D2), MP_ROM_PTR(&pin_P0_10) },
63+
{ MP_ROM_QSTR(MP_QSTR__D5), MP_ROM_PTR(&pin_P1_08) },
64+
{ MP_ROM_QSTR(MP_QSTR__D6), MP_ROM_PTR(&pin_P0_07) },
65+
{ MP_ROM_QSTR(MP_QSTR__D9), MP_ROM_PTR(&pin_P0_26) },
66+
{ MP_ROM_QSTR(MP_QSTR__D10), MP_ROM_PTR(&pin_P0_27) },
67+
{ MP_ROM_QSTR(MP_QSTR__D11), MP_ROM_PTR(&pin_P0_06) },
68+
{ MP_ROM_QSTR(MP_QSTR__D12), MP_ROM_PTR(&pin_P0_08) },
69+
{ MP_ROM_QSTR(MP_QSTR__D13), MP_ROM_PTR(&pin_P1_09) },
70+
71+
{ MP_ROM_QSTR(MP_QSTR__NEOPIXEL), MP_ROM_PTR(&pin_P0_16) },
72+
};
73+
74+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

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

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0