From 572d1bc53b62bc7354596c4c3d1dbb89b0138eda Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Tue, 18 Nov 2025 01:43:35 +0000
Subject: [PATCH 01/10] Arduino Nesso N1: variant initial

---
 .../arduino_nesso_n1/ArduinoNessoN1Board.cpp  |  80 ++++++++++
 .../arduino_nesso_n1/ArduinoNessoN1Board.h    |  44 ++++++
 variants/arduino_nesso_n1/expander.cpp        | 139 ++++++++++++++++++
 variants/arduino_nesso_n1/pins_arduino.h      |  79 ++++++++++
 variants/arduino_nesso_n1/platformio.ini      |  79 ++++++++++
 variants/arduino_nesso_n1/target.h            |  22 +++
 6 files changed, 443 insertions(+)
 create mode 100644 variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
 create mode 100644 variants/arduino_nesso_n1/ArduinoNessoN1Board.h
 create mode 100644 variants/arduino_nesso_n1/expander.cpp
 create mode 100644 variants/arduino_nesso_n1/pins_arduino.h
 create mode 100644 variants/arduino_nesso_n1/platformio.ini
 create mode 100644 variants/arduino_nesso_n1/target.h

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
new file mode 100644
index 000000000..122f26403
--- /dev/null
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
@@ -0,0 +1,80 @@
+#include <Arduino.h>
+#include "target.h"
+#include "pins_arduino.h"
+
+ArduinoNessoN1Board board;
+
+#if defined(P_LORA_SCLK)
+  static SPIClass spi(0);
+  // replace P_LORA_RESET with -1 to indicate RESET is handled outside
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, -1, P_LORA_BUSY, spi);
+#else
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, -1, P_LORA_BUSY);
+#endif
+
+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;
+
+bool radio_init() {
+  MESH_DEBUG_PRINTLN("radio_init()");
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+
+  // pinMode(LCD_BACKLIGHT, OUTPUT); // LCD_BACKLIGHT
+  // pinMode(BEEP_PIN, OUTPUT);
+
+  MESH_DEBUG_PRINTLN("set Nesso N1 pin modes...");
+  pinMode(LORA_ENABLE, OUTPUT); // RESET
+  pinMode(LORA_ANTENNA_SWITCH, OUTPUT); // ANTENNA_SWITCH
+  pinMode(LORA_LNA_ENABLE, OUTPUT); // LNA_ENABLE
+
+  // Toggle reset via expander
+  MESH_DEBUG_PRINTLN("Enable LoRa...");
+  digitalWrite(LORA_ENABLE, LOW);
+  delay(10);
+  digitalWrite(LORA_ENABLE, HIGH);
+
+  // Configure antenna switch and LNA
+  digitalWrite(LORA_ANTENNA_SWITCH, HIGH); // enable antenna switch
+  digitalWrite(LORA_LNA_ENABLE, HIGH); // enable LNA
+
+  // Enable LCD backlight
+  // digitalWrite(LCD_BACKLIGHT, HIGH);
+  // digitalWrite(BEEP_PIN, HIGH);
+  // delayMicroseconds(1000);
+  // digitalWrite(LCD_BACKLIGHT, LOW);
+  // digitalWrite(BEEP_PIN, LOW);
+
+  MESH_DEBUG_PRINTLN("radio.std_init() and return...");
+#if defined(P_LORA_SCLK)
+  spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
+  return radio.std_init(&spi);
+#else
+  return radio.std_init();
+#endif
+}
+
+uint32_t radio_get_rng_seed() {
+  return radio.random(0x7FFFFFFF);
+}
+
+void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
+  radio.setFrequency(freq);
+  radio.setSpreadingFactor(sf);
+  radio.setBandwidth(bw);
+  radio.setCodingRate(cr);
+}
+
+void radio_set_tx_power(uint8_t dbm) {
+  radio.setOutputPower(dbm);
+}
+
+mesh::LocalIdentity radio_new_identity() {
+  RadioNoiseListener rng(radio);
+  return mesh::LocalIdentity(&rng);  // create new random identity
+}
+
+
diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
new file mode 100644
index 000000000..15e191262
--- /dev/null
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <Arduino.h>
+#include <helpers/ESP32Board.h>
+#include "pins_arduino.h"
+
+#define P_LORA_TX_LED LED_BUILTIN // ToDo: doesn't appear to blink on receipt
+
+
+
+class ArduinoNessoN1Board : public ESP32Board {
+private:
+  NessoBattery battery;
+public:
+  void begin() {
+    ESP32Board::begin();
+
+#ifdef P_LORA_TX_LED
+    pinMode(P_LORA_TX_LED, OUTPUT);
+    digitalWrite(P_LORA_TX_LED, LOW);
+#endif
+  }
+
+#ifdef P_LORA_TX_LED
+  void onBeforeTransmit() override {
+    MESH_DEBUG_PRINTLN("onBeforeTransmit: HIGH LED");
+    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
+  }
+  void onAfterTransmit() override {
+    MESH_DEBUG_PRINTLN("onBeforeTransmit: LOW LED");
+    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
+  }
+#endif
+
+  const char* getManufacturerName() const override {
+    return "Arduino Nesso N1";
+  }
+
+  uint16_t getBattMilliVolts() override {
+    return battery.getMilliVoltage(); // ToDo: Needs work - full battery reports 65v 😅
+  }
+};
+
+
diff --git a/variants/arduino_nesso_n1/expander.cpp b/variants/arduino_nesso_n1/expander.cpp
new file mode 100644
index 000000000..6589c1efc
--- /dev/null
+++ b/variants/arduino_nesso_n1/expander.cpp
@@ -0,0 +1,139 @@
+#define TwoWire TwoWireInternal
+#define Wire    WireInternal
+#define Wire1   WireInternal1
+
+#include "pins_arduino.h"
+#include "../../libraries/Wire/src/Wire.h"
+#include "../../libraries/Wire/src/Wire.cpp"
+
+static bool wireInitialized = false;
+
+// From https://www.diodes.com/datasheet/download/PI4IOE5V6408.pdf
+static void writeRegister(uint8_t address, uint8_t reg, uint8_t value) {
+  WireInternal.beginTransmission(address);
+  WireInternal.write(reg);
+  WireInternal.write(value);
+  WireInternal.endTransmission();
+}
+
+static uint8_t readRegister(uint8_t address, uint8_t reg) {
+  WireInternal.beginTransmission(address);
+  WireInternal.write(reg);
+  WireInternal.endTransmission(false);
+  WireInternal.requestFrom(address, 1);
+  return WireInternal.read();
+}
+
+static void writeBitRegister(uint8_t address, uint8_t reg, uint8_t bit, uint8_t value) {
+  uint8_t val = readRegister(address, reg);
+  if (value) {
+    writeRegister(address, reg, val | (1 << bit));
+  } else {
+    writeRegister(address, reg, val & ~(1 << bit));
+  }
+}
+
+static bool readBitRegister(uint8_t address, uint8_t reg, uint8_t bit) {
+  uint8_t val = readRegister(address, reg);
+  return ((val & (1 << bit)) > 0);
+}
+
+void pinMode(ExpanderPin pin, uint8_t mode) {
+  if (!wireInitialized) {
+    WireInternal.begin(SDA, SCL);
+    wireInitialized = true;
+    // reset all registers to default state
+    writeRegister(pin.address, 0x1, 0x1);
+    // set all pins as high as default state
+    writeRegister(pin.address, 0x9, 0xFF);
+    // interrupt mask to all pins
+    writeRegister(pin.address, 0x11, 0xFF);
+    // all input
+    writeRegister(pin.address, 0x3, 0);
+  }
+  writeBitRegister(pin.address, 0x3, pin.pin, mode == OUTPUT);
+  if (mode == OUTPUT) {
+    // remove high impedance
+    writeBitRegister(pin.address, 0x7, pin.pin, false);
+  } else if (mode == INPUT_PULLUP) {
+    // set pull-up resistor
+    writeBitRegister(pin.address, 0xB, pin.pin, true);
+    writeBitRegister(pin.address, 0xD, pin.pin, true);
+  } else if (mode == INPUT_PULLDOWN) {
+    // disable pull-up resistor
+    writeBitRegister(pin.address, 0xB, pin.pin, true);
+    writeBitRegister(pin.address, 0xD, pin.pin, false);
+  } else if (mode == INPUT) {
+    // disable pull selector resistor
+    writeBitRegister(pin.address, 0xB, pin.pin, false);
+  }
+}
+
+void digitalWrite(ExpanderPin pin, uint8_t val) {
+  if (!wireInitialized) {
+    WireInternal.begin(SDA, SCL);
+    wireInitialized = true;
+  }
+  writeBitRegister(pin.address, 0x5, pin.pin, val == HIGH);
+}
+
+int digitalRead(ExpanderPin pin) {
+  if (!wireInitialized) {
+    WireInternal.begin(SDA, SCL);
+    wireInitialized = true;
+  }
+  return readBitRegister(pin.address, 0xF, pin.pin);
+}
+
+void NessoBattery::enableCharge() {
+  // AW32001E - address 0x49
+  // set CEB bit low (charge enable)
+  if (!wireInitialized) {
+    WireInternal.begin(SDA, SCL);
+    wireInitialized = true;
+  }
+  writeBitRegister(0x49, 0x1, 3, false);
+}
+
+float NessoBattery::getVoltage() {
+  // BQ27220 - address 0x55
+  if (!wireInitialized) {
+    WireInternal.begin(SDA, SCL);
+    wireInitialized = true;
+  }
+  uint16_t voltage = (readRegister(0x55, 0x9) << 8) | readRegister(0x55, 0x8);
+  return (float)voltage / 1000.0f;
+}
+
+uint16_t NessoBattery::getMilliVoltage() {
+  // BQ27220 - address 0x55
+  if (!wireInitialized) {
+    WireInternal.begin(SDA, SCL);
+    wireInitialized = true;
+  }
+  uint16_t voltage = (readRegister(0x55, 0x9) << 8) | readRegister(0x55, 0x8);
+  return voltage;
+}
+
+uint16_t NessoBattery::getChargeLevel() {
+  // BQ27220 - address 0x55
+  if (!wireInitialized) {
+    WireInternal.begin(SDA, SCL);
+    wireInitialized = true;
+  }
+  uint16_t current_capacity = readRegister(0x55, 0x11) << 8 | readRegister(0x55, 0x10);
+  uint16_t total_capacity = readRegister(0x55, 0x13) << 8 | readRegister(0x55, 0x12);
+  return (current_capacity * 100) / total_capacity;
+}
+
+ExpanderPin LORA_LNA_ENABLE(5);
+ExpanderPin LORA_ANTENNA_SWITCH(6);
+ExpanderPin LORA_ENABLE(7);
+ExpanderPin KEY1(0);
+ExpanderPin KEY2(1);
+ExpanderPin POWEROFF((1 << 8) | 0);
+ExpanderPin LCD_RESET((1 << 8) | 1);
+ExpanderPin GROVE_POWER_EN((1 << 8) | 2);
+ExpanderPin VIN_DETECT((1 << 8) | 5);
+ExpanderPin LCD_BACKLIGHT((1 << 8) | 6);
+ExpanderPin LED_BUILTIN((1 << 8) | 7);
\ No newline at end of file
diff --git a/variants/arduino_nesso_n1/pins_arduino.h b/variants/arduino_nesso_n1/pins_arduino.h
new file mode 100644
index 000000000..c675613f5
--- /dev/null
+++ b/variants/arduino_nesso_n1/pins_arduino.h
@@ -0,0 +1,79 @@
+// from https://github.com/espressif/arduino-esp32/pull/11985/files
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define USB_VID          0x303A
+#define USB_PID          0x1001
+#define USB_MANUFACTURER "Arduino"
+#define USB_PRODUCT      "Nesso N1"
+#define USB_SERIAL       ""
+
+static const uint8_t TX = -1;
+static const uint8_t RX = -1;
+
+static const uint8_t SDA = 10;
+static const uint8_t SCL = 8;
+
+static const uint8_t MOSI = 21;
+static const uint8_t MISO = 22;
+static const uint8_t SCK = 20;
+static const uint8_t SS = 23;
+
+static const uint8_t D1 = 7;
+static const uint8_t D2 = 2;
+static const uint8_t D3 = 6;
+
+static const uint8_t IR_TX_PIN = 9;
+static const uint8_t BEEP_PIN = 11;
+
+static const uint8_t GROVE_IO_0 = 5;
+static const uint8_t GROVE_IO_1 = 4;
+
+static const uint8_t LORA_IRQ = 15;
+static const uint8_t LORA_CS = 23;
+static const uint8_t LORA_BUSY = 19;
+
+static const uint8_t SYS_IRQ = 3;
+
+static const uint8_t LCD_CS = 17;
+static const uint8_t LCD_RS = 16;
+
+#if !defined(MAIN_ESP32_HAL_GPIO_H_) && defined(__cplusplus)
+/* address: 0x43/0x44 */
+class ExpanderPin {
+public:
+  ExpanderPin(uint16_t _pin) : pin(_pin & 0xFF), address(_pin & 0x100 ? 0x44 : 0x43){};
+  uint8_t pin;
+  uint8_t address;
+};
+
+class NessoBattery {
+public:
+  NessoBattery(){};
+  void enableCharge();        // enable charging
+  float getVoltage();         // get battery voltage in Volts
+  uint16_t getMilliVoltage(); // get battery voltage in millivolts
+  uint16_t getChargeLevel();  // get battery charge level in percents
+};
+
+extern ExpanderPin LORA_LNA_ENABLE;
+extern ExpanderPin LORA_ANTENNA_SWITCH;
+extern ExpanderPin LORA_ENABLE;
+extern ExpanderPin POWEROFF;
+extern ExpanderPin GROVE_POWER_EN;
+extern ExpanderPin VIN_DETECT;
+extern ExpanderPin LCD_RESET;
+extern ExpanderPin LCD_BACKLIGHT;
+extern ExpanderPin LED_BUILTIN;
+extern ExpanderPin KEY1;
+extern ExpanderPin KEY2;
+
+void pinMode(ExpanderPin pin, uint8_t mode);
+void digitalWrite(ExpanderPin pin, uint8_t val);
+int digitalRead(ExpanderPin pin);
+#endif
+
+#endif /* Pins_Arduino_h */
\ No newline at end of file
diff --git a/variants/arduino_nesso_n1/platformio.ini b/variants/arduino_nesso_n1/platformio.ini
new file mode 100644
index 000000000..45122de6b
--- /dev/null
+++ b/variants/arduino_nesso_n1/platformio.ini
@@ -0,0 +1,79 @@
+[Arduino_Nesso_N1]
+extends = esp32c6_base
+board = esp32-c6-devkitm-1
+board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
+build_flags =
+  ${esp32c6_base.build_flags}
+  -I variants/arduino_nesso_n1
+  ; -D MESH_DEBUG=1
+  ; -D ARDUINO=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_MODE=1
+  ; -D P_LORA_TX_LED= ; Only an IR LED, so disabled for now
+  -D P_LORA_SCLK=20
+  -D P_LORA_MISO=22
+  -D P_LORA_MOSI=21
+  -D P_LORA_NSS=23 ; aka LORA_CS on the Nesso N1 schematic
+  -D P_LORA_DIO_1=15 ; aka LORA_IRQ on the Nesso N1 schematic
+  -D P_LORA_BUSY=19
+  ; -D P_LORA_RESET=2 ; ToDo: Required, is on an IO expander: E0.P7 (Address 0x43)
+  -D PIN_BOARD_SDA=10
+  -D PIN_BOARD_SCL=8
+  ; -D SX126X_RXEN=23 ; ToDo: not sure
+  -D SX126X_DIO2_AS_RF_SWITCH=true
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+  -D SX126X_CURRENT_LIMIT=140
+  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=22
+  ; -D DISPLAY_CLASS=SCIndicatorDisplay ; ToDo: Figure out display later
+  ; -D DISPLAY_LINES=21 ; ToDo: Figure out display later
+  ; -D LINE_LENGTH=53 ; ToDo: Figure out display later
+  ; -D UI_ZOOM=3.5 ; ToDo: Figure out display later
+  ; -D UI_RECENT_LIST_SIZE=9 ; ToDo: Figure out UI later
+  ; -D UI_SENSORS_PAGE=1 ; ToDo: Figure out UI later
+  ; -D PIN_USER_BTN=38 ; ToDo: Figure out UI later
+  ; -D HAS_TOUCH ; ToDo: Figure out UI later
+  -D DISABLE_WIFI_OTA=1
+build_src_filter = ${esp32c6_base.build_src_filter}
+  +<../variants/arduino_nesso_n1>
+  +<expander.cpp>
+  +<ArduinoNessoN1Board.cpp>
+
+[env:Arduino_Nesso_N1_repeater_]
+extends = Arduino_Nesso_N1
+build_src_filter = ${Arduino_Nesso_N1.build_src_filter}
+  +<../examples/simple_repeater/*.cpp>
+build_flags =
+  ${Arduino_Nesso_N1.build_flags}
+  -D ADVERT_NAME='"Xiao C6 Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+lib_deps =
+  ${Arduino_Nesso_N1.lib_deps}
+;  ${esp32_ota.lib_deps}
+
+[env:Arduino_Nesso_N1_companion_radio_ble_]
+extends = Arduino_Nesso_N1
+build_flags = ${Arduino_Nesso_N1.build_flags}
+  -D MAX_CONTACTS=350
+  -D MAX_GROUP_CHANNELS=40
+  -D BLE_PIN_CODE=123456
+  -D BLE_DEBUG_LOGGING=1
+  -D OFFLINE_QUEUE_SIZE=256
+  -D ENABLE_PRIVATE_KEY_IMPORT=1
+  -D ENABLE_PRIVATE_KEY_EXPORT=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Arduino_Nesso_N1.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  -<helpers/esp32/ESPNOWRadio.cpp>
+  +<../examples/companion_radio/*.cpp>
+lib_deps =
+  ${Arduino_Nesso_N1.lib_deps}
+  densaugeo/base64 @ ~1.4.0
diff --git a/variants/arduino_nesso_n1/target.h b/variants/arduino_nesso_n1/target.h
new file mode 100644
index 000000000..1aa0b392c
--- /dev/null
+++ b/variants/arduino_nesso_n1/target.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <ArduinoNessoN1Board.h>
+#include "pins_arduino.h"
+#include <helpers/radiolib/RadioLibWrappers.h>
+#include <helpers/ESP32Board.h>
+#include <helpers/radiolib/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>
+
+extern ArduinoNessoN1Board board;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;
+
+bool radio_init();
+uint32_t radio_get_rng_seed();
+void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
+void radio_set_tx_power(uint8_t dbm);
+mesh::LocalIdentity radio_new_identity();

From a42d96acc84c6f612c7a140cf6bdb67c40e5acc7 Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Tue, 18 Nov 2025 22:21:17 +0000
Subject: [PATCH 02/10] Arduino Nesso N1: minor updates, placeholder ST7789
 implementation

---
 .../arduino_nesso_n1/ArduinoNessoN1Board.cpp  | 21 ++++---
 .../arduino_nesso_n1/ArduinoNessoN1Board.h    | 22 +++++---
 variants/arduino_nesso_n1/expander.cpp        | 55 +++++++++++--------
 variants/arduino_nesso_n1/platformio.ini      | 10 ++++
 4 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
index 122f26403..a31cf636d 100644
--- a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
@@ -23,15 +23,14 @@ bool radio_init() {
   fallback_clock.begin();
   rtc_clock.begin(Wire);
 
-  // pinMode(LCD_BACKLIGHT, OUTPUT); // LCD_BACKLIGHT
-  // pinMode(BEEP_PIN, OUTPUT);
-
-  MESH_DEBUG_PRINTLN("set Nesso N1 pin modes...");
+  MESH_DEBUG_PRINTLN("set Nesso N1 pin modes and default states...");
   pinMode(LORA_ENABLE, OUTPUT); // RESET
   pinMode(LORA_ANTENNA_SWITCH, OUTPUT); // ANTENNA_SWITCH
   pinMode(LORA_LNA_ENABLE, OUTPUT); // LNA_ENABLE
+  pinMode(LCD_BACKLIGHT, OUTPUT);
+  pinMode(BEEP_PIN, OUTPUT);
 
-  // Toggle reset via expander
+  // Toggle LoRa reset via expander
   MESH_DEBUG_PRINTLN("Enable LoRa...");
   digitalWrite(LORA_ENABLE, LOW);
   delay(10);
@@ -41,11 +40,15 @@ bool radio_init() {
   digitalWrite(LORA_ANTENNA_SWITCH, HIGH); // enable antenna switch
   digitalWrite(LORA_LNA_ENABLE, HIGH); // enable LNA
 
-  // Enable LCD backlight
-  // digitalWrite(LCD_BACKLIGHT, HIGH);
+  // Configure initial state of further devices on expander
+  digitalWrite(LCD_BACKLIGHT, LOW);
+  digitalWrite(BEEP_PIN, LOW);
+
+  // Toggle LCD backlight to show the device has powered on until we get the screen working
+  digitalWrite(LCD_BACKLIGHT, HIGH);
   // digitalWrite(BEEP_PIN, HIGH);
-  // delayMicroseconds(1000);
-  // digitalWrite(LCD_BACKLIGHT, LOW);
+  delay(2000);
+  digitalWrite(LCD_BACKLIGHT, LOW);
   // digitalWrite(BEEP_PIN, LOW);
 
   MESH_DEBUG_PRINTLN("radio.std_init() and return...");
diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
index 15e191262..cba9e1525 100644
--- a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
@@ -4,9 +4,9 @@
 #include <helpers/ESP32Board.h>
 #include "pins_arduino.h"
 
-#define P_LORA_TX_LED LED_BUILTIN // ToDo: doesn't appear to blink on receipt
-
-
+#define P_LORA_TX_LED LED_BUILTIN
+// #define PIN_TFT_RST LCD_RESET 
+// #define PIN_TFT_LEDA_CTL LCD_BACKLIGHT
 
 class ArduinoNessoN1Board : public ESP32Board {
 private:
@@ -14,21 +14,25 @@ private:
 public:
   void begin() {
     ESP32Board::begin();
+    delay(2000);
 
 #ifdef P_LORA_TX_LED
+    MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): setup TX LED mode");
     pinMode(P_LORA_TX_LED, OUTPUT);
-    digitalWrite(P_LORA_TX_LED, LOW);
+    digitalWrite(P_LORA_TX_LED, HIGH);
 #endif
+
+    battery.enableCharge();
   }
 
 #ifdef P_LORA_TX_LED
   void onBeforeTransmit() override {
-    MESH_DEBUG_PRINTLN("onBeforeTransmit: HIGH LED");
-    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
+    MESH_DEBUG_PRINTLN("onBeforeTransmit: LOW LED for On");
+    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED on
   }
   void onAfterTransmit() override {
-    MESH_DEBUG_PRINTLN("onBeforeTransmit: LOW LED");
-    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
+    MESH_DEBUG_PRINTLN("onBeforeTransmit: HIGH LED for Off");
+    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED off
   }
 #endif
 
@@ -37,7 +41,7 @@ public:
   }
 
   uint16_t getBattMilliVolts() override {
-    return battery.getMilliVoltage(); // ToDo: Needs work - full battery reports 65v 😅
+    return battery.getMilliVoltage();
   }
 };
 
diff --git a/variants/arduino_nesso_n1/expander.cpp b/variants/arduino_nesso_n1/expander.cpp
index 6589c1efc..3d058e998 100644
--- a/variants/arduino_nesso_n1/expander.cpp
+++ b/variants/arduino_nesso_n1/expander.cpp
@@ -1,27 +1,27 @@
-#define TwoWire TwoWireInternal
-#define Wire    WireInternal
-#define Wire1   WireInternal1
+// Based off here https://github.com/espressif/arduino-esp32/blob/d1eb62d7c6dda16c254c374504aa93188d7c386b/variants/arduino_nesso_n1/expander.cpp
+// Should be OK based on this? https://opensource.stackexchange.com/a/6406
 
 #include "pins_arduino.h"
-#include "../../libraries/Wire/src/Wire.h"
-#include "../../libraries/Wire/src/Wire.cpp"
+#include <helpers/ESP32Board.h>
+#include <Wire.h>
 
-static bool wireInitialized = false;
+static bool wireInitialized = true; // initialised in ESP32Board.begin() ; ToDo: Remove all these conditions in future
+static bool expanderInitialized = false;
 
 // From https://www.diodes.com/datasheet/download/PI4IOE5V6408.pdf
 static void writeRegister(uint8_t address, uint8_t reg, uint8_t value) {
-  WireInternal.beginTransmission(address);
-  WireInternal.write(reg);
-  WireInternal.write(value);
-  WireInternal.endTransmission();
+  Wire.beginTransmission(address);
+  Wire.write(reg);
+  Wire.write(value);
+  Wire.endTransmission();
 }
 
 static uint8_t readRegister(uint8_t address, uint8_t reg) {
-  WireInternal.beginTransmission(address);
-  WireInternal.write(reg);
-  WireInternal.endTransmission(false);
-  WireInternal.requestFrom(address, 1);
-  return WireInternal.read();
+  Wire.beginTransmission(address);
+  Wire.write(reg);
+  Wire.endTransmission(false);
+  Wire.requestFrom(address, 1);
+  return Wire.read();
 }
 
 static void writeBitRegister(uint8_t address, uint8_t reg, uint8_t bit, uint8_t value) {
@@ -40,9 +40,11 @@ static bool readBitRegister(uint8_t address, uint8_t reg, uint8_t bit) {
 
 void pinMode(ExpanderPin pin, uint8_t mode) {
   if (!wireInitialized) {
-    WireInternal.begin(SDA, SCL);
+    Wire.begin(SDA, SCL);
     wireInitialized = true;
     // reset all registers to default state
+  }
+  if (!expanderInitialized) {
     writeRegister(pin.address, 0x1, 0x1);
     // set all pins as high as default state
     writeRegister(pin.address, 0x9, 0xFF);
@@ -50,6 +52,7 @@ void pinMode(ExpanderPin pin, uint8_t mode) {
     writeRegister(pin.address, 0x11, 0xFF);
     // all input
     writeRegister(pin.address, 0x3, 0);
+    expanderInitialized = true;
   }
   writeBitRegister(pin.address, 0x3, pin.pin, mode == OUTPUT);
   if (mode == OUTPUT) {
@@ -71,7 +74,7 @@ void pinMode(ExpanderPin pin, uint8_t mode) {
 
 void digitalWrite(ExpanderPin pin, uint8_t val) {
   if (!wireInitialized) {
-    WireInternal.begin(SDA, SCL);
+    Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
   writeBitRegister(pin.address, 0x5, pin.pin, val == HIGH);
@@ -79,7 +82,7 @@ void digitalWrite(ExpanderPin pin, uint8_t val) {
 
 int digitalRead(ExpanderPin pin) {
   if (!wireInitialized) {
-    WireInternal.begin(SDA, SCL);
+    Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
   return readBitRegister(pin.address, 0xF, pin.pin);
@@ -89,18 +92,25 @@ void NessoBattery::enableCharge() {
   // AW32001E - address 0x49
   // set CEB bit low (charge enable)
   if (!wireInitialized) {
-    WireInternal.begin(SDA, SCL);
+    Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
+
+  MESH_DEBUG_PRINTLN("NessoBattery::enableCharge()");
+  MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current charge level %u %%", NessoBattery::getChargeLevel());
+  MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %f V", NessoBattery::getVoltage());
+  MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %u mV", NessoBattery::getMilliVoltage());
+
   writeBitRegister(0x49, 0x1, 3, false);
 }
 
 float NessoBattery::getVoltage() {
   // BQ27220 - address 0x55
   if (!wireInitialized) {
-    WireInternal.begin(SDA, SCL);
+    Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
+  MESH_DEBUG_PRINTLN("NessoBattery::getVoltage()");
   uint16_t voltage = (readRegister(0x55, 0x9) << 8) | readRegister(0x55, 0x8);
   return (float)voltage / 1000.0f;
 }
@@ -108,9 +118,10 @@ float NessoBattery::getVoltage() {
 uint16_t NessoBattery::getMilliVoltage() {
   // BQ27220 - address 0x55
   if (!wireInitialized) {
-    WireInternal.begin(SDA, SCL);
+    Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
+  MESH_DEBUG_PRINTLN("NessoBattery::getMilliVoltage()");
   uint16_t voltage = (readRegister(0x55, 0x9) << 8) | readRegister(0x55, 0x8);
   return voltage;
 }
@@ -118,7 +129,7 @@ uint16_t NessoBattery::getMilliVoltage() {
 uint16_t NessoBattery::getChargeLevel() {
   // BQ27220 - address 0x55
   if (!wireInitialized) {
-    WireInternal.begin(SDA, SCL);
+    Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
   uint16_t current_capacity = readRegister(0x55, 0x11) << 8 | readRegister(0x55, 0x10);
diff --git a/variants/arduino_nesso_n1/platformio.ini b/variants/arduino_nesso_n1/platformio.ini
index 45122de6b..e5ec4134d 100644
--- a/variants/arduino_nesso_n1/platformio.ini
+++ b/variants/arduino_nesso_n1/platformio.ini
@@ -35,6 +35,16 @@ build_flags =
   ; -D UI_SENSORS_PAGE=1 ; ToDo: Figure out UI later
   ; -D PIN_USER_BTN=38 ; ToDo: Figure out UI later
   ; -D HAS_TOUCH ; ToDo: Figure out UI later
+  ; -D PIN_TFT_SCL=38
+  ; -D PIN_TFT_SDA=48
+  ; -D PIN_TFT_RST=-1 ; It is defined in ArduinoNessoN1Board.h instead, so that the Expander can be targeted
+  ; -D PIN_TFT_VDD_CTL=7 ; Seems to be right, but seems ST7789Display or ST7789LCDDisplay are too hard coded for other devices
+  ; -D PIN_TFT_LEDA_CTL=-1 ; It is defined in ArduinoNessoN1Board.h instead, so that the Expander can be targeted
+  ; -D PIN_TFT_LEDA_CTL_ACTIVE=HIGH ; Seems to be right, but seems ST7789Display or ST7789LCDDisplay are too hard coded for other devices
+  ; -D PIN_TFT_CS=17 ; Seems to be right, but seems ST7789Display or ST7789LCDDisplay are too hard coded for other devices
+  ; -D PIN_TFT_DC=?? ; ToDo: Unsure
+  ; -D ST7789 ; This is the display driver type (- 1.14" IPS LCD, ST7789P3 driver @ SPI communication, Resolution: 135 × 240 pixels, 262K colors (18-bit)), but seems ST7789Display or ST7789LCDDisplay are too hard coded for other devices
+  ; -D DISPLAY_CLASS=ST7789Display
   -D DISABLE_WIFI_OTA=1
 build_src_filter = ${esp32c6_base.build_src_filter}
   +<../variants/arduino_nesso_n1>

From 6c291b87b7d732a55430b269b49528beec81141b Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Tue, 18 Nov 2025 22:23:08 +0000
Subject: [PATCH 03/10] Arduino Nesso N1: move delay into debug

---
 variants/arduino_nesso_n1/ArduinoNessoN1Board.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
index cba9e1525..04ff64ca6 100644
--- a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
@@ -14,7 +14,10 @@ private:
 public:
   void begin() {
     ESP32Board::begin();
+#ifdef MESH_DEBUG
+    // delay for 2s after boot to ensure early output below makes it to the serial logger
     delay(2000);
+#endif
 
 #ifdef P_LORA_TX_LED
     MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): setup TX LED mode");

From 09cdd1b7bf078eeeca528da8e45ba504c083945b Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Sat, 22 Nov 2025 00:05:20 +0000
Subject: [PATCH 04/10] Arduino Nesso N1: renaming main cpp

---
 variants/arduino_nesso_n1/{ArduinoNessoN1Board.cpp => target.cpp} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename variants/arduino_nesso_n1/{ArduinoNessoN1Board.cpp => target.cpp} (100%)

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp b/variants/arduino_nesso_n1/target.cpp
similarity index 100%
rename from variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
rename to variants/arduino_nesso_n1/target.cpp

From b4b844b067b6efcb08e64a035b6bbc43207911f8 Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Sat, 22 Nov 2025 02:14:24 +0000
Subject: [PATCH 05/10] Arduino Nesso N1: header/cpp rearrange + attempting to
 debug crash

---
 .../arduino_nesso_n1/ArduinoNessoN1Board.cpp  | 50 +++++++++++++++++++
 .../arduino_nesso_n1/ArduinoNessoN1Board.h    | 25 ++++------
 variants/arduino_nesso_n1/expander.cpp        |  7 +++
 variants/arduino_nesso_n1/platformio.ini      | 20 ++++----
 variants/arduino_nesso_n1/target.cpp          | 31 +-----------
 5 files changed, 77 insertions(+), 56 deletions(-)
 create mode 100644 variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
new file mode 100644
index 000000000..988cca6dc
--- /dev/null
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
@@ -0,0 +1,50 @@
+#include "ArduinoNessoN1Board.h"
+#include <Arduino.h>
+
+void ArduinoNessoN1Board::begin() {
+  ESP32Board::begin();
+
+#ifdef MESH_DEBUG
+  // delay for 2s after boot to ensure early output below makes it to the serial logger
+  delay(2000);
+#endif
+
+#ifdef P_LORA_TX_LED
+  MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): setup TX LED mode");
+  pinMode(P_LORA_TX_LED, OUTPUT);
+  digitalWrite(P_LORA_TX_LED, HIGH);
+#endif
+
+  battery.enableCharge();
+
+  MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): set Nesso N1 pin modes and default states...");
+  pinMode(LORA_ENABLE, OUTPUT);         // RESET
+  pinMode(LORA_ANTENNA_SWITCH, OUTPUT); // ANTENNA_SWITCH
+  pinMode(LORA_LNA_ENABLE, OUTPUT);     // LNA_ENABLE
+  pinMode(LCD_BACKLIGHT, OUTPUT);
+  pinMode(BEEP_PIN, OUTPUT);
+
+  // Toggle LoRa reset via expander
+  MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): Enable LoRa...");
+  digitalWrite(LORA_ENABLE, LOW);
+  delay(10);
+  digitalWrite(LORA_ENABLE, HIGH);
+
+  // Configure antenna switch and LNA
+  digitalWrite(LORA_ANTENNA_SWITCH, HIGH); // enable antenna switch
+  digitalWrite(LORA_LNA_ENABLE, HIGH);     // enable LNA
+
+  // Configure initial state of further devices on expander
+  MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): Set LCD_BACKLIGHT and BEEP_PIN to low initial state...");
+  digitalWrite(LCD_BACKLIGHT, LOW);
+  digitalWrite(BEEP_PIN, LOW);
+
+  // Toggle LCD backlight to show the device has powered on until we get the screen working
+  MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): Now high...");
+  digitalWrite(LCD_BACKLIGHT, HIGH);
+  digitalWrite(BEEP_PIN, HIGH);
+  delay(2000);
+  digitalWrite(LCD_BACKLIGHT, LOW);
+  digitalWrite(BEEP_PIN, LOW);
+  MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): Now low...");
+}
\ No newline at end of file
diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
index 04ff64ca6..76f37b877 100644
--- a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
@@ -1,32 +1,20 @@
 #pragma once
 
 #include <Arduino.h>
+#include <MeshCore.h>
 #include <helpers/ESP32Board.h>
 #include "pins_arduino.h"
 
-#define P_LORA_TX_LED LED_BUILTIN
+#define P_LORA_TX_LED LED_BUILTIN // defined in pins_arduino.h / expander.cpp through pin handling functions specific to the IO expander
 // #define PIN_TFT_RST LCD_RESET 
 // #define PIN_TFT_LEDA_CTL LCD_BACKLIGHT
 
 class ArduinoNessoN1Board : public ESP32Board {
 private:
   NessoBattery battery;
-public:
-  void begin() {
-    ESP32Board::begin();
-#ifdef MESH_DEBUG
-    // delay for 2s after boot to ensure early output below makes it to the serial logger
-    delay(2000);
-#endif
-
-#ifdef P_LORA_TX_LED
-    MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): setup TX LED mode");
-    pinMode(P_LORA_TX_LED, OUTPUT);
-    digitalWrite(P_LORA_TX_LED, HIGH);
-#endif
 
-    battery.enableCharge();
-  }
+public:
+  void begin(); // Defined in ArduinoNessoN1Board.cpp
 
 #ifdef P_LORA_TX_LED
   void onBeforeTransmit() override {
@@ -46,6 +34,11 @@ public:
   uint16_t getBattMilliVolts() override {
     return battery.getMilliVoltage();
   }
+
+  void reboot() override {
+    MESH_DEBUG_PRINTLN("ArduinoNessoN1.reboot(): noop() instead");
+    // esp_restart();
+  }
 };
 
 
diff --git a/variants/arduino_nesso_n1/expander.cpp b/variants/arduino_nesso_n1/expander.cpp
index 3d058e998..9de8486a8 100644
--- a/variants/arduino_nesso_n1/expander.cpp
+++ b/variants/arduino_nesso_n1/expander.cpp
@@ -1,3 +1,4 @@
+#pragma once
 // Based off here https://github.com/espressif/arduino-esp32/blob/d1eb62d7c6dda16c254c374504aa93188d7c386b/variants/arduino_nesso_n1/expander.cpp
 // Should be OK based on this? https://opensource.stackexchange.com/a/6406
 
@@ -25,6 +26,7 @@ static uint8_t readRegister(uint8_t address, uint8_t reg) {
 }
 
 static void writeBitRegister(uint8_t address, uint8_t reg, uint8_t bit, uint8_t value) {
+  MESH_DEBUG_PRINTLN("ExpanderPin writeBitRegister(address=%u, reg=%u, bit=%u, value=%u)", address, reg, bit, value);
   uint8_t val = readRegister(address, reg);
   if (value) {
     writeRegister(address, reg, val | (1 << bit));
@@ -34,6 +36,7 @@ static void writeBitRegister(uint8_t address, uint8_t reg, uint8_t bit, uint8_t
 }
 
 static bool readBitRegister(uint8_t address, uint8_t reg, uint8_t bit) {
+  MESH_DEBUG_PRINTLN("ExpanderPin readBitRegister(address=%u, reg=%u, bit=%u)", address, reg, bit);
   uint8_t val = readRegister(address, reg);
   return ((val & (1 << bit)) > 0);
 }
@@ -54,6 +57,7 @@ void pinMode(ExpanderPin pin, uint8_t mode) {
     writeRegister(pin.address, 0x3, 0);
     expanderInitialized = true;
   }
+  MESH_DEBUG_PRINTLN("ExpanderPin pinMode(pin=%u, mode=%u)", pin.pin, mode);
   writeBitRegister(pin.address, 0x3, pin.pin, mode == OUTPUT);
   if (mode == OUTPUT) {
     // remove high impedance
@@ -77,6 +81,7 @@ void digitalWrite(ExpanderPin pin, uint8_t val) {
     Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
+  MESH_DEBUG_PRINTLN("ExpanderPin digitalWrite(%u)", pin.pin);
   writeBitRegister(pin.address, 0x5, pin.pin, val == HIGH);
 }
 
@@ -85,6 +90,7 @@ int digitalRead(ExpanderPin pin) {
     Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
+  MESH_DEBUG_PRINTLN("ExpanderPin digitalRead(%u)", pin.pin);
   return readBitRegister(pin.address, 0xF, pin.pin);
 }
 
@@ -132,6 +138,7 @@ uint16_t NessoBattery::getChargeLevel() {
     Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
+  MESH_DEBUG_PRINTLN("NessoBattery::getChargeLevel()");
   uint16_t current_capacity = readRegister(0x55, 0x11) << 8 | readRegister(0x55, 0x10);
   uint16_t total_capacity = readRegister(0x55, 0x13) << 8 | readRegister(0x55, 0x12);
   return (current_capacity * 100) / total_capacity;
diff --git a/variants/arduino_nesso_n1/platformio.ini b/variants/arduino_nesso_n1/platformio.ini
index e5ec4134d..16bbec3da 100644
--- a/variants/arduino_nesso_n1/platformio.ini
+++ b/variants/arduino_nesso_n1/platformio.ini
@@ -5,23 +5,23 @@ board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
 build_flags =
   ${esp32c6_base.build_flags}
   -I variants/arduino_nesso_n1
-  ; -D MESH_DEBUG=1
-  ; -D ARDUINO=1
+  -D MESH_DEBUG=1
+  -D ARDUINO=1
   -D ARDUINO_USB_CDC_ON_BOOT=1
   -D ARDUINO_USB_MODE=1
-  ; -D P_LORA_TX_LED= ; Only an IR LED, so disabled for now
+  ; -D P_LORA_TX_LED= ; Defined in ArduinoNessoN1Board.h
   -D P_LORA_SCLK=20
   -D P_LORA_MISO=22
   -D P_LORA_MOSI=21
   -D P_LORA_NSS=23 ; aka LORA_CS on the Nesso N1 schematic
   -D P_LORA_DIO_1=15 ; aka LORA_IRQ on the Nesso N1 schematic
   -D P_LORA_BUSY=19
-  ; -D P_LORA_RESET=2 ; ToDo: Required, is on an IO expander: E0.P7 (Address 0x43)
+  ; -D P_LORA_RESET=-1 ; Enabled in ArduinoNessoN1Board.cpp instead
   -D PIN_BOARD_SDA=10
   -D PIN_BOARD_SCL=8
   ; -D SX126X_RXEN=23 ; ToDo: not sure
-  -D SX126X_DIO2_AS_RF_SWITCH=true
-  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+  ; -D SX126X_DIO2_AS_RF_SWITCH=true
+  ; -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
   -D RADIO_CLASS=CustomSX1262
@@ -47,17 +47,17 @@ build_flags =
   ; -D DISPLAY_CLASS=ST7789Display
   -D DISABLE_WIFI_OTA=1
 build_src_filter = ${esp32c6_base.build_src_filter}
-  +<../variants/arduino_nesso_n1>
   +<expander.cpp>
   +<ArduinoNessoN1Board.cpp>
+  +<../variants/arduino_nesso_n1>
 
-[env:Arduino_Nesso_N1_repeater_]
+[env:Arduino_Nesso_N1_repeater]
 extends = Arduino_Nesso_N1
 build_src_filter = ${Arduino_Nesso_N1.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Arduino_Nesso_N1.build_flags}
-  -D ADVERT_NAME='"Xiao C6 Repeater"'
+  -D ADVERT_NAME='"Arduino Nesso N1 Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
@@ -68,7 +68,7 @@ lib_deps =
   ${Arduino_Nesso_N1.lib_deps}
 ;  ${esp32_ota.lib_deps}
 
-[env:Arduino_Nesso_N1_companion_radio_ble_]
+[env:Arduino_Nesso_N1_companion_radio_ble]
 extends = Arduino_Nesso_N1
 build_flags = ${Arduino_Nesso_N1.build_flags}
   -D MAX_CONTACTS=350
diff --git a/variants/arduino_nesso_n1/target.cpp b/variants/arduino_nesso_n1/target.cpp
index a31cf636d..6118453c1 100644
--- a/variants/arduino_nesso_n1/target.cpp
+++ b/variants/arduino_nesso_n1/target.cpp
@@ -1,12 +1,11 @@
 #include <Arduino.h>
 #include "target.h"
-#include "pins_arduino.h"
 
 ArduinoNessoN1Board board;
 
 #if defined(P_LORA_SCLK)
   static SPIClass spi(0);
-  // replace P_LORA_RESET with -1 to indicate RESET is handled outside
+  // replace P_LORA_RESET with -1 to indicate RESET is handled elsewhere (which is in ArduinoNessoN1Board.cpp)
   RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, -1, P_LORA_BUSY, spi);
 #else
   RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, -1, P_LORA_BUSY);
@@ -23,34 +22,6 @@ bool radio_init() {
   fallback_clock.begin();
   rtc_clock.begin(Wire);
 
-  MESH_DEBUG_PRINTLN("set Nesso N1 pin modes and default states...");
-  pinMode(LORA_ENABLE, OUTPUT); // RESET
-  pinMode(LORA_ANTENNA_SWITCH, OUTPUT); // ANTENNA_SWITCH
-  pinMode(LORA_LNA_ENABLE, OUTPUT); // LNA_ENABLE
-  pinMode(LCD_BACKLIGHT, OUTPUT);
-  pinMode(BEEP_PIN, OUTPUT);
-
-  // Toggle LoRa reset via expander
-  MESH_DEBUG_PRINTLN("Enable LoRa...");
-  digitalWrite(LORA_ENABLE, LOW);
-  delay(10);
-  digitalWrite(LORA_ENABLE, HIGH);
-
-  // Configure antenna switch and LNA
-  digitalWrite(LORA_ANTENNA_SWITCH, HIGH); // enable antenna switch
-  digitalWrite(LORA_LNA_ENABLE, HIGH); // enable LNA
-
-  // Configure initial state of further devices on expander
-  digitalWrite(LCD_BACKLIGHT, LOW);
-  digitalWrite(BEEP_PIN, LOW);
-
-  // Toggle LCD backlight to show the device has powered on until we get the screen working
-  digitalWrite(LCD_BACKLIGHT, HIGH);
-  // digitalWrite(BEEP_PIN, HIGH);
-  delay(2000);
-  digitalWrite(LCD_BACKLIGHT, LOW);
-  // digitalWrite(BEEP_PIN, LOW);
-
   MESH_DEBUG_PRINTLN("radio.std_init() and return...");
 #if defined(P_LORA_SCLK)
   spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);

From 24385e84d9aac477ed975e0a29d725aab225ce15 Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Sat, 29 Nov 2025 20:32:57 +0000
Subject: [PATCH 06/10] Add AW32001E init to disable WDT

---
 .../arduino_nesso_n1/ArduinoNessoN1Board.cpp  |  1 +
 variants/arduino_nesso_n1/expander.cpp        | 56 +++++++++++++++++--
 variants/arduino_nesso_n1/pins_arduino.h      | 18 +++++-
 3 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
index 988cca6dc..777befb32 100644
--- a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
@@ -15,6 +15,7 @@ void ArduinoNessoN1Board::begin() {
   digitalWrite(P_LORA_TX_LED, HIGH);
 #endif
 
+  battery.begin();
   battery.enableCharge();
 
   MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): set Nesso N1 pin modes and default states...");
diff --git a/variants/arduino_nesso_n1/expander.cpp b/variants/arduino_nesso_n1/expander.cpp
index 9de8486a8..80e53b4c4 100644
--- a/variants/arduino_nesso_n1/expander.cpp
+++ b/variants/arduino_nesso_n1/expander.cpp
@@ -94,20 +94,64 @@ int digitalRead(ExpanderPin pin) {
   return readBitRegister(pin.address, 0xF, pin.pin);
 }
 
-void NessoBattery::enableCharge() {
+void NessoBattery::begin() {
   // AW32001E - address 0x49
-  // set CEB bit low (charge enable)
+  // Spec: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/products/core/LLM630%20Computer%20Kit/AW32001E.pdf
   if (!wireInitialized) {
     Wire.begin(SDA, SCL);
     wireInitialized = true;
   }
 
+  uint8_t val = 0;
+  val = readRegister(AW32001_I2C_CHIP_ADDR, AW32001_REG_CHIP_ID);
+  // coarsely check if chip is actually the right chip
+  auto res = (val == AW32001_I2C_CHIP_ADDR);
+  if (res) {
+    val = readRegister(AW32001_I2C_CHIP_ADDR, AW32001_REG_CHR_TMR);
+#ifdef MESH_DEBUG
+    // Debug output the WatchDog Timer (wdt) state
+    MESH_DEBUG_PRINTLN("NessoBattery.begin(): CHR_TMR full register; bits 5,6 are for WDT = %#02x", val);
+#endif
+    // disable WatchDog Timer (wdt)
+    // take existing register value AND with 00011111
+    val = val & 0x1f;
+    writeRegister(AW32001_I2C_CHIP_ADDR, AW32001_REG_CHR_TMR, val);
+  }
+#ifdef MESH_DEBUG
+  else {
+    MESH_DEBUG_PRINTLN("NessoBattery.begin(): Register of chip ADDR = %u != I2C of chip %u", AW32001_REG_CHIP_ID, AW32001_I2C_CHIP_ADDR);
+  }
+#endif
+
+  // store if chip is initiated by whether it passed above checks and had watchdog disabled
+  _power_mgmt_init = res;
+}
+
+void NessoBattery::enableCharge() {
+  // AW32001E - address 0x49
+  // set CEB (charge enable) bit (3) low (0) in AW32001_REG_PWR_CFG (0x01)
   MESH_DEBUG_PRINTLN("NessoBattery::enableCharge()");
-  MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current charge level %u %%", NessoBattery::getChargeLevel());
-  MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %f V", NessoBattery::getVoltage());
-  MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %u mV", NessoBattery::getMilliVoltage());
 
-  writeBitRegister(0x49, 0x1, 3, false);
+  if (_power_mgmt_init) {
+    MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): _power_mgmt_init = true");
+    if (!wireInitialized) {
+      Wire.begin(SDA, SCL);
+      wireInitialized = true;
+    }
+
+    bool charge_enable_bit = readBitRegister(AW32001_I2C_CHIP_ADDR, AW32001_REG_PWR_CFG, 3);
+    MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current charge setting (low is on): %u", charge_enable_bit);
+    MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current charge level %u %%", NessoBattery::getChargeLevel());
+    MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %f V", NessoBattery::getVoltage());
+    MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %u mV", NessoBattery::getMilliVoltage());
+
+    writeBitRegister(AW32001_I2C_CHIP_ADDR, AW32001_REG_PWR_CFG, 3, false);
+  }
+#ifdef MESH_DEBUG
+  else {
+    MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): _power_mgmt_init is false, won't enable charge");
+  }
+#endif
 }
 
 float NessoBattery::getVoltage() {
diff --git a/variants/arduino_nesso_n1/pins_arduino.h b/variants/arduino_nesso_n1/pins_arduino.h
index c675613f5..07390aadd 100644
--- a/variants/arduino_nesso_n1/pins_arduino.h
+++ b/variants/arduino_nesso_n1/pins_arduino.h
@@ -41,6 +41,19 @@ static const uint8_t SYS_IRQ = 3;
 static const uint8_t LCD_CS = 17;
 static const uint8_t LCD_RS = 16;
 
+
+// AW32001 registers
+static constexpr const uint8_t AW32001_REG_PWR_CFG = 0x01; // Power Configuration
+static constexpr const uint8_t AW32001_REG_CHR_CUR = 0x02; // Charging current
+static constexpr const uint8_t AW32001_REG_CHR_VOL = 0x04; // Charge voltage
+static constexpr const uint8_t AW32001_REG_CHR_TMR = 0x05; // Charge timer
+static constexpr const uint8_t AW32001_REG_SYS_STA = 0x08; // System status
+static constexpr const uint8_t AW32001_REG_CHIP_ID = 0x0A; // ChipID
+
+static constexpr const uint8_t AW32001_I2C_CHIP_ADDR = 0x49; // ChipID
+
+
+
 #if !defined(MAIN_ESP32_HAL_GPIO_H_) && defined(__cplusplus)
 /* address: 0x43/0x44 */
 class ExpanderPin {
@@ -51,9 +64,12 @@ public:
 };
 
 class NessoBattery {
+private:
+  bool _power_mgmt_init = false;
 public:
   NessoBattery(){};
-  void enableCharge();        // enable charging
+  void begin(){};             // setup and check power management chip
+  void enableCharge();        // enable charging via power management chip
   float getVoltage();         // get battery voltage in Volts
   uint16_t getMilliVoltage(); // get battery voltage in millivolts
   uint16_t getChargeLevel();  // get battery charge level in percents

From 24d9003438de51bd8ac5f1f6e4df68201ff6d877 Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Sat, 29 Nov 2025 21:18:04 +0000
Subject: [PATCH 07/10] Arduino Nesso N1: Charging status

---
 .../arduino_nesso_n1/ArduinoNessoN1Board.h    |  6 ++++
 variants/arduino_nesso_n1/expander.cpp        | 32 +++++++++++++++++++
 variants/arduino_nesso_n1/pins_arduino.h      | 27 +++++++++++-----
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
index 76f37b877..67fdce08f 100644
--- a/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.h
@@ -32,6 +32,12 @@ public:
   }
 
   uint16_t getBattMilliVolts() override {
+#ifdef MESH_DEBUG
+    MESH_DEBUG_PRINTLN("getBattMilliVolts(): isCharging(): %u", battery.isCharging());
+    MESH_DEBUG_PRINTLN("getBattMilliVolts(): Current charge level %u %%", battery.getChargeLevel());
+    MESH_DEBUG_PRINTLN("getBattMilliVolts(): Current voltage %f V", battery.getVoltage());
+    MESH_DEBUG_PRINTLN("getBattMilliVolts(): Current voltage %u mV", battery.getMilliVoltage());
+#endif
     return battery.getMilliVoltage();
   }
 
