Merge branch 'master' into store-and-forward

2025-04-23 09:06:02 +00:00 · 2024-10-28 12:11:46 +01:00 · 2024-10-28 12:11:46 +01:00 · fbe6a3c4d2
commit fbe6a3c4d2
parent 91933c66f3 195f109ef7
27 changed files with 469 additions and 31 deletions
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@ -1,22 +1,22 @@
 version: 0.1
 cli:
-  version: 1.22.6
+  version: 1.22.7
 plugins:
  sources:
    - id: trunk
-      ref: v1.6.3
+      ref: v1.6.4
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - trufflehog@3.82.6
+    - trufflehog@3.82.12
    - yamllint@1.35.1
    - bandit@1.7.10
    - checkov@3.2.256
-    - terrascan@1.19.1
+    - terrascan@1.19.9
    - trivy@0.55.2
    #- trufflehog@3.63.2-rc0
    - taplo@0.9.3
-    - ruff@0.6.8
+    - ruff@0.7.0
    - isort@5.13.2
    - markdownlint@0.42.0
    - oxipng@9.1.2
@ -26,9 +26,9 @@ lint:
    - hadolint@2.12.0
    - shfmt@3.6.0
    - shellcheck@0.10.0
-    - black@24.8.0
+    - black@24.10.0
    - git-diff-check
-    - gitleaks@8.20.0
+    - gitleaks@8.21.1
    - clang-format@16.0.3
    - prettier@3.3.3
  ignore:
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@ -24,3 +24,4 @@ lib_deps=

 lib_ignore =
  BluetoothOTA
+  lvgl
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@ -24,7 +24,7 @@ lib_deps =
  ${env.lib_deps}
  ${networking_base.lib_deps}
  rweather/Crypto@^0.4.0
-  lovyan03/LovyanGFX@^1.1.16
+  https://github.com/lovyan03/LovyanGFX.git#1401c28a47646fe00538d487adcb2eb3c72de805

 build_flags =
  ${arduino_base.build_flags}
--- a/arch/rp2xx0/rp2350.ini
+++ b/arch/rp2xx0/rp2350.ini
@ -16,6 +16,7 @@ build_src_filter =

 lib_ignore =
  BluetoothOTA
+  lvgl

 lib_deps =
  ${arduino_base.lib_deps}
--- a/bin/config-dist.yaml
+++ b/bin/config-dist.yaml
@ -115,6 +115,29 @@ Display:
 #  Height: 320
 #  Rotate: true

+### SHCHV 3.5 RPi TFT+Touchscreen
+#  Panel: ILI9486
+#  spidev: spidev0.0
+#  BusFrequency: 30000000
+#  DC: 24
+#  Reset: 25
+#  Width: 320
+#  Height: 480
+#  OffsetRotate: 2
+
+### TZT 2.0 Inch TFT Display ST7789V 240RGBx320
+#  Panel: ST7789
+#  spidev: spidev0.0
+#  # CS: 8     # can be freely chosen
+#  BusFrequency: 80000000
+#  DC: 24      # can be freely chosen
+#  Width: 320
+#  Height: 240
+#  Reset: 25   # can be freely chosen
+#  Rotate: true
+#  OffsetRotate: 1
+#  Invert: true
+
 ### You can also specify the spi device for the display to use
 # spidev: spidev0.0

--- a/boards/bpi_picow_esp32_s3.json
+++ b/boards/bpi_picow_esp32_s3.json
@ -28,6 +28,8 @@
    "flash_size": "8MB",
    "maximum_ram_size": 327680,
    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
    "require_upload_port": true,
    "speed": 921600
  },
