Merge pull request adafruit#3991 from TG-Techie/main

Revision to TG-Watch

Author: dhalbert

.github/workflows/build.yml

@@ -176,7 +176,7 @@ jobs:
  board:
  - "8086_commander"
  - "ADM_B_NRF52840_1"
- - "TG-Watch02A"
+ - "TG-Watch"
  - "aloriumtech_evo_m51"
  - "aramcon_badge_2019"
  - "arduino_mkr1300"

.gitmodules

@@ -156,3 +156,18 @@
 [submodule "ports/esp32s2/certificates/nina-fw"]
 path = ports/esp32s2/certificates/nina-fw
 url = https://github.com/adafruit/nina-fw.git
+[submodule "frozen/Adafruit_CircuitPython_ST7789"]
+path = frozen/Adafruit_CircuitPython_ST7789
+url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
+[submodule "frozen/Adafruit_CircuitPython_Display_Shapes"]
+path = frozen/Adafruit_CircuitPython_Display_Shapes
+url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Shapes
+[submodule "frozen/Adafruit_CircuitPython_Display_Text"]
+path = frozen/Adafruit_CircuitPython_Display_Text
+url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Text
+[submodule "frozen/Adafruit_CircuitPython_ProgressBar"]
+path = frozen/Adafruit_CircuitPython_ProgressBar
+url = https://github.com/adafruit/Adafruit_CircuitPython_ProgressBar
+[submodule "frozen/Adafruit_CircuitPython_LC709203F"]
+path = frozen/Adafruit_CircuitPython_LC709203F
+url = https://github.com/adafruit/Adafruit_CircuitPython_LC709203F

frozen/Adafruit_CircuitPython_Display_Shapes

@@ -27,10 +27,15 @@
 
 #include "nrfx/hal/nrf_gpio.h"
 
-#define MICROPY_HW_BOARD_NAME "TG-Techie's TG-Watch02A"
+#define MICROPY_HW_BOARD_NAME "TG-Watch"
 #define MICROPY_HW_MCU_NAME "nRF52840"
 
-#define MICROPY_HW_LED_STATUS (&pin_P0_07)
+#define MICROPY_HW_NEOPIXEL (&pin_P0_16)
+#define MICROPY_HW_LED_STATUS (&pin_P1_15)
+
+// TG-Gui requires a deeper call stack than normal CircuitPython
+#define CIRCUITPY_PYSTACK_SIZE 8192 // 1536 is the normal size, (32 bytes/frame * 48 frames)
+#define BOARD_HAS_CRYSTAL 0
 
 #if QSPI_FLASH_FILESYSTEM
 #define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 17)
@@ -48,8 +53,6 @@
 #define SPI_FLASH_CS_PIN &pin_P0_20
 #endif
 
-#define BOARD_HAS_CRYSTAL 0
-
 #define DEFAULT_I2C_BUS_SCL (&pin_P0_11)
 #define DEFAULT_I2C_BUS_SDA (&pin_P0_12)
 

frozen/Adafruit_CircuitPython_Display_Text

@@ -1,7 +1,7 @@
 USB_VID = 0x239A
 USB_PID = 0x80DB
-USB_PRODUCT = "TG-Watch02A"
-USB_MANUFACTURER = "TG-Tech"
+USB_PRODUCT = "TG-Watch"
+USB_MANUFACTURER = "TG-Techie"
 
 MCU_CHIP = nrf52840
 
@@ -11,9 +11,14 @@ EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q128JV_SQ"
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ST7789
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ProgressBar
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LSM6DS
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FocalTouch
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DS3231
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LC709203F
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DRV2605
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center