Merge branch 'master' into neighborinfo

.github/ISSUE_TEMPLATE/Bug Report.yml

@@ -37,14 +37,18 @@ body:
  - T-Lora v1
  - T-Lora v1.3
  - T-Lora v2 1.6
+ - T-Deck
  - T-Echo
+ - T-Watch
  - Rak4631
  - Rak11200
  - Rak11310
  - Heltec v1
  - Heltec v2
  - Heltec v2.1
  - Heltec V3
+ - Heltec Wireless Paper
+ - Heltec Wireless Tracker
  - Raspberry Pi Pico (W)
  - Relay v1
  - Relay v2

.github/workflows/main_matrix.yml

@@ -33,6 +33,8 @@ jobs:
  - board: m5stack-coreink
  - board: tbeam-s3-core
  - board: tlora-t3s3-v1
+ - board: t-watch-s3
+ - board: t-deck
  #- board: rak11310
 
  runs-on: ubuntu-latest
@@ -88,6 +90,8 @@ jobs:
  - board: heltec-wireless-paper
  - board: tbeam-s3-core
  - board: tlora-t3s3-v1
+ - board: t-watch-s3
+ - board: t-deck
  uses: ./.github/workflows/build_esp32_s3.yml
  with:
  board: ${{ matrix.board }}
@@ -251,6 +255,7 @@ jobs:
  retention-days: 30
 
  - name: Create request artifacts
+ continue-on-error: true # FIXME: Why are we getting 502, but things still work?
  if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
  uses: gavv/pull-request-artifacts@v1.1.0
  with:

boards/t-watch-s3.json

@@ -0,0 +1,38 @@
+{
+ "build": {
+ "arduino": {
+ "ldscript": "esp32s3_out.ld"
+ },
+ "core": "esp32",
+ "extra_flags": [
+ "-DBOARD_HAS_PSRAM",
+ "-DT_WATCH_S3",
+ "-DARDUINO_USB_CDC_ON_BOOT=1",
+ "-DARDUINO_USB_MODE=0",
+ "-DARDUINO_RUNNING_CORE=1",
+ "-DARDUINO_EVENT_RUNNING_CORE=1"
+ ],
+ "f_cpu": "240000000L",
+ "f_flash": "80000000L",
+ "flash_mode": "dio",
+ "hwids": [["0X303A", "0x1001"]],
+ "mcu": "esp32s3",
+ "variant": "t-watch-s3"
+ },
+ "connectivity": ["wifi"],
+ "debug": {
+ "openocd_target": "esp32s3.cfg"
+ },
+ "frameworks": ["arduino"],
+ "name": "LilyGo T-Watch 2020 V3",
+ "upload": {
+ "flash_size": "8MB",
+ "maximum_ram_size": 327680,
+ "maximum_size": 8388608,
+ "require_upload_port": true,
+ "use_1200bps_touch": true,
+ "wait_for_upload_port": true
+ },
+ "url": "http://www.lilygo.cn/",
+ "vendor": "LilyGo"
+}

platformio.ini

@@ -121,3 +121,4 @@ lib_deps =
  adafruit/Adafruit PM25 AQI Sensor@^1.0.6
  adafruit/Adafruit MPU6050@^2.2.4
  adafruit/Adafruit LIS3DH@^1.2.4
+ https://github.com/lewisxhe/BMA423_Library@^0.0.1

src/AccelerometerThread.h

@@ -6,10 +6,37 @@
 
 #include <Adafruit_LIS3DH.h>
 #include <Adafruit_MPU6050.h>
+#include <Arduino.h>
+#include <Wire.h>
+#include <bma.h>
+
+BMA423 bmaSensor;
+bool BMA_IRQ = false;
 
 #define ACCELEROMETER_CHECK_INTERVAL_MS 100
 #define ACCELEROMETER_CLICK_THRESHOLD 40
 
+uint16_t readRegister(uint8_t address, uint8_t reg, uint8_t *data, uint16_t len)
+{
+ Wire.beginTransmission(address);
+ Wire.write(reg);
+ Wire.endTransmission();
+ Wire.requestFrom((uint8_t)address, (uint8_t)len);
+ uint8_t i = 0;
+ while (Wire.available()) {
+ data[i++] = Wire.read();
+ }
+ return 0; // Pass
+}
+
+uint16_t writeRegister(uint8_t address, uint8_t reg, uint8_t *data, uint16_t len)
+{
+ Wire.beginTransmission(address);
+ Wire.write(reg);
+ Wire.write(data, len);
+ return (0 != Wire.endTransmission());
+}
+
 namespace concurrency
 {
 class AccelerometerThread : public concurrency::OSThread
@@ -29,22 +56,71 @@ class AccelerometerThread : public concurrency::OSThread
  return;
  }
 
- accleremoter_type = type;
+ acceleremoter_type = type;
  LOG_DEBUG("AccelerometerThread initializing\n");
 