diff --git a/variants/arduino_nesso_n1/expander.cpp b/variants/arduino_nesso_n1/expander.cpp
index 80e53b4c4..0e281e759 100644
--- a/variants/arduino_nesso_n1/expander.cpp
+++ b/variants/arduino_nesso_n1/expander.cpp
@@ -141,6 +141,7 @@ void NessoBattery::enableCharge() {
 
     bool charge_enable_bit = readBitRegister(AW32001_I2C_CHIP_ADDR, AW32001_REG_PWR_CFG, 3);
     MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current charge setting (low is on): %u", charge_enable_bit);
+    MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): isCharging(): %u", NessoBattery::isCharging());
     MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current charge level %u %%", NessoBattery::getChargeLevel());
     MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %f V", NessoBattery::getVoltage());
     MESH_DEBUG_PRINTLN("NessoBattery::enableCharge(): Current voltage %u mV", NessoBattery::getMilliVoltage());
@@ -154,6 +155,34 @@ void NessoBattery::enableCharge() {
 #endif
 }
 
+NessoBattery::ChargeStatus NessoBattery::getChargeStatus(void) {
+  uint8_t reg_value = 0;
+  if (_power_mgmt_init)
+  {
+    reg_value = readRegister(AW32001_I2C_CHIP_ADDR, AW32001_REG_SYS_STA);
+    // Extract bits 4 and 3 for charge status
+    reg_value = (reg_value >> 3) & 0b00000011; // Get bits 4 and 3
+    MESH_DEBUG_PRINTLN("NessoBattery::getChargeStatus(): bits 4 and 3 from register %#02x = %u", AW32001_REG_SYS_STA, reg_value);
+    switch (reg_value)
+    {
+      case 0b00: return CS_NOT_CHARGING; // Not charging
+      case 0b01: return CS_PRE_CHARGE;   // Pre-charge
+      case 0b10: return CS_CHARGE;       // Charging
+      case 0b11: return CS_CHARGE_DONE;  // Charge done
+      default: return CS_UNKNOWN;        // Unknown state
+    }
+  }
+  MESH_DEBUG_PRINTLN("NessoBattery::getChargeStatus(): failed, probably chip wasn't init");
+  return CS_UNKNOWN; // Return unknown if read failed
+}
+
+bool NessoBattery::isCharging(void)
+{
+  ChargeStatus status = getChargeStatus();
+  MESH_DEBUG_PRINTLN("NessoBattery::isCharging(): ChargeStatus = %u; is? false0/true1 = %u", status, (status == CS_PRE_CHARGE || status == CS_CHARGE));
+  return (status == CS_PRE_CHARGE || status == CS_CHARGE);
+}
+
 float NessoBattery::getVoltage() {
   // BQ27220 - address 0x55
   if (!wireInitialized) {
@@ -162,6 +191,7 @@ float NessoBattery::getVoltage() {
   }
   MESH_DEBUG_PRINTLN("NessoBattery::getVoltage()");
   uint16_t voltage = (readRegister(0x55, 0x9) << 8) | readRegister(0x55, 0x8);
+  MESH_DEBUG_PRINTLN("NessoBattery::getVoltage(): %f", voltage / 1000.0f);
   return (float)voltage / 1000.0f;
 }
 
@@ -173,6 +203,7 @@ uint16_t NessoBattery::getMilliVoltage() {
   }
   MESH_DEBUG_PRINTLN("NessoBattery::getMilliVoltage()");
   uint16_t voltage = (readRegister(0x55, 0x9) << 8) | readRegister(0x55, 0x8);
+  MESH_DEBUG_PRINTLN("NessoBattery::getMilliVoltage(): %u", voltage);
   return voltage;
 }
 
