pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-27 23:12:39 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'develop' into save_memory_bme680

Browse Source
This commit is contained in:
Ben Meadors 2025-10-12 05:52:37 -05:00 committed by GitHub
commit dd788e2dda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
51 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/detect/ScanI2CTwoWire.cpp
View File

@ -378,7 +378,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
case SHT31_4x_ADDR: // same as OPT3001_ADDR_ALT
case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0x11f3 || registerValue == 0xe9c || registerValue == 0xc8d) {
if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0x11f3 || registerValue == 0xe9c ||
registerValue == 0xc8d) {
type = SHT4X;
logFoundDevice("SHT4X", (uint8_t)addr.address);
} else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {

11
src/gps/GPS.cpp
View File

@ -494,17 +494,6 @@ bool GPS::setup()
if (!didSerialInit) {
int msglen = 0;
if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) {
#ifdef TRACKER_T1000_E
// add power up/down strategy, improve ag3335 detection success
digitalWrite(PIN_GPS_EN, LOW);
delay(500);
digitalWrite(GPS_VRTC_EN, LOW);
delay(1000);
digitalWrite(GPS_VRTC_EN, HIGH);
delay(500);
digitalWrite(PIN_GPS_EN, HIGH);
delay(1000);
#endif
if (probeTries < GPS_PROBETRIES) {
gnssModel = probe(serialSpeeds[speedSelect]);
if (gnssModel == GNSS_MODEL_UNKNOWN) {

62
src/nimble/NimbleBluetooth.cpp
View File

@ -17,6 +17,21 @@
#include "PowerStatus.h"
#endif
#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
#if defined(CONFIG_NIMBLE_CPP_IDF)
#include "host/ble_gap.h"
#else
#include "nimble/nimble/host/include/host/ble_gap.h"
#endif
namespace
{
constexpr uint16_t kPreferredBleMtu = 517;
constexpr uint16_t kPreferredBleTxOctets = 251;
constexpr uint16_t kPreferredBleTxTimeUs = (kPreferredBleTxOctets + 14) * 8;
} // namespace
#endif
NimBLECharacteristic *fromNumCharacteristic;
NimBLECharacteristic *BatteryCharacteristic;
NimBLECharacteristic *logRadioCharacteristic;
@ -212,6 +227,27 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
virtual void onConnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo)
{
LOG_INFO("BLE incoming connection %s", connInfo.getAddress().toString().c_str());
#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
const uint16_t connHandle = connInfo.getConnHandle();
int phyResult =
ble_gap_set_prefered_le_phy(connHandle, BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_CODED_ANY);
if (phyResult == 0) {
LOG_INFO("BLE conn %u requested 2M PHY", connHandle);
} else {
LOG_WARN("Failed to prefer 2M PHY for conn %u, rc=%d", connHandle, phyResult);
}
int dataLenResult = ble_gap_set_data_len(connHandle, kPreferredBleTxOctets, kPreferredBleTxTimeUs);
if (dataLenResult == 0) {
LOG_INFO("BLE conn %u requested data length %u bytes", connHandle, kPreferredBleTxOctets);
} else {
LOG_WARN("Failed to raise data length for conn %u, rc=%d", connHandle, dataLenResult);
}
LOG_INFO("BLE conn %u initial MTU %u (target %u)", connHandle, connInfo.getMTU(), kPreferredBleMtu);
pServer->updateConnParams(connHandle, 6, 12, 0, 200);
#endif
}
virtual void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason)
@ -316,6 +352,30 @@ void NimbleBluetooth::setup()
NimBLEDevice::init(getDeviceName());
NimBLEDevice::setPower(ESP_PWR_LVL_P9);
#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
int mtuResult = NimBLEDevice::setMTU(kPreferredBleMtu);
if (mtuResult == 0) {
LOG_INFO("BLE MTU request set to %u", kPreferredBleMtu);
} else {
LOG_WARN("Unable to request MTU %u, rc=%d", kPreferredBleMtu, mtuResult);
}
int phyResult = ble_gap_set_prefered_default_le_phy(BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_2M_MASK);
if (phyResult == 0) {
LOG_INFO("BLE default PHY preference set to 2M");
} else {
LOG_WARN("Failed to prefer 2M PHY by default, rc=%d", phyResult);
}
int dataLenResult = ble_gap_write_sugg_def_data_len(kPreferredBleTxOctets, kPreferredBleTxTimeUs);
if (dataLenResult == 0) {
LOG_INFO("BLE suggested data length set to %u bytes", kPreferredBleTxOctets);
} else {
LOG_WARN("Failed to raise suggested data length (%u/%u), rc=%d", kPreferredBleTxOctets, kPreferredBleTxTimeUs,
dataLenResult);
}
#endif
if (config.bluetooth.mode != meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN) {
NimBLEDevice::setSecurityAuth(BLE_SM_PAIR_AUTHREQ_BOND | BLE_SM_PAIR_AUTHREQ_MITM | BLE_SM_PAIR_AUTHREQ_SC);
NimBLEDevice::setSecurityInitKey(BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID);
@ -459,4 +519,4 @@ void clearNVS()
ESP.restart();
#endif
}
#endif
#endif

1
variants/esp32/diy/hydra/variant.h
View File

@ -6,7 +6,6 @@
#define GPS_TX_PIN 15
#define GPS_RX_PIN 12
#define PIN_GPS_EN 4
#define GPS_POWER_TOGGLE // Moved definition from platformio.ini to here
#define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
// Note: On the ESP32 base version, gpio34-39 are input-only, and do not have internal pull-ups.

1
variants/esp32/heltec_v2.1/platformio.ini
View File

@ -7,4 +7,3 @@ build_flags =
${esp32_base.build_flags}
-D HELTEC_V2_1
-I variants/esp32/heltec_v2.1
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

1
variants/esp32/heltec_wsl_v2.1/platformio.ini
View File

@ -6,4 +6,3 @@ build_flags =
${esp32_base.build_flags}
-D PRIVATE_HW
-I variants/esp32/heltec_wsl_v2.1
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

1
variants/esp32/tbeam/platformio.ini
View File

@ -10,7 +10,6 @@ build_flags =
${esp32_base.build_flags}
-D TBEAM_V10
-I variants/esp32/tbeam
-DGPS_POWER_TOGGLE ; comment this line to disable double press function on the user button to turn off gps entirely.
-DBOARD_HAS_PSRAM
-mfix-esp32-psram-cache-issue
upload_speed = 921600

1
variants/esp32/tlora_v2_1_16/platformio.ini
View File

@ -4,5 +4,4 @@ board = ttgo-lora32-v21
board_check = true
build_flags =
${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
upload_speed = 115200

1
variants/esp32/tlora_v2_1_16_tcxo/platformio.ini
View File

@ -6,6 +6,5 @@ build_flags =
${esp32_base.build_flags}
-D TLORA_V2_1_16
-I variants/esp32/tlora_v2_1_16
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-D LORA_TCXO_GPIO=33
upload_speed = 115200

1
variants/esp32/tlora_v3_3_0_tcxo/platformio.ini
View File

@ -5,6 +5,5 @@ build_flags =
${esp32_base.build_flags}
-D TLORA_V2_1_16
-I variants/esp32/tlora_v2_1_16
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-D LORA_TCXO_GPIO=12
-D BUTTON_PIN=0

1
variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini
View File

@ -5,4 +5,3 @@ build_flags =
${esp32s3_base.build_flags}
-D CDEBYTE_EORA_S3
-I variants/esp32s3/CDEBYTE_EoRa-S3
-D GPS_POWER_TOGGLE

3
variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini
View File

@ -16,7 +16,6 @@ build_flags =
-I variants/esp32s3/crowpanel-esp32s3-5-epaper
-D PRIVATE_HW
-DBOARD_HAS_PSRAM
-DGPS_POWER_TOGGLE
-DEINK_DISPLAY_MODEL=GxEPD2_579_GDEY0579T93 ;https://www.good-display.com/product/439.html
-DEINK_WIDTH=792
-DEINK_HEIGHT=272
@ -46,7 +45,6 @@ build_flags =
-I variants/esp32s3/crowpanel-esp32s3-5-epaper
-D PRIVATE_HW
-DBOARD_HAS_PSRAM
-DGPS_POWER_TOGGLE
-DEINK_DISPLAY_MODEL=GxEPD2_420_GYE042A87 ; similar Panel: GDEY042T81 : https://www.good-display.com/product/386.html
-DEINK_WIDTH=400
-DEINK_HEIGHT=300
@ -76,7 +74,6 @@ build_flags =
-I variants/esp32s3/crowpanel-esp32s3-5-epaper
-D PRIVATE_HW
-DBOARD_HAS_PSRAM
-DGPS_POWER_TOGGLE
-DEINK_DISPLAY_MODEL=GxEPD2_290_GDEY029T94 ;https://www.good-display.com/product/389.html
-DEINK_WIDTH=296
-DEINK_HEIGHT=128

1
variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini
View File

@ -6,5 +6,4 @@ board_build.partitions = default_8MB.csv
build_flags =
${esp32s3_base.build_flags} -I variants/esp32s3/heltec_capsule_sensor_v3
-D HELTEC_CAPSULE_SENSOR_V3
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

1
variants/esp32s3/heltec_v3/platformio.ini
View File

@ -8,4 +8,3 @@ build_flags =
${esp32s3_base.build_flags}
-D HELTEC_V3
-I variants/esp32s3/heltec_v3
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

1
variants/esp32s3/heltec_v4/platformio.ini
View File

@ -7,4 +7,3 @@ build_flags =
${esp32s3_base.build_flags}
-D HELTEC_V4
-I variants/esp32s3/heltec_v4
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

1
variants/esp32s3/heltec_wireless_tracker/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags =
${esp32s3_base.build_flags}
-I variants/esp32s3/heltec_wireless_tracker
-D HELTEC_TRACKER_V1_1
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
lib_deps =

1
variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags =
${esp32s3_base.build_flags}
-I variants/esp32s3/heltec_wireless_tracker_V1_0
-D HELTEC_TRACKER_V1_0
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
lib_deps =
${esp32s3_base.lib_deps}

1
variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags =
${esp32s3_base.build_flags}
-I variants/esp32s3/heltec_wireless_tracker_v2
-D HELTEC_WIRELESS_TRACKER_V2
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
lib_deps =
${esp32s3_base.lib_deps}
lovyan03/LovyanGFX@^1.2.0

1
variants/esp32s3/heltec_wsl_v3/platformio.ini
View File

@ -7,4 +7,3 @@ build_flags =
${esp32s3_base.build_flags}
-D HELTEC_WSL_V3
-I variants/esp32s3/heltec_wsl_v3
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

1
variants/esp32s3/link32_s3_v1/platformio.ini
View File

@ -5,7 +5,6 @@ build_flags =
${esp32_base.build_flags}
-D LINK_32
-I variants/esp32s3/link32_s3_v1
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DARDUINO_USB_CDC_ON_BOOT
-DARDUINO_USB_MODE=1
-DRADIOLIB_EXCLUDE_SX128X=1

1
variants/esp32s3/t-deck-pro/platformio.ini
View File

@ -7,7 +7,6 @@ upload_protocol = esptool
build_flags =
${esp32_base.build_flags} -I variants/esp32s3/t-deck-pro
-D T_DECK_PRO
-D GPS_POWER_TOGGLE
-D USE_EINK
-D EINK_DISPLAY_MODEL=GxEPD2_310_GDEQ031T10
-D EINK_WIDTH=240

1
variants/esp32s3/t-deck/platformio.ini
View File

@ -9,7 +9,6 @@ upload_protocol = esptool
build_flags = ${esp32s3_base.build_flags}
-D T_DECK
-D BOARD_HAS_PSRAM
-D GPS_POWER_TOGGLE
-I variants/esp32s3/t-deck
lib_deps = ${esp32s3_base.lib_deps}

1
variants/esp32s3/t-eth-elite/platformio.ini
View File

@ -9,7 +9,6 @@ build_flags =
-D T_ETH_ELITE
-D HAS_UDP_MULTICAST=1
-I variants/esp32s3/t-eth-elite
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
lib_ignore =
Ethernet

1
variants/esp32s3/tlora-pager/platformio.ini
View File

@ -10,7 +10,6 @@ build_flags = ${esp32s3_base.build_flags}
-I variants/esp32s3/tlora-pager
-D T_LORA_PAGER
-D BOARD_HAS_PSRAM
-D GPS_POWER_TOGGLE
-D HAS_SDCARD
-D SDCARD_USE_SPI1
-D ENABLE_ROTARY_PULLUP

1
variants/esp32s3/tlora_t3s3_epaper/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags =
${esp32_base.build_flags}
-D TLORA_T3S3_EPAPER
-I variants/esp32s3/tlora_t3s3_epaper
-DGPS_POWER_TOGGLE
-DUSE_EINK
-DEINK_DISPLAY_MODEL=GxEPD2_213_BN
-DEINK_WIDTH=250

1
variants/esp32s3/tlora_t3s3_v1/platformio.ini
View File

@ -6,4 +6,3 @@ upload_protocol = esptool
build_flags =
${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/esp32s3/tlora_t3s3_v1
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

3
variants/esp32s3/tracksenger/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags =
${esp32s3_base.build_flags}
-I variants/esp32s3/tracksenger/internal
-D HELTEC_TRACKER_V1_1
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
lib_deps =
@ -25,7 +24,6 @@ build_flags =
${esp32s3_base.build_flags}
-I variants/esp32s3/tracksenger/lcd
-D HELTEC_TRACKER_V1_1
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
lib_deps =
@ -42,5 +40,4 @@ build_flags =
${esp32s3_base.build_flags}
-I variants/esp32s3/tracksenger/oled
-D HELTEC_TRACKER_V1_1
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output

1
variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini
View File

@ -9,7 +9,6 @@ debug_tool = jlink
build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/ELECROW-ThinkNode-M1
-DELECROW_ThinkNode_M1
-DGPS_POWER_TOGGLE
-DUSE_EINK
-DEINK_DISPLAY_MODEL=GxEPD2_154_D67
-DEINK_WIDTH=200

1
variants/nrf52840/ME25LS01-4Y10TD/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
-Isrc/platform/nrf52/softdevice
-Isrc/platform/nrf52/softdevice/nrf52
-DME25LS01_4Y10TD
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ME25LS01-4Y10TD>
lib_deps =

1
variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
-Isrc/platform/nrf52/softdevice
-Isrc/platform/nrf52/softdevice/nrf52
-DME25LS01_4Y10TD
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DEINK_DISPLAY_MODEL=GxEPD2_420_GDEY042T81
-DEINK_WIDTH=400
-DEINK_HEIGHT=300

1
variants/nrf52840/MS24SF1/platformio.ini
View File

@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/MS24SF1
-Isrc/platform/nrf52/softdevice
-Isrc/platform/nrf52/softdevice/nrf52
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MS24SF1>
lib_deps =

1
variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
View File

@ -94,7 +94,6 @@ NRF52 PRO MICRO PIN ASSIGNMENT
#define PIN_GPS_RX (0 + 20) // P0.20
#define PIN_GPS_EN (0 + 24) // P0.24
#define GPS_POWER_TOGGLE
#define GPS_UBLOX
// define GPS_DEBUG

1
variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h
View File

@ -93,7 +93,6 @@ NRF52 PRO MICRO PIN ASSIGNMENT
#define PIN_GPS_RX (0 + 20) // P0.20
#define PIN_GPS_EN (0 + 24) // P0.24
#define GPS_POWER_TOGGLE
#define GPS_UBLOX
// define GPS_DEBUG

1
variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/gat562_mesh_trial_tracker
;-D GAT562_MESH_TRIAL_TRACKER
-D PRIVATE_HW
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DRADIOLIB_EXCLUDE_SX128X=1
-DRADIOLIB_EXCLUDE_SX127X=1
-DRADIOLIB_EXCLUDE_LR11X0=1

1
variants/nrf52840/heltec_mesh_node_t114/platformio.ini
View File

@ -8,7 +8,6 @@ debug_tool = jlink
# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/heltec_mesh_node_t114
-DGPS_POWER_TOGGLE
-DHELTEC_T114
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_node_t114>

1
variants/nrf52840/heltec_mesh_solar/platformio.ini
View File

@ -8,7 +8,6 @@ debug_tool = jlink
# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/heltec_mesh_solar
-DGPS_POWER_TOGGLE
-DHELTEC_MESH_SOLAR
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_solar>

1
variants/nrf52840/meshlink/platformio.ini
View File

@ -9,7 +9,6 @@ board_level = extra
build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/meshlink
-D MESHLINK
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-D EINK_DISPLAY_MODEL=GxEPD2_213_B74
-D EINK_WIDTH=250
-D EINK_HEIGHT=122

1
variants/nrf52840/meshlink_eink/platformio.ini
View File

@ -9,7 +9,6 @@ board_level = extra
build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/meshlink_eink
-D MESHLINK
-D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-D EINK_DISPLAY_MODEL=GxEPD2_213_B74
-D EINK_WIDTH=250
-D EINK_HEIGHT=122

1
variants/nrf52840/r1-neo/platformio.ini
View File

@ -6,7 +6,6 @@ board_check = true
build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/r1-neo
-D R1_NEO
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DRADIOLIB_EXCLUDE_SX128X=1
-DRADIOLIB_EXCLUDE_SX127X=1
-DRADIOLIB_EXCLUDE_LR11X0=1

1
variants/nrf52840/rak2560/platformio.ini
View File

@ -6,7 +6,6 @@ board_check = true
build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/rak2560
-D RAK_4631
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DRADIOLIB_EXCLUDE_SX128X=1
-DRADIOLIB_EXCLUDE_SX127X=1
-DRADIOLIB_EXCLUDE_LR11X0=1

1
variants/nrf52840/rak4631/platformio.ini
View File

@ -7,7 +7,6 @@ board_check = true
build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/rak4631
-D RAK_4631
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DEINK_DISPLAY_MODEL=GxEPD2_213_BN
-DEINK_WIDTH=250
-DEINK_HEIGHT=122

1
variants/nrf52840/rak4631_eth_gw/platformio.ini
View File

@ -6,7 +6,6 @@ board_check = true
build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/rak4631_eth_gw
-D RAK_4631
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DHAS_UDP_MULTICAST=1
-DEINK_DISPLAY_MODEL=GxEPD2_213_BN
-DEINK_WIDTH=250

1
variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini
View File

@ -6,7 +6,6 @@ board_check = true
build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/rak4631_nomadstar_meteor_pro
-D NOMADSTAR_METEOR_PRO
;-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DEINK_DISPLAY_MODEL=GxEPD2_213_BN
-DEINK_WIDTH=250
-DEINK_HEIGHT=122

1
variants/nrf52840/rak_wismeshtag/platformio.ini
View File

@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
-I variants/nrf52840/rak_wismeshtag
-D WISMESH_TAG
-D RAK_4631
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DRADIOLIB_EXCLUDE_SX128X=1
-DRADIOLIB_EXCLUDE_SX127X=1
-DRADIOLIB_EXCLUDE_LR11X0=1

1
variants/nrf52840/rak_wismeshtap/platformio.ini
View File

@ -6,7 +6,6 @@ build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/rak_wismeshtap
-DWISMESH_TAP
-DRAK_4631
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DEINK_DISPLAY_MODEL=GxEPD2_213_BN
-DEINK_WIDTH=250
-DEINK_HEIGHT=122

1
variants/nrf52840/t-echo-lite/platformio.ini
View File

@ -9,7 +9,6 @@ debug_tool = jlink
build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/t-echo-lite
-D T_ECHO_LITE
-D GPS_POWER_TOGGLE
-D EINK_DISPLAY_MODEL=GxEPD2_122_T61
-D EINK_WIDTH=192
-D EINK_HEIGHT=176

1
variants/nrf52840/t-echo/platformio.ini
View File

@ -9,7 +9,6 @@ debug_tool = jlink
# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
build_flags = ${nrf52840_base.build_flags}
-Ivariants/nrf52840/t-echo
-DGPS_POWER_TOGGLE
-DEINK_DISPLAY_MODEL=GxEPD2_154_D67
-DEINK_WIDTH=200
-DEINK_HEIGHT=200

1
variants/nrf52840/tracker-t1000-e/platformio.ini
View File

@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
-Isrc/platform/nrf52/softdevice
-Isrc/platform/nrf52/softdevice/nrf52
-DTRACKER_T1000_E
-DGPS_POWER_TOGGLE
-DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
-DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-DMESHTASTIC_EXCLUDE_SCREEN=1

1
variants/nrf52840/wio-sdk-wm1110/platformio.ini
View File

@ -14,7 +14,6 @@ build_flags = ${nrf52840_base.build_flags}
-Isrc/platform/nrf52/softdevice
-Isrc/platform/nrf52/softdevice/nrf52
-DWIO_WM1110
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DCFG_TUD_CDC=0
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-sdk-wm1110>

1
variants/nrf52840/wio-t1000-s/platformio.ini
View File

@ -8,7 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
-Isrc/platform/nrf52/softdevice
-Isrc/platform/nrf52/softdevice/nrf52
-DWIO_WM1110
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-t1000-s>
lib_deps =

1
variants/nrf52840/wio-tracker-wm1110/platformio.ini
View File

@ -7,7 +7,6 @@ build_flags = ${nrf52840_base.build_flags}
-Isrc/platform/nrf52/softdevice
-Isrc/platform/nrf52/softdevice/nrf52
-DWIO_WM1110
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/wio-tracker-wm1110>
lib_deps =