Merge branch 'master' into regulatory-gain

variants/heltec_capsule_sensor_v3/platformio.ini

@@ -0,0 +1,11 @@
+[env:heltec_capsule_sensor_v3]
+extends = esp32s3_base
+board = heltec_wifi_lora_32_V3
+board_check = true
+
+build_flags = 
+  ${esp32s3_base.build_flags} -I variants/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
+

variants/heltec_capsule_sensor_v3/variant.h

@@ -0,0 +1,42 @@
+#define LED_PIN 33
+#define LED_PIN2 34 
+#define EXT_PWR_DETECT 35
+
+#define BUTTON_PIN 18
+
+#define BATTERY_PIN 7 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
+#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
+#define ADC_MULTIPLIER (4.9 * 1.045)
+#define ADC_CTRL 36 // active HIGH, powers the voltage divider. Only on 1.1
+#define ADC_CTRL_ENABLED HIGH
+
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+#define GPS_RX_PIN 5
+#define GPS_TX_PIN 4
+#define PIN_GPS_RESET 3
+#define GPS_RESET_MODE LOW
+#define PIN_GPS_PPS 1
+#define PIN_GPS_EN 21
+#define GPS_EN_ACTIVE HIGH
+
+#define USE_SX1262
+#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_RESET 12
+#define LORA_DIO1 14 // SX1262 IRQ
+#define LORA_DIO2 13 // SX1262 BUSY
+#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
+
+#define LORA_SCK 9
+#define LORA_MISO 11
+#define LORA_MOSI 10
+#define LORA_CS 8
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8

variants/radiomaster_900_bandit_micro/platformio.ini

@@ -0,0 +1,19 @@
+;
+; This uses the same code and settings as the Radio Master Bandit Nano (https://www.radiomasterrc.com/products/bandit-nano-expresslrs-rf-module)
+;
+; Link to the unit : https://www.radiomasterrc.com/products/bandit-micro-expresslrs-rf-module
+;
+[env:radiomaster_900_bandit_micro]
+extends = esp32_base
+board = esp32doit-devkit-v1
+build_flags =
+  ${esp32_base.build_flags}
+  -DRADIOMASTER_900_BANDIT_NANO
+  -DVTABLES_IN_FLASH=1
+  -DCONFIG_DISABLE_HAL_LOCKS=1
+  -O2
+  -Ivariants/radiomaster_900_bandit_nano
+board_build.f_cpu = 240000000L
+upload_protocol = esptool
+lib_deps =
+  ${esp32_base.lib_deps}

variants/rak10701/platformio.ini

@@ -17,6 +17,8 @@ lib_deps =
   https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
   bodmer/TFT_eSPI
+  beegee-tokyo/RAKwireless RAK12034@^1.0.0
+  beegee-tokyo/RAK14014-FT6336U @ 1.0.1
 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

variants/rak10701/variant.h

@@ -307,10 +307,10 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define SCREEN_ROTATE
 #define SCREEN_TRANSITION_FRAMERATE 5
 
-#define HAS_TOUCHSCREEN 0
-#define SCREEN_TOUCH_INT 10 // From tp.h on the tracker open source code.
-#define TOUCH_I2C_PORT 0
-#define TOUCH_SLAVE_ADDRESS 0x5D // GT911
+#define HAS_TOUCHSCREEN 1
+#define SCREEN_TOUCH_INT WB_IO6
+
+#define CANNED_MESSAGE_MODULE_ENABLE 1
 
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only

variants/rak4631/platformio.ini

@@ -16,6 +16,7 @@ lib_deps =
   melopero/Melopero RV3028@^1.1.0
   https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
+  https://github.com/meshtastic/RAK12034-BMX160.git#4821355fb10390ba8557dc43ca29a023bcfbb9d9
 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

variants/rak4631_epaper/platformio.ini

@@ -13,6 +13,7 @@ lib_deps =
   zinggjm/GxEPD2@^1.4.9
   melopero/Melopero RV3028@^1.1.0
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
+  beegee-tokyo/RAKwireless RAK12034@^1.0.0
 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

variants/rak4631_epaper_onrxtx/platformio.ini

@@ -15,7 +15,8 @@ lib_deps =
   zinggjm/GxEPD2@^1.5.1
   melopero/Melopero RV3028@^1.1.0
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
+  beegee-tokyo/RAKwireless RAK12034@^1.0.0
 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_port = /dev/ttyACM3
+;upload_port = /dev/ttyACM3