@@ -185,6 +216,7 @@ uint16_t NessoBattery::getChargeLevel() {
   MESH_DEBUG_PRINTLN("NessoBattery::getChargeLevel()");
   uint16_t current_capacity = readRegister(0x55, 0x11) << 8 | readRegister(0x55, 0x10);
   uint16_t total_capacity = readRegister(0x55, 0x13) << 8 | readRegister(0x55, 0x12);
+  MESH_DEBUG_PRINTLN("NessoBattery::getChargeLevel(): curr = %u / total = %u; pct = %u %%", current_capacity, total_capacity, ((current_capacity * 100) / total_capacity));
   return (current_capacity * 100) / total_capacity;
 }
 
diff --git a/variants/arduino_nesso_n1/pins_arduino.h b/variants/arduino_nesso_n1/pins_arduino.h
index 07390aadd..1f3a675f9 100644
--- a/variants/arduino_nesso_n1/pins_arduino.h
+++ b/variants/arduino_nesso_n1/pins_arduino.h
@@ -43,14 +43,14 @@ static const uint8_t LCD_RS = 16;
 
 
 // AW32001 registers
-static constexpr const uint8_t AW32001_REG_PWR_CFG = 0x01; // Power Configuration
-static constexpr const uint8_t AW32001_REG_CHR_CUR = 0x02; // Charging current
-static constexpr const uint8_t AW32001_REG_CHR_VOL = 0x04; // Charge voltage
-static constexpr const uint8_t AW32001_REG_CHR_TMR = 0x05; // Charge timer
-static constexpr const uint8_t AW32001_REG_SYS_STA = 0x08; // System status
-static constexpr const uint8_t AW32001_REG_CHIP_ID = 0x0A; // ChipID
+static const uint8_t AW32001_REG_PWR_CFG = 0x01; // Power Configuration
+static const uint8_t AW32001_REG_CHR_CUR = 0x02; // Charging current
+static const uint8_t AW32001_REG_CHR_VOL = 0x04; // Charge voltage
+static const uint8_t AW32001_REG_CHR_TMR = 0x05; // Charge timer
+static const uint8_t AW32001_REG_SYS_STA = 0x08; // System status
+static const uint8_t AW32001_REG_CHIP_ID = 0x0A; // ChipID
 