--- a/boards/icarus.json
+++ b/boards/icarus.json
@ -0,0 +1,41 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=0"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x2886", "0x0059"]],
+    "mcu": "esp32s3",
+    "variant": "icarus"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "icarus",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 8388608,
+    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://icarus.azlan.works",
+  "vendor": "Muhammad Shah"
+}
--- a/boards/unphone.json
+++ b/boards/unphone.json
@ -0,0 +1,46 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi",
+      "partitions": "default_8MB.csv"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DUNPHONE_SPIN=9",
+      "-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": "qio",
+    "hwids": [
+      ["0x16D0", "0x1178"],
+      ["0x303a", "0x1001"]
+    ],
+    "mcu": "esp32s3",
+    "variant": "unphone"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "unPhone",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8323072,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://unphone.net/",
+  "vendor": "University of Sheffield"
+}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7960241ccdd6b262a11b79523857037f755ab847
+Subproject commit 7dc7a6d21991efe362c7cbb556573f6bb285e407
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@ -20,6 +20,7 @@
 #ifdef ARCH_PORTDUINO
 #include "PortduinoGlue.h"
 #include "meshUtils.h"
+#include <algorithm>
 #include <ctime>
 #endif

--- a/src/main.cpp
+++ b/src/main.cpp
@ -266,14 +266,19 @@ void setup()
 #ifdef DEBUG_PORT
    consoleInit(); // Set serial baud rate and init our mesh console
 #endif
+
+#ifdef UNPHONE
+    unphone.printStore();
+#endif
+
 #if ARCH_PORTDUINO
    struct timeval tv;
    tv.tv_sec = time(NULL);
    tv.tv_usec = 0;
    perhapsSetRTC(RTCQualityNTP, &tv);
 #endif
-    powerMonInit();

+    powerMonInit();
    serialSinceMsec = millis();

    LOG_INFO("\n\n//\\ E S H T /\\ S T / C\n");
@ -642,6 +647,8 @@ void setup()
    rp2040Setup();
 #endif

+    initSPI(); // needed here before reading from littleFS
+
    // We do this as early as possible because this loads preferences from flash
    // but we need to do this after main cpu init (esp32setup), because we need the random seed set
    nodeDB = new NodeDB;
@ -705,7 +712,6 @@ void setup()
 #endif

    // Init our SPI controller (must be before screen and lora)
-    initSPI();
 #ifdef ARCH_RP2040
 #ifdef HW_SPI1_DEVICE
    SPI1.setSCK(LORA_SCK);
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@ -35,7 +35,6 @@
 #if HAS_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
-
 #include <Preferences.h>
 #include <esp_efuse.h>
 #include <esp_efuse_table.h>
@ -44,6 +43,9 @@
 #include <soc/soc.h>
 #endif

+#include "SPILock.h"
+#include "modules/StoreForwardModule.h"
+
 #ifdef ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
 #endif
@ -872,6 +874,9 @@ void NodeDB::loadFromDisk()
 bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct,
                       bool fullAtomic)
 {
+#ifdef ARCH_ESP32
+    concurrency::LockGuard g(spiLock);
+#endif
    bool okay = false;
 #ifdef FSCom
    auto f = SafeFile(filename, fullAtomic);
--- a/src/mesh/RadioLibInterface.cpp
+++ b/src/mesh/RadioLibInterface.cpp
@ -20,9 +20,9 @@ void LockingArduinoHal::spiBeginTransaction()

 void LockingArduinoHal::spiEndTransaction()
 {
-    spiLock->unlock();
-
    ArduinoHal::spiEndTransaction();
+
+    spiLock->unlock();
 }
 #if ARCH_PORTDUINO
 void LockingArduinoHal::spiTransfer(uint8_t *out, size_t len, uint8_t *in)
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@ -4,6 +4,7 @@
 #ifndef PB_MESHTASTIC_MESHTASTIC_CONFIG_PB_H_INCLUDED
 #define PB_MESHTASTIC_MESHTASTIC_CONFIG_PB_H_INCLUDED
 #include <pb.h>
+#include "meshtastic/device_ui.pb.h"

 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@ -576,6 +577,7 @@ typedef struct _meshtastic_Config {
        meshtastic_Config_BluetoothConfig bluetooth;
        meshtastic_Config_SecurityConfig security;
        meshtastic_Config_SessionkeyConfig sessionkey;
+        meshtastic_DeviceUIConfig device_ui;
    } payload_variant;
 } meshtastic_Config;

