Merge branch 'develop' into sfpp

variants/esp32/chatter2/platformio.ini

@@ -6,6 +6,8 @@ build_flags =
   ${esp32_base.build_flags}
   -D CHATTER_2
   -I variants/esp32/chatter2
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
   
 lib_deps =
   ${esp32_base.lib_deps}

variants/esp32/esp32.ini

@@ -7,3 +7,22 @@ custom_esp32_kind = esp32
 build_flags =
   ${esp32_common.build_flags}
   -DMESHTASTIC_EXCLUDE_AUDIO=1
+; Override lib_deps to use environmental_extra_no_bsec instead of environmental_extra
+; BSEC library uses ~3.5KB DRAM which causes overflow on original ESP32 targets
+lib_deps =
+  ${arduino_base.lib_deps}
+  ${networking_base.lib_deps}
+  ${networking_extra.lib_deps}
+  ${environmental_base.lib_deps}
+  ${environmental_extra_no_bsec.lib_deps}
+  ${radiolib_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
+  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
+  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
+  h2zero/NimBLE-Arduino@^1.4.3
+  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
+  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
+  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
+  https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
+  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
+  rweather/Crypto@0.4.0

variants/esp32/m5stack_core/platformio.ini

@@ -16,6 +16,8 @@ build_flags =
   ${esp32_base.build_flags}
   -I variants/esp32/m5stack_core
   -DM5STACK
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
   -DUSER_SETUP_LOADED
   -DTFT_SDA_READ
   -DTFT_DRIVER=0x9341

variants/esp32c6/m5stack_unitc6l/platformio.ini

@@ -10,6 +10,8 @@ custom_meshtastic_tags = M5Stack
 
 extends = esp32c6_base
 board = esp32-c6-devkitc-1
+board_upload.flash_size = 16MB
+board_build.partitions = default_16MB.csv
 ;OpenOCD flash method
 ;upload_protocol = esp-builtin
 ;Normal method

variants/esp32s3/CDEBYTE_EoRa-Hub/rfswitch.h

@@ -8,7 +8,8 @@
 // DIO6 -> RFSW1_V2
 // DIO7 -> not connected on E80 module - note that GNSS and Wifi scanning are not possible.
 
-static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC, RADIOLIB_NC};
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC,
+                                             RADIOLIB_NC};
 
 static const Module::RfSwitchMode_t rfswitch_table[] = {
     // mode             DIO5  DIO6  DIO7

variants/nrf52840/ELECROW-ThinkNode-M6/variant.cpp

@@ -67,4 +67,8 @@ void variant_shutdown()
     nrf_gpio_cfg_input(PIN_BUTTON1, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
     nrf_gpio_pin_sense_t sense1 = NRF_GPIO_PIN_SENSE_LOW;
     nrf_gpio_cfg_sense_set(PIN_BUTTON1, sense1);
+
+    nrf_gpio_cfg_input(EXT_CHRG_DETECT, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
+    nrf_gpio_pin_sense_t sense2 = NRF_GPIO_PIN_SENSE_LOW;
+    nrf_gpio_cfg_sense_set(EXT_CHRG_DETECT, sense2);
 }

variants/nrf52840/dls_Minimesh_Lite/platformio.ini

@@ -0,0 +1,9 @@
+[env:minimesh_lite]
+extends = nrf52840_base
+board = minimesh_lite
+board_level = extra
+build_flags = ${nrf52840_base.build_flags}
+  -Ivariants/nrf52840/dls_Minimesh_Lite
+  -DPRIVATE_HW
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/dls_Minimesh_Lite>
+debug_tool = jlink

variants/nrf52840/dls_Minimesh_Lite/variant.cpp

@@ -0,0 +1,38 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
+}

variants/nrf52840/dls_Minimesh_Lite/variant.h

@@ -0,0 +1,104 @@
+#ifndef _VARIANT_MINIMESH_LITE_
+#define _VARIANT_MINIMESH_LITE_
+
+#define VARIANT_MCK (64000000ul)
+#define USE_LFRC
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MINIMESH_LITE
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+#define PIN_3V3_EN (0 + 13) // P0.13
+
+// Analog pins
+#define BATTERY_PIN (0 + 31) // P0.31 Battery ADC
+#define ADC_CHANNEL ADC1_GPIO4_CHANNEL
+#define ADC_RESOLUTION 14
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#define VBAT_MV_PER_LSB (0.73242188F)
+#define VBAT_DIVIDER (0.6F)
+#define VBAT_DIVIDER_COMP (1.73)
+#define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER VBAT_DIVIDER_COMP
+#define VBAT_RAW_TO_SCALED(x) (REAL_VBAT_MV_PER_LSB * x)
+
+// WIRE IC AND IIC PINS
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (32 + 4)
+#define PIN_WIRE_SCL (0 + 11)
+
+// LED
+#define PIN_LED1 (0 + 15)
+#define LED_BUILTIN PIN_LED1
+// Actually red
+#define LED_BLUE PIN_LED1
+#define LED_STATE_ON 1
+
+// Button
+#define BUTTON_PIN (32 + 0)
+
+// GPS
+#define GPS_TX_PIN (0 + 20)
+#define GPS_RX_PIN (0 + 22)
+
+#define PIN_GPS_EN (0 + 24)
+#define GPS_UBLOX
+// define GPS_DEBUG
+
+// UART interfaces
+#define PIN_SERIAL1_TX GPS_TX_PIN
+#define PIN_SERIAL1_RX GPS_RX_PIN
+
+#define PIN_SERIAL2_RX (0 + 6)
+#define PIN_SERIAL2_TX (0 + 8)
+
+// Serial interfaces
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI_MISO (0 + 2)
+#define PIN_SPI_MOSI (32 + 15)
+#define PIN_SPI_SCK (32 + 11)
+
+#define LORA_MISO PIN_SPI_MISO
+#define LORA_MOSI PIN_SPI_MOSI
+#define LORA_SCK PIN_SPI_SCK
+#define LORA_CS (32 + 13)
+
+// LORA MODULES
+#define USE_LLCC68
+#define USE_SX1262
+#define USE_SX1268
+
+// SX126X CONFIG
+#define SX126X_CS (32 + 13)
+#define SX126X_DIO1 (0 + 10)
+#define SX126X_DIO2_AS_RF_SWITCH
+
+#define SX126X_BUSY (0 + 29)
+#define SX126X_RESET (0 + 9)
+#define SX126X_RXEN (0 + 17)
+#define SX126X_TXEN RADIOLIB_NC
+
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define TCXO_OPTIONAL // make it so that the firmware can try both TCXO and XTAL
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _VARIANT_MINIMESH_LITE_

variants/nrf52840/heltec_mesh_node_t114/variant.h

@@ -150,6 +150,14 @@ No longer populated on PCB
 #define PIN_SPI1_MOSI ST7789_SDA
 #define PIN_SPI1_SCK ST7789_SCK
 
+/*
+ * Bluetooth
+ */
+
+// The bluetooth transmit power on the nRF52840 is adjustable from -20dB to +8dB in steps of 4dB
+// so NRF52_BLE_TX_POWER can be set to -20, -16, -12, -8, -4, 0 (default), 4, and 8.
+//#define NRF52_BLE_TX_POWER 8
+
 /*
  * GPS pins
  */

variants/stm32/russell/platformio.ini

@@ -0,0 +1,21 @@
+; Russell is a board designed to mount on an ER34615/IFR32700 cell and go Up! on a balloon
+; Hardware repository: https://github.com/Meshtastic-Malaysia/russell
+; - RAK3172 STM32WLE5CCU6 MCU + integrated SX1262 LoRa
+; - CDtop CD-PA1010D GPS
+; - Bosch Sensortec BME280 sensor
+; - Consonance CN3158 LiFePO4 solar charger
+[env:russell]
+extends = stm32_base
+board = wiscore_rak3172
+board_level = extra
+board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
+build_flags =
+  ${stm32_base.build_flags}
+  -Ivariants/stm32/russell
+  -DPRIVATE_HW
+lib_deps =
+  ${stm32_base.lib_deps}
+	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
+	adafruit/Adafruit BME280 Library@2.3.0
+
+upload_port = stlink

variants/stm32/russell/rfswitch.h

@@ -0,0 +1,7 @@
+// Pins from https://forum.rakwireless.com/t/rak3172-internal-schematic/4557/2
+// PB8, PC13
+
+static const RADIOLIB_PIN_TYPE rfswitch_pins[5] = {PB8, PC13, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+
+static const Module::RfSwitchMode_t rfswitch_table[4] = {
+    {STM32WLx::MODE_IDLE, {LOW, LOW}}, {STM32WLx::MODE_RX, {HIGH, LOW}}, {STM32WLx::MODE_TX_HP, {LOW, HIGH}}, END_OF_MODE_TABLE};

variants/stm32/russell/variant.h

@@ -0,0 +1,41 @@
+#ifndef _VARIANT_RUSSELL_
+#define _VARIANT_RUSSELL_
+
+#define USE_STM32WLx
+
+// I/O
+#define LED_PIN PA0 // Red LED
+#define LED_STATE_ON 1
+#define BUTTON_PIN PH3 // Shared with BOOT0
+#define BUTTON_NEED_PULLUP
+// Charger IC charge/standby pins are open-drain with no hardware pull-up:
+// Internal pull-up is needed on STM32 (TODO)
+// #define EXT_CHRG_DETECT PA5
+// #define EXT_PWR_DETECT PA4
+
+// Bosch Sensortec BME280
+#define HAS_SENSOR 1
+
+// CDtop CD-PA1010D
+#define ENABLE_HWSERIAL1
+#define PIN_SERIAL1_RX PB7
+#define PIN_SERIAL1_TX PB6
+#define HAS_GPS 1
+#define PIN_GPS_STANDBY PA15
+#define GPS_RX_PIN PB7
+#define GPS_TX_PIN PB6
+
+// LoRa
+/*
+ * RAK3172   (-20–85°C) -> No TCXO
+ * RAK3172-T (-40–85°C) -> 3.0V TCXO
+ * https://github.com/RAKWireless/RAK-STM32-RUI/blob/e5a28be8fab1a492bd9223dd425ca33a8a297d90/variants/WisDuo_RAK3172-T_Board/radio_conf.h#L91
+ */
+#define TCXO_OPTIONAL
+#define SX126X_DIO3_TCXO_VOLTAGE 3.0
+
+// Required to avoid Serial1 conflicts due to board definition here:
+// https://github.com/stm32duino/Arduino_Core_STM32/blob/main/variants/STM32WLxx/WL54CCU_WL55CCU_WLE4C(8-B-C)U_WLE5C(8-B-C)U/variant_RAK3172_MODULE.h
+#define RAK3172
+
+#endif