-static constexpr const uint8_t AW32001_I2C_CHIP_ADDR = 0x49; // ChipID
+static const uint8_t AW32001_I2C_CHIP_ADDR = 0x49; // ChipID
 
 
 
@@ -67,12 +67,23 @@ class NessoBattery {
 private:
   bool _power_mgmt_init = false;
 public:
+  enum ChargeStatus
+  {
+    CS_UNKNOWN = -1,
+    CS_NOT_CHARGING = 0,
+    CS_PRE_CHARGE = 1,
+    CS_CHARGE = 2,
+    CS_CHARGE_DONE = 3
+  };
+
   NessoBattery(){};
-  void begin(){};             // setup and check power management chip
+  void begin();             // setup and check power management chip
   void enableCharge();        // enable charging via power management chip
   float getVoltage();         // get battery voltage in Volts
   uint16_t getMilliVoltage(); // get battery voltage in millivolts
   uint16_t getChargeLevel();  // get battery charge level in percents
+  ChargeStatus getChargeStatus();
+  bool isCharging();
 };
 
 extern ExpanderPin LORA_LNA_ENABLE;

From a830946c4edc8f1c6b6a50c478c8d0cf56cdcdc9 Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:18:18 +0000
Subject: [PATCH 08/10] N1: Disable debug