@ -779,6 +781,7 @@ extern "C" {
 #define meshtastic_Config_bluetooth_tag          7
 #define meshtastic_Config_security_tag           8
 #define meshtastic_Config_sessionkey_tag         9
+#define meshtastic_Config_device_ui_tag          10

 /* Struct field encoding specification for nanopb */
 #define meshtastic_Config_FIELDLIST(X, a) \
@ -790,7 +793,8 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,display,payload_variant.disp
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,lora,payload_variant.lora),   6) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,bluetooth,payload_variant.bluetooth),   7) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,security,payload_variant.security),   8) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,sessionkey,payload_variant.sessionkey),   9)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,sessionkey,payload_variant.sessionkey),   9) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,device_ui,payload_variant.device_ui),  10)
 #define meshtastic_Config_CALLBACK NULL
 #define meshtastic_Config_DEFAULT NULL
 #define meshtastic_Config_payload_variant_device_MSGTYPE meshtastic_Config_DeviceConfig
@ -802,6 +806,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,sessionkey,payload_variant.s
 #define meshtastic_Config_payload_variant_bluetooth_MSGTYPE meshtastic_Config_BluetoothConfig
 #define meshtastic_Config_payload_variant_security_MSGTYPE meshtastic_Config_SecurityConfig
 #define meshtastic_Config_payload_variant_sessionkey_MSGTYPE meshtastic_Config_SessionkeyConfig
+#define meshtastic_Config_payload_variant_device_ui_MSGTYPE meshtastic_DeviceUIConfig

 #define meshtastic_Config_DeviceConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UENUM,    role,              1) \
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@ -900,7 +900,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
 #ifdef ARCH_PORTDUINO
    conn.wifi.status.is_connected = true;
 #else
-    conn.wifi.status.is_connected = WiFi.status() != WL_CONNECTED;
+    conn.wifi.status.is_connected = WiFi.status() == WL_CONNECTED;
 #endif
    strncpy(conn.wifi.ssid, config.network.wifi_ssid, 33);
    if (conn.wifi.status.is_connected) {
@ -932,10 +932,14 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
    conn.has_bluetooth = true;
    conn.bluetooth.pin = config.bluetooth.fixed_pin;
 #ifdef ARCH_ESP32
-    conn.bluetooth.is_connected = nimbleBluetooth->isConnected();
-    conn.bluetooth.rssi = nimbleBluetooth->getRssi();
+    if (config.bluetooth.enabled && nimbleBluetooth) {
+        conn.bluetooth.is_connected = nimbleBluetooth->isConnected();
+        conn.bluetooth.rssi = nimbleBluetooth->getRssi();
+    }
 #elif defined(ARCH_NRF52)
-    conn.bluetooth.is_connected = nrf52Bluetooth->isConnected();
+    if (config.bluetooth.enabled && nrf52Bluetooth) {
+        conn.bluetooth.is_connected = nrf52Bluetooth->isConnected();
+    }
 #endif
 #endif
    conn.has_serial = true; // No serial-less devices
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@ -184,7 +184,7 @@ int32_t ExternalNotificationModule::runOnce()
        }
 #endif
        // now let the PWM buzzer play