- if (accleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.begin(accelerometer_found.address)) {
+ if (acceleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.begin(accelerometer_found.address)) {
  LOG_DEBUG("MPU6050 initializing\n");
  // setup motion detection
  mpu.setHighPassFilter(MPU6050_HIGHPASS_0_63_HZ);
  mpu.setMotionDetectionThreshold(1);
  mpu.setMotionDetectionDuration(20);
  mpu.setInterruptPinLatch(true); // Keep it latched. Will turn off when reinitialized.
  mpu.setInterruptPinPolarity(true);
- } else if (accleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.begin(accelerometer_found.address)) {
+ } else if (acceleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.begin(accelerometer_found.address)) {
  LOG_DEBUG("LIS3DH initializing\n");
  lis.setRange(LIS3DH_RANGE_2_G);
  // Adjust threshold, higher numbers are less sensitive
  lis.setClick(config.device.double_tap_as_button_press ? 2 : 1, ACCELEROMETER_CLICK_THRESHOLD);
+ } else if (acceleremoter_type == ScanI2C::DeviceType::BMA423 && bmaSensor.begin(readRegister, writeRegister, delay)) {
+ LOG_DEBUG("BMA423 initializing\n");
+ Acfg cfg;
+ cfg.odr = BMA4_OUTPUT_DATA_RATE_100HZ;
+ cfg.range = BMA4_ACCEL_RANGE_2G;
+ cfg.bandwidth = BMA4_ACCEL_NORMAL_AVG4;
+ cfg.perf_mode = BMA4_CONTINUOUS_MODE;
+ bmaSensor.setAccelConfig(cfg);
+ bmaSensor.enableAccel();
+
+ struct bma4_int_pin_config pin_config;
+ pin_config.edge_ctrl = BMA4_LEVEL_TRIGGER;
+ pin_config.lvl = BMA4_ACTIVE_HIGH;
+ pin_config.od = BMA4_PUSH_PULL;
+ pin_config.output_en = BMA4_OUTPUT_ENABLE;
+ pin_config.input_en = BMA4_INPUT_DISABLE;
+ // The correct trigger interrupt needs to be configured as needed
+ bmaSensor.setINTPinConfig(pin_config, BMA4_INTR1_MAP);
+
+#ifdef BMA423_INT
+ pinMode(BMA4XX_INT, INPUT);
+ attachInterrupt(
+ BMA4XX_INT,
+ [] {
+ // Set interrupt to set irq value to true
+ BMA_IRQ = true;
+ },
+ RISING); // Select the interrupt mode according to the actual circuit
+#endif
+
+ struct bma423_axes_remap remap_data;
+ remap_data.x_axis = 0;
+ remap_data.x_axis_sign = 1;
+ remap_data.y_axis = 1;
+ remap_data.y_axis_sign = 0;
+ remap_data.z_axis = 2;
+ remap_data.z_axis_sign = 1;
+ // Need to raise the wrist function, need to set the correct axis
+ bmaSensor.setRemapAxes(&remap_data);
+ // sensor.enableFeature(BMA423_STEP_CNTR, true);
+ bmaSensor.enableFeature(BMA423_TILT, true);
+ bmaSensor.enableFeature(BMA423_WAKEUP, true);
+ // sensor.resetStepCounter();
+
+ // Turn on feature interrupt
+ bmaSensor.enableStepCountInterrupt();
+ bmaSensor.enableTiltInterrupt();
+ // It corresponds to isDoubleClick interrupt
+ bmaSensor.enableWakeupInterrupt();
  }
  }
 
@@ -53,9 +129,9 @@ class AccelerometerThread : public concurrency::OSThread
  {
  canSleep = true; // Assume we should not keep the board awake
 
- if (accleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.getMotionInterruptStatus()) {
+ if (acceleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.getMotionInterruptStatus()) {
  wakeScreen();
- } else if (accleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.getClick() > 0) {
+ } else if (acceleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.getClick() > 0) {
  uint8_t click = lis.getClick();
  if (!config.device.double_tap_as_button_press) {
  wakeScreen();
@@ -65,7 +141,13 @@ class AccelerometerThread : public concurrency::OSThread
  buttonPress();
  return 500;
  }
+ } else if (acceleremoter_type == ScanI2C::DeviceType::BMA423 && bmaSensor.getINT()) {
+ if (bmaSensor.isTilt() || bmaSensor.isDoubleClick()) {
+ wakeScreen();
+ return 500;
+ }
  }
+
  return ACCELEROMETER_CHECK_INTERVAL_MS;
  }
 
@@ -84,9 +166,9 @@ class AccelerometerThread : public concurrency::OSThread
  powerFSM.trigger(EVENT_PRESS);
  }
 
- ScanI2C::DeviceType accleremoter_type;
+ ScanI2C::DeviceType acceleremoter_type;
  Adafruit_MPU6050 mpu;
  Adafruit_LIS3DH lis;
 };
 