---
 variants/arduino_nesso_n1/platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variants/arduino_nesso_n1/platformio.ini b/variants/arduino_nesso_n1/platformio.ini
index 16bbec3da..6abb871bd 100644
--- a/variants/arduino_nesso_n1/platformio.ini
+++ b/variants/arduino_nesso_n1/platformio.ini
@@ -5,7 +5,7 @@ board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
 build_flags =
   ${esp32c6_base.build_flags}
   -I variants/arduino_nesso_n1
-  -D MESH_DEBUG=1
+  ; -D MESH_DEBUG=1
   -D ARDUINO=1
   -D ARDUINO_USB_CDC_ON_BOOT=1
   -D ARDUINO_USB_MODE=1

From c4e3a10a8e55c650a27bf8a5c8da603957a71971 Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:20:40 +0000
Subject: [PATCH 09/10] N1: Inspiration comment

---
 variants/arduino_nesso_n1/expander.cpp   | 2 ++
 variants/arduino_nesso_n1/pins_arduino.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/variants/arduino_nesso_n1/expander.cpp b/variants/arduino_nesso_n1/expander.cpp
index 0e281e759..d4054ad6f 100644
--- a/variants/arduino_nesso_n1/expander.cpp
+++ b/variants/arduino_nesso_n1/expander.cpp
@@ -2,6 +2,8 @@
 // Based off here https://github.com/espressif/arduino-esp32/blob/d1eb62d7c6dda16c254c374504aa93188d7c386b/variants/arduino_nesso_n1/expander.cpp
 // Should be OK based on this? https://opensource.stackexchange.com/a/6406
 
