+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS 48
+#define NUM_ANALOG_INPUTS 20
+
+#define analogInputToDigitalPin(p) (((p) < NUM_ANALOG_INPUTS) ? (analogChannelToDigitalPin(p)) : -1)
+#define digitalPinToInterrupt(p) (((p) < NUM_DIGITAL_PINS) ? (p) : -1)
+#define digitalPinHasPWM(p) (p < EXTERNAL_NUM_INTERRUPTS)
+
+// static const uint8_t LED_BUILTIN = -1;
+
+// static const uint8_t TX = 43;
+// static const uint8_t RX = 44;
+
+static const uint8_t SDA = 10;
+static const uint8_t SCL = 11;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 5;
+static const uint8_t MOSI = 1;
+static const uint8_t MISO = 4;
+static const uint8_t SCK = 3;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */
\ No newline at end of file
diff --git a/variants/t-watch-s3/platformio.ini b/variants/t-watch-s3/platformio.ini
new file mode 100644
index 000000000..709ea89ee
--- /dev/null
+++ b/variants/t-watch-s3/platformio.ini
@@ -0,0 +1,17 @@
+; LilyGo T-Watch S3
+[env:t-watch-s3]
+extends = esp32s3_base
+board = t-watch-s3
+upload_protocol = esptool
+upload_speed = 115200
+#upload_port = /dev/tty.usbmodem3485188D636C1
+
+build_flags = ${esp32_base.build_flags}
+ -DT_WATCH_S3
+ -Ivariants/t-watch-s3
+ -DPCF8563_RTC=0x51
+
+lib_deps = ${esp32s3_base.lib_deps}
+ lovyan03/LovyanGFX@^1.1.7
+ lewisxhe/PCF8563_Library@1.0.1
+ adafruit/Adafruit DRV2605 Library@^1.2.2
\ No newline at end of file
diff --git a/variants/t-watch-s3/variant.h b/variants/t-watch-s3/variant.h
new file mode 100644
index 000000000..652696c3f
--- /dev/null
+++ b/variants/t-watch-s3/variant.h
@@ -0,0 +1,64 @@
+// ST7789 TFT LCD
+#define ST7789_CS 12
+#define ST7789_RS 38 // DC
+#define ST7789_SDA 13 // MOSI
+#define ST7789_SCK 18
+#define ST7789_RESET -1
+#define ST7789_MISO -1
+#define ST7789_BUSY -1
+#define ST7789_BL 45
+#define ST7789_SPI_HOST SPI3_HOST
+#define ST7789_BACKLIGHT_EN 45
+#define SPI_FREQUENCY 40000000
+#define SPI_READ_FREQUENCY 16000000
+#define TFT_HEIGHT 240
+#define TFT_WIDTH 240
+#define TFT_OFFSET_X 0
+#define TFT_OFFSET_Y 0
+#define SCREEN_ROTATE
+#define SCREEN_TRANSITION_FRAMERATE 1 // fps
+#define SCREEN_TOUCH_INT 16
+#define SCREEN_TOUCH_USE_I2C1 1
+#define TOUCH_SLAVE_ADDRESS 0x38 // GT911
+
+#define I2C_SDA1 39 // Used for capacitive touch
+#define I2C_SCL1 40 // Used for capacitive touch
+
+#define TFT_BL ST7789_BACKLIGHT_EN
+
+#define HAS_AXP2101
+
+#define HAS_RTC 1
+
+#define I2C_SDA 10 // For QMC6310 sensors and screens
+#define I2C_SCL 11 // For QMC6310 sensors and screens
+
+#define BUTTON_PIN 0
+
+#define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor
+
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define USE_SX1262
+#define USE_SX1268
+
+#define RF95_SCK 3
+#define RF95_MISO 4
+#define RF95_MOSI 1
+#define RF95_NSS 5
+
+#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_RESET 8
+#define LORA_DIO1 9 // SX1262 IRQ
+#define LORA_DIO2 7 // SX1262 BUSY
+#define LORA_DIO3 // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
+
+#define SX126X_CS RF95_NSS // FIXME - we really should define LORA_CS instead
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22 // Not really an E22 but TTGO seems to be trying to clone that
+ // Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for
+ // the sx1262interface code)
\ No newline at end of file
diff --git a/variants/tbeam-s3-core/variant.h b/variants/tbeam-s3-core/variant.h
index 69f639de8..532b5b85c 100644
--- a/variants/tbeam-s3-core/variant.h
+++ b/variants/tbeam-s3-core/variant.h
@@ -39,6 +39,8 @@
// #define PMU_IRQ 40
#define HAS_AXP2101
+#define HAS_RTC 1
+
// Specify the PMU as Wire1. In the t-beam-s3 core, PCF8563 and PMU share the bus
#define PMU_USE_WIRE1
#define RTC_USE_WIRE1
@@ -59,8 +61,6 @@
// PCF8563 RTC Module
// #define PCF8563_RTC 0x51 //Putting definitions in variant. h does not compile correctly
-#define HAS_RTC 1
-
// has 32768 Hz crystal
#define HAS_32768HZ
diff --git a/variants/tlora_t3s3_v1/platformio.ini b/variants/tlora_t3s3_v1/platformio.ini
index bef57c3b4..fd3d393d9 100644
--- a/variants/tlora_t3s3_v1/platformio.ini
+++ b/variants/tlora_t3s3_v1/platformio.ini
@@ -4,4 +4,5 @@ board = tlora-t3s3-v1
upload_protocol = esp-builtin
build_flags =
- ${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/tlora_t3s3_v1
\ No newline at end of file
+ ${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/tlora_t3s3_v1
+ -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
\ No newline at end of file
diff --git a/variants/tlora_t3s3_v1/variant.h b/variants/tlora_t3s3_v1/variant.h
index 313b08e6d..7f914c055 100644
--- a/variants/tlora_t3s3_v1/variant.h
+++ b/variants/tlora_t3s3_v1/variant.h
@@ -1,6 +1,8 @@
#undef GPS_RX_PIN
#undef GPS_TX_PIN
+#define PIN_GPS_EN 42 // GPS power enable pin
+
#define HAS_SDCARD
#define SDCARD_USE_SPI1
diff --git a/variants/tlora_v2_1_16/platformio.ini b/variants/tlora_v2_1_16/platformio.ini
index da2a32ce4..167f6c37c 100644
--- a/variants/tlora_v2_1_16/platformio.ini
+++ b/variants/tlora_v2_1_16/platformio.ini
@@ -2,4 +2,5 @@
extends = esp32_base
board = ttgo-lora32-v21
build_flags =
- ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/tlora_v2_1_16
\ No newline at end of file
+ ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/tlora_v2_1_16
+ -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
\ No newline at end of file
diff --git a/variants/tlora_v2_1_16/variant.h b/variants/tlora_v2_1_16/variant.h
index adb5af898..30a176e4c 100644
--- a/variants/tlora_v2_1_16/variant.h
+++ b/variants/tlora_v2_1_16/variant.h
@@ -3,6 +3,8 @@
#define GPS_RX_PIN 15 // per @der_bear on the forum, 36 is incorrect for this board type and 15 is a better pick
#define GPS_TX_PIN 13
+#define PIN_GPS_EN 19 // GPS power enable pin
+
#define BATTERY_PIN 35
#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
#define BATTERY_SENSE_SAMPLES 30
diff --git a/variants/xiao_ble/README.md b/variants/xiao_ble/README.md
new file mode 100644
index 000000000..6fff9cd22
--- /dev/null
+++ b/variants/xiao_ble/README.md
@@ -0,0 +1,261 @@
+#
+
+
+ Xiao BLE/BLE Sense + Ebyte E22-900M30S
+
+
+
+ A step-by-step guide for macOS and Linux
+
+
+## Introduction
+
+This guide will walk you through everything needed to get the Xiao BLE (or BLE Sense) running Meshtastic using an Ebyte E22-900M30S LoRa module. The combination of the E22 with an nRF52840 MCU is desirable because it allows for both very low idle (Rx) power draw and high transmit power. The Xiao BLE is a small but surprisingly well-appointed nRF52840 board, with enough GPIO for most Meshtastic applications and a built-in LiPo charger. The E22, on the other hand, is a famously inscrutable and mysterious beast. It is one of the more readily available LoRa modules capable of transmitting at 30 dBm, and includes an LNA to boost its Rx sensitivity a few dB beyond that of the SX1262. However, its documentation is relatively sparse overall, and seems to merely hint at (or completely omit) several key details regarding its functionality. Thus, much of what follows is a synthesis of my observations and inferences over the course of many hours of trial and error.
+
+Acknowledgement and friendly disclaimer
+
+Huge thanks to those in the community who have forged the way with the E22, without whose hard work none of this would have been possible! (thebentern, riddick, rainer_vie, beegee-tokyo, geeksville, caveman99, Der_Bear, PlumRugOfDoom, BigCorvus, and many others.)
+
+
+
+Please take the conclusions here as a tentative work in progress, representing my current (and fairly limited) understanding of the E22 when paired with this particular MCU. It is my hope that this guide will be helpful to others who are interested in trying a DIY Meshtastic build, and also be subject to revision by folks with more experience and better test equipment.
+
+### Obligatory liability disclaimer
+
+This guide and all associated content is for informational purposes only. The information presented is intended for consumption only by persons having appropriate technical skill and judgement, to be used entirely at their own discretion and risk. The authors of this guide in no way provide any warranty, express or implied, toward the content herein, nor its correctness, safety, or suitability to any particular purpose. By following the instructions in this guide in part or in full, you assume all responsibility for all potential risks, including but not limited to fire, property damage, bodily injury, and death.
+
+### Note
+
+These instructions assume you are running macOS or Linux, but it should be relatively easy to translate each command for Windows. (In this case, in step 2 below, each line of `xiao_ble.sh` would also need to be converted to the equivalent Windows CLI command and run individually.)
+
+## 1. Update Bootloader
+
+The first thing you will need to do is update the Xiao BLE's bootloader. The stock bootloader is functionally very similar to the Adafruit nRF52 UF2 bootloader, but apparently not quite enough so to work with Meshtastic out of the box.
+
+1. Connect the Xiao BLE to your computer via USB-C.
+
+2. Install `adafruit-nrfutil` by following the instructions here.
+
+3. Open a terminal window and navigate to `firmware/variants/xiao_ble` (where `firmware` is the directory into which you have cloned the Meshtastic firmware repo).
+
+4. Run the following command, replacing `/dev/cu.usbmodem2101` with the serial port your Xiao BLE is connected to:
+
+ ```bash
+ adafruit-nrfutil --verbose dfu serial --package xiao_nrf52840_ble_bootloader-0.7.0-22-g277a0c8_s140_7.3.0.zip --port /dev/cu.usbmodem2101 -b 115200 --singlebank --touch 1200
+ ```
+
+5. If all goes well, the Xiao BLE's red LED should start to pulse slowly, and you should see a new USB storage device called `XIAO-BOOT` appear under `Locations` in Finder.
+
+
+
+## 2. PlatformIO Environment Preparation
+
+Before building Meshtastic for the Xiao BLE + E22, it is necessary to pull in SoftDevice 7.3.0 and its associated linker script (nrf52840_s140_v7.ld) from Seeed Studio's Arduino core. The `xiao_ble.sh` script does this.
+
+1. In your terminal window, run the following command:
+
+ ```bash
+ sudo ./xiao_ble.sh
+ ```
+
+
+
+## 3. Build Meshtastic
+
+At this point, you should be able to build the firmware successfully.
+
+1. In VS Code, press `Command Shift P` to bring up the command palette.
+
+2. Search for and run the `Developer: Reload Window` command.
+
+3. Bring up the command palette again with `Command Shift P`. Search for and run the `PlatformIO: Pick Project Environment` command.
+
+4. In the list of environments, select `env:xiao_ble`. PlatformIO may update itself for a minute or two, and should let you know once done.
+
+5. Return to the command palette once again (`Command Shift P`). Search for and run the `PlatformIO: Build` command.
+
+6. PlatformIO will build the project. After a few minutes you should see a green `SUCCESS` message.
+
+
+
+## 4. Wire the board
+
+Connecting the E22 to the Xiao BLE is straightforward, but there are a few gotchas to be mindful of.
+
+- On the Xiao BLE:
+
+ - Pins D4 and D5 are currently mapped to `PIN_WIRE_SDA` and `PIN_WIRE_SCL`, respectively. If you are not using I²C and would like to free up pins D4 and D5 for use as GPIO, `PIN_WIRE_SDA` and `PIN_WIRE_SCL` can be reassigned to any two other unused pin numbers.
+
+ - Pins D6 and D7 were originally mapped to the TX and RX pins for serial interface 1 (`PIN_SERIAL1_RX` and `PIN_SERIAL1_TX`) but are currently set to -1 in `variant.h`. If you need to expose a serial interface, you can restore these pins and move e.g. `SX126X_RXEN` to pin 4 or 5 (the opposite should work too).
+
+- On the E22:
+
+ - There are two options for the E22's `TXEN` pin:
+
+ 1. It can be connected to the MCU on the pin defined as `SX126X_TXEN` in `variant.h`. In this configuration, the MCU will control Tx/Rx switching "manually". As long as `SX126X_TXEN` and `SX126X_RXEN` are both defined in `variant.h` (and neither is set to `RADIOLIB_NC`), `SX126xInterface.cpp` will initialize the E22 correctly for this mode.
+
+ 2. Alternately, it can be connected to the E22's `DIO2` pin only, with neither `TXEN` nor `DIO2` being connected to the MCU. In this configuration, the E22 will control Tx/Rx switching automatically. In `variant.h`, as long as `SX126X_TXEN` is defined as `RADIOLIB_NC`, and `SX126X_RXEN` is defined and connected to the E22's `RXEN` pin, and `E22_TXEN_CONNECTED_TO_DIO2` is defined, `SX126xInterface.cpp` will initialize the E22 correctly for this mode. This configuration frees up a GPIO, and presents no drawbacks that I have found.
+
+ - Note that any combination other than the two described above will likely result in unexpected behavior. In my testing, some of these other configurations appeared to "work" at first glance, but every one I tried had at least one of the following flaws: weak Tx power, extremely poor Rx sensitivity, or the E22 overheating because TXEN was never pulled low, causing its PA to stay on indefinitely.
+
+ - Along the same lines, it is a good idea to check the E22's temperature frequently by lightly touching the shield. If you feel the shield getting hot (i.e. approaching uncomfortable to touch) near pins 1, 2, and 3, something is probably misconfigured; disconnect both the Xiao BLE and E22 from power and double check wiring and pin mapping.
+
+ - Whether you opt to let the E22 control Rx and Tx or handle this manually, the E22's `RXEN` pin must always be connected to the MCU on the pin defined as `SX126X_RXEN` in `variant.h`.
+
+Note
+
+The default pin mapping in `variant.h` uses 'automatic Tx/Rx switching' mode. If you wire your board for manual Rx/Tx switching, make sure to update `variant.h` accordingly by commenting/uncommenting the necessary lines in the 'E22 Tx/Rx control options' section.
+
+
+
+---
+
+
+
+Example wiring for "E22 automatic Tx/Rx switching" mode:
+
+
+MCU -> E22 connections
+| Xiao BLE pin | variant.h definition | E22 pin | Notes |
+| :------------ | :---------------------------- | :-----------------| :------------------------------------------------------------------------------------------------------------------- |
+| D0 | SX126X_CS | 19 (NSS) | |
+| D1 | SX126X_DIO1 | 13 (DIO1) | |
+| D2 | SX126X_BUSY | 14 (BUSY) | |
+| D3 | SX126X_RESET | 15 (NRST) | |
+| D7 | SX126X_RXEN | 6 (RXEN) | These pins must still be connected, and `SX126X_RXEN` defined in `variant.h`, otherwise Rx sensitivity will be poor. |
+| D8 | PIN_SPI_SCK | 18 (SCK) | |
+| D9 | PIN_SPI_MISO | 16 (MISO) | |
+| D10 | PIN_SPI_MOSI | 17 (MOSI) | |
+
+
+
+
+E22 -> E22 connections:
+| E22 pin | E22 pin | Notes |
+| :------------ | :---------------------------- | :------------------------------------------------------------------------ |
+| TXEN | DIO2 | These must be physically connected for automatic Tx/Rx switching to work. |
+
+Note
+
+The schematic (`xiao-ble-e22-schematic.png`) in the `eagle-project` directory uses this wiring.
+
+
+
+---
+
+
+
+Example wiring for "Manual Tx/Rx switching" mode:
+
+MCU -> E22 connections
+| Xiao BLE pin | variant.h definition | E22 pin | Notes |
+| :------------ | :---------------------------- | :-----------------| :--------------------------- |
+| D0 | SX126X_CS | 19 (NSS) | |
+| D1 | SX126X_DIO1 | 13 (DIO1) | |
+| D2 | SX126X_BUSY | 14 (BUSY) | |
+| D3 | SX126X_RESET | 15 (NRST) | |
+| D6 | SX126X_TXEN | 7 (TXEN) | |
+| D7 | SX126X_RXEN | 6 (RXEN) | |
+| D8 | PIN_SPI_SCK | 18 (SCK) | |
+| D9 | PIN_SPI_MISO | 16 (MISO) | |
+| D10 | PIN_SPI_MOSI | 17 (MOSI) | |
+
+E22 -> E22 connections: (none)
+
+
+
+## 5. Flash the firmware to the Xiao BLE
+
+1. Double press the Xiao's `reset` button to put it in bootloader mode.
+2. In a terminal window, navigate to the Meshtastic firmware repo's root directory, and from there to `.pio/build/xiao_ble`.
+3. Convert the generated `.hex` file into a `.uf2` file:
+
+ ```bash
+ ../../../bin/uf2conv.py firmware.hex -c -o firmware.uf2 -f 0xADA52840
+ ```
+
+4. Copy the new `.uf2` file to the Xiao's mass storage volume:
+
+ ```bash
+ cp firmware.uf2 /Volumes/XIAO-BOOT
+ ```
+
+5. The Xiao's red LED will flash for several seconds as the firmware is copied.
+6. Once the firmware is copied, to verify it is running, run the following command:
+
+ ```bash
+ meshtastic --noproto
+ ```
+
+7. Then, press the Xiao's `reset` button again. You should see a lot of debug output logged in the terminal window.
+
+
+
+## 6. Troubleshooting
+
+- If after flashing Meshtastic, the Xiao is bootlooped, look at the serial output (you can see this by running `meshtastic --noproto` with the device connected to your computer via USB).
+
+ - If you see that the SX1262 init result was -2, this likely indicates a wiring problem; double check your wiring and pin mapping in `variant.h`.
+
+ - If you see an error mentioning tinyFS, this may mean you need to reformat the Xiao's storage:
+
+ 1. Double press the `reset` button to put the Xiao in bootloader mode.
+
+ 2. In a terminal window, navigate to the Meshtastic firmware repo's root directory, and from there to `variants/xiao_ble`.
+
+ 3. Run the following command: `cp xiao-ble-internal-format.uf2 /Volumes/XIAO-BOOT`
+
+ 4. The Xiao's red LED will flash briefly as the filesystem format firmware is copied.
+
+ 5. Run the following command: `meshtastic --noproto`
+
+ 6. In the output of the above command, you should see a message saying "Formatting...done".
+
+ 7. To flash Meshtastic again, repeat the steps in section 5 above.
+
+ - If you don't see any specific error message, but the boot process is stuck or not proceeding as expected, this might also mean there is a conflict in `variant.h`. If you have made any changes to the pin mapping, ensure they do not result in a conflict. If all else fails, try reverting your changes and using the known-good configuration included here.
+
+ - The above might also mean something is wired incorrectly. Try reverting to one of the known-good example wirings in section 4.
+
+- If the E22 gets hot to the touch:
+ - The power amplifier is likely running continually. Disconnect it and the Xiao from power immediately, and double check wiring and pin mapping. In my experimentation this occurred in cases where TXEN was inadvertenly high (usually due to a pin mapping conflict).
+
+
+
+## 7. Notes
+
+- There are several anecdotal recommendations regarding the Tx power the E22's internal SX1262 should be set to in order to achieve the advertised output of 30 dBm, ranging from 4 (per this article in the RadioLib github repo) to 22 (per this conversation from the Meshtastic Discord). When paired with the Xiao BLE in the configurations described above, I observed that the output is at its maximum when Tx power is set to 22.
+
+- To achieve its full output, the E22 should have a bypass capacitor from its 5V supply to ground. 100 µF works well.
+
+- The E22 will happily run on voltages lower than 5V, but the full output power will not be realized. For example, with a fully charged LiPo at 4.2V, Tx power appears to max out around 26-27 dBm.
+
+
+
+## 8. Testing Methodology
+
+During what became a fairly long trial-and-error process, I did a lot of careful testing of Tx power and Rx sensitivity. My methodology in these tests was as follows:
+
+- All tests were conducted between two nodes:
+
+ 1. The Xiao BLE + E22 coupled with an Abracon ARRKP4065-S915A ceramic patch antenna
+
+ 2. A RAK 5005/4631 coupled with a Laird MA9-5N antenna via a 4" U.FL to Type N pigtail.
+
+ - No other nodes were powered up onsite or nearby.
+
+
+
+- Each node and its antenna was kept in exactly the same position and orientation throughout testing.
+
+- Other environmental factors (e.g. the location and resting position of my body in the room while testing) were controlled as carefully as possible.
+
+- Each test comprised at least five (and often ten) runs, after which the results were averaged.
+
+- All testing was done by sending single-character messages between nodes and observing the received RSSI reported in the message acknowledgement. Messages were sent one by one, waiting for each to be acknowledged or time out before sending the next.
+
+- The E22's Tx power was observed by sending messages from the RAK to the Xiao BLE + E22 and recording the received RSSI.
+
+- The opposite was done to observe the E22's Rx sensitivity: messages were sent from the Xiao BLE + E22 to the RAK, and the received RSSI was recorded.
+
+While this cannot match the level of accuracy achievable with actual test equipment in a lab setting, it was nonetheless sufficient to demonstrate the (sometimes very large) differences in Tx power and Rx sensitivity between various configurations.
diff --git a/variants/xiao_ble/platformio.ini b/variants/xiao_ble/platformio.ini
new file mode 100644
index 000000000..c52e2c644
--- /dev/null
+++ b/variants/xiao_ble/platformio.ini
@@ -0,0 +1,13 @@
+; Seeed Xiao BLE: https://www.digikey.com/en/products/detail/seeed-technology-co-ltd/102010448/16652893
+[env:xiao_ble]
+extends = nrf52840_base
+board = xiao_ble_sense
+board_level = extra
+build_flags = ${nrf52840_base.build_flags} -Ivariants/xiao_ble -Dxiao_ble -D EBYTE_E22
+ -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/xiao_ble>
+lib_deps =
+ ${nrf52840_base.lib_deps}
+debug_tool = jlink
+; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
+;upload_protocol = jlink
\ No newline at end of file
diff --git a/variants/xiao_ble/variant.cpp b/variants/xiao_ble/variant.cpp
new file mode 100644
index 000000000..2c6c3e539
--- /dev/null
+++ b/variants/xiao_ble/variant.cpp
@@ -0,0 +1,55 @@
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+ // D0 .. D13
+ 2, // D0 is P0.02 (A0)
+ 3, // D1 is P0.03 (A1)
+ 28, // D2 is P0.28 (A2)
+ 29, // D3 is P0.29 (A3)
+ 4, // D4 is P0.04 (A4,SDA)
+ 5, // D5 is P0.05 (A5,SCL)
+ 43, // D6 is P1.11 (TX)
+ 44, // D7 is P1.12 (RX)
+ 45, // D8 is P1.13 (SCK)
+ 46, // D9 is P1.14 (MISO)
+ 47, // D10 is P1.15 (MOSI)
+
+ // LEDs
+ 26, // D11 is P0.26 (LED RED)
+ 6, // D12 is P0.06 (LED BLUE)
+ 30, // D13 is P0.30 (LED GREEN)
+ 14, // D14 is P0.14 (READ_BAT)
+
+ // LSM6DS3TR
+ 40, // D15 is P1.08 (6D_PWR)
+ 27, // D16 is P0.27 (6D_I2C_SCL)
+ 7, // D17 is P0.07 (6D_I2C_SDA)
+ 11, // D18 is P0.11 (6D_INT1)
+
+ // MIC
+ 42, // 17,//42, // D19 is P1.10 (MIC_PWR)
+ 32, // 26,//32, // D20 is P1.00 (PDM_CLK)
+ 16, // 25,//16, // D21 is P0.16 (PDM_DATA)
+
+ // BQ25100
+ 13, // D22 is P0.13 (HICHG)
+ 17, // D23 is P0.17 (~CHG)
+
+ //
+ 21, // D24 is P0.21 (QSPI_SCK)
+ 25, // D25 is P0.25 (QSPI_CSN)
+ 20, // D26 is P0.20 (QSPI_SIO_0 DI)
+ 24, // D27 is P0.24 (QSPI_SIO_1 DO)
+ 22, // D28 is P0.22 (QSPI_SIO_2 WP)
+ 23, // D29 is P0.23 (QSPI_SIO_3 HOLD)
+
+ // NFC
+ 9, // D30 is P0.09 (NFC1)
+ 10, // D31 is P0.10 (NFC2)
+
+ // VBAT
+ 31, // D32 is P0.10 (VBAT)
+};
\ No newline at end of file
diff --git a/variants/xiao_ble/variant.h b/variants/xiao_ble/variant.h
new file mode 100644
index 000000000..ae7d37458
--- /dev/null
+++ b/variants/xiao_ble/variant.h
@@ -0,0 +1,201 @@
+#ifndef _SEEED_XIAO_NRF52840_SENSE_H_
+#define _SEEED_XIAO_NRF52840_SENSE_H_
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+//#define USE_LFRC // Board uses RC for LF
+
+/*----------------------------------------------------------------------------
+ * Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#define PINS_COUNT (33)
+#define NUM_DIGITAL_PINS (33)
+#define NUM_ANALOG_INPUTS (8) // A6 is used for battery, A7 is analog reference
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+
+#define LED_RED 11
+#define LED_BLUE 12
+#define LED_GREEN 13
+
+#define PIN_LED1 LED_GREEN
+#define PIN_LED2 LED_BLUE
+#define PIN_LED3 LED_RED
+
+#define PIN_LED PIN_LED1
+#define LED_PWR (PINS_COUNT)
+
+#define LED_BUILTIN PIN_LED
+
+#define LED_STATE_ON 1 // State when LED is lit
+
+/*
+ * Buttons
+ */
+#define PIN_BUTTON1 (PINS_COUNT)
+
+// Digital PINs
+#define D0 (0ul)
+#define D1 (1ul)
+#define D2 (2ul)
+#define D3 (3ul)
+#define D4 (4ul)
+#define D5 (5ul)
+#define D6 (6ul)
+#define D7 (7ul)
+#define D8 (8ul)
+#define D9 (9ul)
+#define D10 (10ul)
+
+/*
+ * Analog pins
+ */
+#define PIN_A0 (0)
+#define PIN_A1 (1)
+#define PIN_A2 (2)
+#define PIN_A3 (3)
+#define PIN_A4 (4)
+#define PIN_A5 (5)
+#define PIN_VBAT (32)
+#define VBAT_ENABLE (14)
+
+static const uint8_t A0 = PIN_A0;
+static const uint8_t A1 = PIN_A1;
+static const uint8_t A2 = PIN_A2;
+static const uint8_t A3 = PIN_A3;
+static const uint8_t A4 = PIN_A4;
+static const uint8_t A5 = PIN_A5;
+#define ADC_RESOLUTION 12
+
+// Other pins
+#define PIN_NFC1 (30)
+#define PIN_NFC2 (31)
+
+/*
+ * Serial interfaces
+ */
+#define PIN_SERIAL1_RX (-1) // (7)
+#define PIN_SERIAL1_TX (-1) // (6)
+
+#define PIN_SERIAL2_RX (-1)
+#define PIN_SERIAL2_TX (-1)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI_MISO (9)
+#define PIN_SPI_MOSI (10)
+#define PIN_SPI_SCK (8)
+
+static const uint8_t SS = D0;
+static const uint8_t MOSI = PIN_SPI_MOSI;
+static const uint8_t MISO = PIN_SPI_MISO;
+static const uint8_t SCK = PIN_SPI_SCK;
+
+// supported modules list
+#define USE_SX1262
+
+// common pinouts for SX126X modules
+#define SX126X_CS D0
+#define SX126X_DIO1 D1
+#define SX126X_BUSY D2
+#define SX126X_RESET D3
+
+// ----------------------------------------------------------------
+
+// E22 Tx/Rx control options:
+
+// 1. Let the E22 control Tx and Rx automagically via DIO2.
+
+// * The E22's TXEN and DIO2 pins are connected to each other, but not to the MCU.
+// * The E22's RXEN pin *is* connected to the MCU.
+// * E22_TXEN_CONNECTED_TO_DIO2 is defined so the logic in SX126XInterface.cpp handles this configuration correctly.
+
+#define SX126X_TXEN RADIOLIB_NC
+#define SX126X_RXEN D7
+#define E22_TXEN_CONNECTED_TO_DIO2
+
+// ------------------------------ OR ------------------------------
+
+// 2. Control Tx and Rx manually.
+
+// * The E22's TXEN and RXEN pins are both connected to the MCU.
+
+// #define SX126X_TXEN D6
+// #define SX126X_RXEN D7
+
+// ----------------------------------------------------------------
+
+#ifdef EBYTE_E22
+// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
+// (which is the default for the sx1262interface code)
+#define SX126X_E22
+#endif
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1 // 2
+
+#define PIN_WIRE_SDA (4)
+#define PIN_WIRE_SCL (5)
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+#define PIN_LSM6DS3TR_C_POWER (15)
+#define PIN_LSM6DS3TR_C_INT1 (18)
+
+// PDM Interfaces
+// ---------------
+#define PIN_PDM_PWR (19)
+#define PIN_PDM_CLK (20)
+#define PIN_PDM_DIN (21)
+
+// QSPI Pins
+#define PIN_QSPI_SCK (24)
+#define PIN_QSPI_CS (25)
+#define PIN_QSPI_IO0 (26)
+#define PIN_QSPI_IO1 (27)
+#define PIN_QSPI_IO2 (28)
+#define PIN_QSPI_IO3 (29)
+
+// On-board QSPI Flash
+#define EXTERNAL_FLASH_DEVICES P25Q16H
+#define EXTERNAL_FLASH_USE_QSPI
+
+// Battery
+
+#define BAT_READ \
+ 14 // P0_14 = 14 Reads battery voltage from divider on signal board. (PIN_VBAT is reading voltage divider on XIAO and is
+ // program pin 32 / or P0.31)
+#define CHARGE_LED 23 // P0_17 = 17 D23 YELLOW CHARGE LED
+#define HICHG 22 // P0_13 = 13 D22 Charge-select pin for Lipo for 100 mA instead of default 50mA charge
+
+// The battery sense is hooked to pin A0 (5)
+#define BATTERY_PIN PIN_VBAT // PIN_A0
+
+// ratio of voltage divider = 3.0 (R17=1M, R18=510k)
+#define ADC_MULTIPLIER 3 // 3.0 + a bit for being optimistic
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ * Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif
\ No newline at end of file
diff --git a/variants/xiao_ble/xiao-ble-internal-format.uf2 b/variants/xiao_ble/xiao-ble-internal-format.uf2
new file mode 100644
index 000000000..59de2c68a
Binary files /dev/null and b/variants/xiao_ble/xiao-ble-internal-format.uf2 differ
diff --git a/variants/xiao_ble/xiao_ble.sh b/variants/xiao_ble/xiao_ble.sh
new file mode 100755
index 000000000..2f3cc5390
--- /dev/null
+++ b/variants/xiao_ble/xiao_ble.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# adapted from the script linked in this very helpful article: https://enzolombardi.net/low-power-bluetooth-advertising-with-xiao-ble-and-platformio-e8e7d0da80d2
+
+# source: https://gist.githubusercontent.com/turing-complete-labs/b3105ee653782183c54b4fdbe18f411f/raw/d86779ba7702775d3b79781da63d85442acd9de6/xiao_ble.sh
+# download the core for arduino from seeedstudio. Softdevice 7.3.0, linker and variants folder are what we need
+curl https://files.seeedstudio.com/arduino/core/nRF52840/Arduino_core_nRF52840.tar.bz2 -o arduino.core.1.0.0.tar.bz2
+tar -xjf arduino.core.1.0.0.tar.bz2
+rm arduino.core.1.0.0.tar.bz2
+
+# copy the needed files
+cp 1.0.0/cores/nRF5/linker/nrf52840_s140_v7.ld ~/.platformio/packages/framework-arduinoadafruitnrf52/cores/nRF5/linker
+cp -r 1.0.0/cores/nRF5/nordic/softdevice/s140_nrf52_7.3.0_API ~/.platformio/packages/framework-arduinoadafruitnrf52/cores/nRF5/nordic/softdevice
+
+rm -rf 1.0.0
+echo done!
diff --git a/variants/xiao_ble/xiao_nrf52840_ble_bootloader-0.7.0-22-g277a0c8_s140_7.3.0.zip b/variants/xiao_ble/xiao_nrf52840_ble_bootloader-0.7.0-22-g277a0c8_s140_7.3.0.zip
new file mode 100644
index 000000000..40b966baf
Binary files /dev/null and b/variants/xiao_ble/xiao_nrf52840_ble_bootloader-0.7.0-22-g277a0c8_s140_7.3.0.zip differ
diff --git a/version.properties b/version.properties
index 5cc440cdd..76538d46b 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
[VERSION]
major = 2
minor = 1
-build = 18
+build = 20