Merge branch 'master' into external-notification-cleanup

arch/nrf52/nrf52.ini

@@ -23,4 +23,5 @@ lib_deps=
   rweather/Crypto@^0.4.0
 
 lib_ignore =
-  BluetoothOTA
+  BluetoothOTA
+  lvgl

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}

arch/rp2xx0/rp2350.ini

@@ -16,8 +16,9 @@ build_src_filter =
 
 lib_ignore =
   BluetoothOTA
+  lvgl
 
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
-  rweather/Crypto
+  rweather/Crypto

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
 

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"
+}

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");
@@ -1190,4 +1195,4 @@ void loop()
         mainDelay.delay(delayMsec);
     }
 }
-#endif
+#endif

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

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

variants/monteops_hw1/platformio.ini

@@ -12,4 +12,4 @@ lib_deps =
   https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
 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
+;upload_protocol = jlink

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 */

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
-  adafruit/Adafruit NeoPixel @ ^1.12.0
+  lovyan03/LovyanGFX@ 1.1.12
+  https://gitlab.com/hamishcunningham/unphonelibrary#[email protected]
+  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#[email protected]
+  adafruit/Adafruit [email protected]