-        if (moduleConfig.external_notification.use_pwm) {
+        if (moduleConfig.external_notification.use_pwm && config.device.buzzer_gpio) {
            if (rtttl::isPlaying()) {
                rtttl::play();
            } else if (isNagging && (nagCycleCutoff >= millis())) {
--- a/src/modules/ExternalNotificationModule.h
+++ b/src/modules/ExternalNotificationModule.h
@ -32,7 +32,7 @@ class ExternalNotificationModule : public SinglePortModule, private concurrency:
  public:
    ExternalNotificationModule();

-    uint32_t nagCycleCutoff = UINT32_MAX;
+    uint32_t nagCycleCutoff = 1;

    void setExternalOn(uint8_t index = 0);
    void setExternalOff(uint8_t index = 0);
--- a/src/motion/QMA6100PSensor.cpp
+++ b/src/motion/QMA6100PSensor.cpp
@ -1,6 +1,6 @@
 #include "QMA6100PSensor.h"

-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && HAS_QMA6100P
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_QMA6100P)

 // Flag when an interrupt has been detected
 volatile static bool QMA6100P_IRQ = false;
--- a/src/motion/QMA6100PSensor.h
+++ b/src/motion/QMA6100PSensor.h
@ -4,7 +4,7 @@

 #include "MotionSensor.h"

-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && HAS_QMA6100P
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C && defined(HAS_QMA6100P)

 #include <QMA6100P.h>

--- a/variants/diy/mesh-tab/variant.h
+++ b/variants/diy/mesh-tab/variant.h
@ -0,0 +1,49 @@
+#ifndef _VARIANT_MESHTAB_DIY_
+#define _VARIANT_MESHTAB_DIY_
+
+#define HAS_TOUCHSCREEN 1
+
+#define SLEEP_TIME 120
+
+// Analog pins
+#define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+// ratio of voltage divider = 2.0
+#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
+#define ADC_CHANNEL ADC1_GPIO4_CHANNEL
+
+// LED
+#define LED_PIN 21
+
+// Button
+#define BUTTON_PIN 0
+
+// GPS
+#define GPS_RX_PIN 18
+#define GPS_TX_PIN 17
+
+// #define HAS_SDCARD 1
+#define SPI_MOSI 13
+#define SPI_SCK 12
+#define SPI_MISO 11
+#define SPI_CS 10
+#define SDCARD_CS 6
+
+// LORA SPI
+#define LORA_SCK 36
+#define LORA_MISO 37
+#define LORA_MOSI 35
+#define LORA_CS 39
+
+// LORA MODULES
+#define USE_SX1262
+
+// LORA CONFIG
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 15
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_BUSY 40
+#define SX126X_RESET 14
+#define SX126X_RXEN 47
+#define SX126X_TXEN RADIOLIB_NC // Assuming that DIO2 is connected to TXEN pin
+
+#endif
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@ -88,3 +88,73 @@ build_flags =
  -D ARDUINO_USB_MODE=0
  -D ARDUINO_USB_CDC_ON_BOOT=1
  -I variants/diy/t-energy-s3_e22
+
+; esp32-s3 + ra-sh01 lora + 3.2" ILI9143
+[env:mesh-tab]
+extends = esp32s3_base
+board = um_feathers3
+board_level = extra
+board_upload.flash_size = 16MB
+board_build.partitions = default_16MB.csv
+upload_protocol = esptool
+build_flags = ${esp32s3_base.build_flags}
+  -D MESH_TAB
+  -D PRIVATE_HW
+  -D CONFIG_ARDUHAL_ESP_LOG
+  -D CONFIG_ARDUHAL_LOG_COLORS=1
+  -D CONFIG_DISABLE_HAL_LOCKS=1 ; "feels" to be a bit more stable without locks
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
+  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
+  -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
+  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D LV_USE_SYSMON=0
+  -D LV_USE_PROFILER=0
+  -D LV_USE_PERF_MONITOR=0
+  -D LV_USE_MEM_MONITOR=0
+  -D LV_USE_LOG=0
+  -D LV_BUILD_TEST=0
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+  -D RADIOLIB_SPI_PARANOID=0
+  -D MAX_NUM_NODES=250
+  -D MAX_THREADS=40
+  -D HAS_SCREEN=0
+  -D HAS_TFT=1
+  -D RAM_SIZE=1024
+  -D LGFX_DRIVER_TEMPLATE
+  -D LGFX_DRIVER=LGFX_GENERIC
+  -D LGFX_PANEL=ILI9341
+  -D LGFX_OFFSET_ROTATION=1
+  -D LGFX_TOUCH=XPT2046
+  -D LGFX_PIN_SCK=12
+  -D LGFX_PIN_MOSI=13
+  -D LGFX_PIN_MISO=11
+  -D LGFX_PIN_DC=16
+  -D LGFX_PIN_CS=10
+  -D LGFX_PIN_RST=-1
+  -D LGFX_PIN_BL=42
+  -D LGFX_TOUCH_INT=41
+  -D LGFX_TOUCH_CS=7
+  -D LGFX_TOUCH_CLK=12
+  -D LGFX_TOUCH_DO=11
+  -D LGFX_TOUCH_DIN=13
+  -D LGFX_TOUCH_X_MIN=300
+  -D LGFX_TOUCH_X_MAX=3900
+  -D LGFX_TOUCH_Y_MIN=400
+  -D LGFX_TOUCH_Y_MAX=3900
+  -D VIEW_320x240
+  -D USE_PACKET_API
+  -I lib/device-ui/generated/ui_320x240
+  -I variants/diy/mesh-tab
+build_src_filter = ${esp32_base.build_src_filter}
+  +<../lib/device-ui/generated/ui_320x240>
+  +<../lib/device-ui/resources>
+  +<../lib/device-ui/locale>
+  +<../lib/device-ui/source>
+lib_deps = ${esp32_base.lib_deps}
+  lovyan03/LovyanGFX@^1.1.16
+  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266SAM@^1.0.1
--- a/variants/icarus/pins_arduino.h
+++ b/variants/icarus/pins_arduino.h
@ -0,0 +1,22 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x2886
+#define USB_PID 0x0059
+
+// GPIO48 Reference: https://github.com/espressif/arduino-esp32/pull/8600
+
+// The default Wire will be mapped to Screen and Sensors
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+// Default SPI will be mapped to Radio
+static const uint8_t MISO = 39;
+static const uint8_t SCK = 21;
+static const uint8_t MOSI = 38;
+static const uint8_t SS = 17;
+
+#endif /* Pins_Arduino_h */
+ 
--- a/variants/icarus/platformio.ini
+++ b/variants/icarus/platformio.ini
@ -0,0 +1,19 @@
+[env:icarus]
+extends = esp32s3_base
+board = icarus
+board_level = extra
+board_check = true
+board_build.mcu = esp32s3
+upload_protocol = esptool
+upload_speed = 921600
+platform_packages = framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
+lib_deps =
+  ${esp32s3_base.lib_deps}
+build_unflags =
+  ${esp32s3_base.build_unflags}
+  -DARDUINO_USB_MODE=1
+build_flags = 
+  ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/icarus
+  -DBOARD_HAS_PSRAM 
+
+  -DARDUINO_USB_MODE=0
--- a/variants/icarus/variant.h
+++ b/variants/icarus/variant.h
@ -0,0 +1,31 @@
+// Icarus has a 1.3 inch OLED Screen
+#define SCREEN_SSD106
+
+#define I2C_SDA 8
+#define I2C_SCL 9
+
+#define I2C_SDA1 18
+#define I2C_SCL1 6
+
+#define BUTTON_PIN 7 // Selection button
+
+// RA-01SH/HT-RA62 LORA module
+#define USE_SX1262
+
+#define LORA_MISO 39
+#define LORA_SCK 21
+#define LORA_MOSI 38
+#define LORA_CS 17
+
+#define LORA_RESET 42
+#define LORA_DIO1 5
+
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY 47
+#define SX126X_RESET LORA_RESET
+
+//  DIO2 controlls an antenna switch
+#define SX126X_DIO2_AS_RF_SWITCH
+#endif
--- a/variants/unphone/pins_arduino.h
+++ b/variants/unphone/pins_arduino.h
@ -0,0 +1,67 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x16D0
+#define USB_PID 0x1178
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS 48
+#define NUM_ANALOG_INPUTS 20
+
+#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1)
+#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1)
+#define digitalPinHasPWM(p) (p < 46)
+
+#define LED_BUILTIN 13
+#define BUILTIN_LED LED_BUILTIN // backward compatibility
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 3;
+static const uint8_t SCL = 4;
+
+static const uint8_t SS = 13;
+static const uint8_t MOSI = 40;
+static const uint8_t MISO = 41;
+static const uint8_t SCK = 39;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 8;
+static const uint8_t A3 = 9;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 14;
+static const uint8_t A7 = 7;
+static const uint8_t A8 = 15;
+static const uint8_t A9 = 33;
+static const uint8_t A10 = 27;
+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 = 2;
+static const uint8_t T2 = 8;
+static const uint8_t T3 = 9;
+static const uint8_t T4 = 5;
+static const uint8_t T5 = 6;
+static const uint8_t T6 = 14;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 15;
+static const uint8_t T9 = 33;
+static const uint8_t T10 = 27;
+static const uint8_t T11 = 12;
+static const uint8_t T12 = 13;
+static const uint8_t T13 = 14;
+static const uint8_t T14 = 15;
+
+#endif /* Pins_Arduino_h */
--- a/variants/unphone/platformio.ini
+++ b/variants/unphone/platformio.ini
@ -13,7 +13,6 @@ build_unflags =
  -D ARDUINO_USB_MODE

 build_flags = ${esp32_base.build_flags}
-  ;-D BOARD_HAS_PSRAM // what's up with this - doesn't seem to be recognised at boot
  -D UNPHONE
  -I variants/unphone
  -D ARDUINO_USB_MODE=0
@ -27,6 +26,52 @@ build_flags = ${esp32_base.build_flags}
 build_src_filter = ${esp32_base.build_src_filter} +<../variants/unphone>

 lib_deps = ${esp32s3_base.lib_deps}
-  lovyan03/LovyanGFX                                   @ ^1.1.8
-  https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic   @ ^9.0.0
+  lovyan03/LovyanGFX@ 1.1.12
+  https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0
  adafruit/Adafruit NeoPixel @ ^1.12.0
+
+
+[env:unphone-tft]
+extends = esp32s3_base
+board_level = extra
+board = unphone
+board_build.partitions = default_8MB.csv
+monitor_speed = 115200
+monitor_filters = esp32_exception_decoder
+build_flags = ${esp32_base.build_flags}
+  -D UNPHONE
+  -D UNPHONE_ACCEL=0
+  -D UNPHONE_TOUCHS=0
+  -D UNPHONE_SDCARD=0
+  -D UNPHONE_UI0=0
+  -D UNPHONE_LORA=0
+  -D UNPHONE_FACTORY_MODE=0
+  -D MAX_THREADS=40
+  -D HAS_SCREEN=0
+  -D HAS_TFT=1
+  -D RAM_SIZE=512
+	-D LV_LVGL_H_INCLUDE_SIMPLE
+	-D LV_CONF_INCLUDE_SIMPLE
+	-D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D LV_BUILD_TEST=0
+  -D LV_USE_PERF_MONITOR=0
+  -D LV_USE_MEM_MONITOR=0
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+;  -D CALIBRATE_TOUCH=0
+  -D LGFX_DRIVER=LGFX_UNPHONE_V9
+  -D VIEW_320x240
+;	-D USE_DOUBLE_BUFFER
+  -D USE_PACKET_API
+	-I lib/device-ui/generated/ui_320x240
+  -I variants/unphone
+
+build_src_filter = ${esp32_base.build_src_filter} +<../variants/unphone>
+  +<../lib/device-ui/generated/ui_320x240>
+  +<../lib/device-ui/resources>
+  +<../lib/device-ui/source>
+
+lib_deps = ${esp32s3_base.lib_deps}
+  lovyan03/LovyanGFX@^1.1.12
+  https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0
+  adafruit/Adafruit NeoPixel@1.12.0