-} // namespace concurrency
+} // namespace concurrency

src/ButtonThread.h

@@ -4,6 +4,7 @@
 #include "concurrency/OSThread.h"
 #include "configuration.h"
 #include "graphics/Screen.h"
+#include "main.h"
 #include "power.h"
 #include <OneButton.h>
 
@@ -100,6 +101,21 @@ class ButtonThread : public concurrency::OSThread
 #endif
  // if (!canSleep) LOG_DEBUG("Suppressing sleep!\n");
  // else LOG_DEBUG("sleep ok\n");
+#if defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
+ int x, y = 0;
+ screen->getTouch(&x, &y);
+ if (x > 0 && y > 0) {
+#ifdef T_WATCH_S3
+ drv.setWaveform(0, 75);
+ drv.setWaveform(1, 0); // end waveform
+ drv.go();
+#endif
+ LOG_DEBUG("touch %d %d\n", x, y);
+ powerFSM.trigger(EVENT_PRESS);
+ return 150; // Check for next touch every in 150ms
+ }
+
+#endif
 
  return 5;
  }

src/Power.cpp

@@ -540,10 +540,12 @@ int32_t Power::runOnce()
  LOG_DEBUG("Battery removed\n");
  }
  */
+#ifndef T_WATCH_S3 // FIXME - why is this triggering on the T-Watch S3?
  if (PMU->isPekeyLongPressIrq()) {
  LOG_DEBUG("PEK long button press\n");
  screen->setOn(false);
  }
+#endif
 
  PMU->clearIrqStatus();
  }
@@ -681,7 +683,8 @@ bool Power::axpChipInit()
  // GNSS VDD 3300mV
  PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300);
  PMU->enablePowerOutput(XPOWERS_ALDO3);
- } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
+ } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE ||
+ HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
  // t-beam s3 core
  /**
  * gnss module power channel
@@ -716,6 +719,12 @@ bool Power::axpChipInit()
  PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
  PMU->enablePowerOutput(XPOWERS_BLDO1);
 
+#ifdef T_WATCH_S3
+ // DRV2605 power channel
+ PMU->setPowerChannelVoltage(XPOWERS_BLDO2, 3300);
+ PMU->enablePowerOutput(XPOWERS_BLDO2);
+#endif
+
  // PMU->setPowerChannelVoltage(XPOWERS_DCDC4, 3300);
  // PMU->enablePowerOutput(XPOWERS_DCDC4);
 

src/configuration.h

@@ -123,6 +123,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 #define MPU6050_ADDR 0x68
 #define LIS3DH_ADR 0x18
+#define BMA423_ADDR 0x19
 
 // -----------------------------------------------------------------------------
 // LED
@@ -193,4 +194,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef HW_VENDOR
 #error HW_VENDOR must be defined
-#endif
+#endif

src/detect/ScanI2C.cpp

@@ -36,8 +36,8 @@ ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
 {
- ScanI2C::DeviceType types[] = {MPU6050, LIS3DH};
- return firstOfOrNONE(2, types);
+ ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423};
+ return firstOfOrNONE(3, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const
@@ -73,4 +73,4 @@ bool ScanI2C::DeviceAddress::operator<(const ScanI2C::DeviceAddress &other) cons
  || (port != NO_I2C && other.port != NO_I2C && (address < other.address));
 }
 
-ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}
+ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}

src/detect/ScanI2C.h

@@ -33,6 +33,7 @@ class ScanI2C
  PMSA0031,
  MPU6050,
  LIS3DH,
+ BMA423,
 #ifdef HAS_NCP5623
  NCP5623,
 #endif

src/detect/ScanI2CTwoWire.cpp

@@ -274,6 +274,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
 
  SCAN_SIMPLE_CASE(PMSA0031_ADDR, PMSA0031, "PMSA0031 air quality sensor found\n")
  SCAN_SIMPLE_CASE(MPU6050_ADDR, MPU6050, "MPU6050 accelerometer found\n");
+ SCAN_SIMPLE_CASE(BMA423_ADDR, BMA423, "BMA423 accelerometer found\n");
 
  default:
  LOG_INFO("Device found at address 0x%x was not able to be enumerated\n", addr.address);

src/graphics/Screen.cpp

@@ -944,6 +944,9 @@ void Screen::handleSetOn(bool on)
  if (on != screenOn) {
  if (on) {
  LOG_INFO("Turning on screen\n");
+#ifdef T_WATCH_S3
+ PMU->enablePowerOutput(XPOWERS_ALDO2);
+#endif
  dispdev.displayOn();
  dispdev.displayOn();
  enabled = true;
@@ -952,6 +955,9 @@ void Screen::handleSetOn(bool on)
  } else {
  LOG_INFO("Turning off screen\n");
  dispdev.displayOff();
+#ifdef T_WATCH_S3
+ PMU->disablePowerOutput(XPOWERS_ALDO2);
+#endif
  enabled = false;
  }
  screenOn = on;