+// Some inspiration from: https://github.com/m5stack/M5Unified/blob/master/src/utility/power/AW32001_Class.cpp
+
 #include "pins_arduino.h"
 #include <helpers/ESP32Board.h>
 #include <Wire.h>
diff --git a/variants/arduino_nesso_n1/pins_arduino.h b/variants/arduino_nesso_n1/pins_arduino.h
index 1f3a675f9..503016df9 100644
--- a/variants/arduino_nesso_n1/pins_arduino.h
+++ b/variants/arduino_nesso_n1/pins_arduino.h
@@ -1,4 +1,5 @@
 // from https://github.com/espressif/arduino-esp32/pull/11985/files
+// some inspiration from https://github.com/m5stack/M5Unified/blob/master/src/utility/power/AW32001_Class.hpp
 #ifndef Pins_Arduino_h
 #define Pins_Arduino_h
 

From b89e52930087fd6718cf3d913771ceaa0f48d1a7 Mon Sep 17 00:00:00 2001
From: Ashley <webash@users.noreply.github.com>
Date: Mon, 26 Jan 2026 23:44:42 +0000
Subject: [PATCH 10/10] Nesso N1: making screen flash delay only in debug mode

---
 variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
index 777befb32..2283e460b 100644
--- a/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
+++ b/variants/arduino_nesso_n1/ArduinoNessoN1Board.cpp
@@ -40,7 +40,9 @@ void ArduinoNessoN1Board::begin() {
   digitalWrite(LCD_BACKLIGHT, LOW);
   digitalWrite(BEEP_PIN, LOW);
 
+#ifdef MESH_DEBUG
   // Toggle LCD backlight to show the device has powered on until we get the screen working
+  // Only do this if in debug mode, since the delay is quite long
   MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): Now high...");
   digitalWrite(LCD_BACKLIGHT, HIGH);
   digitalWrite(BEEP_PIN, HIGH);
@@ -48,4 +50,5 @@ void ArduinoNessoN1Board::begin() {
   digitalWrite(LCD_BACKLIGHT, LOW);
   digitalWrite(BEEP_PIN, LOW);
   MESH_DEBUG_PRINTLN("ArduinoNessoN1.begin(): Now low...");
+#endif
 }
\ No newline at end of file