Merge upstream dev into keymindCascade

variants/heltec_t1/variant.h

@@ -9,6 +9,12 @@
 #define USE_LFXO
 #define VARIANT_MCK (64000000ul)
 
+// This board has no external RTC chip -- the ICM-42607-P IMU sits at 0x68,
+// the same I2C address DS3231 probing checks, so without this the IMU gets
+// misidentified as a DS3231 and its unrelated registers get read/written
+// as if they were time/status registers, producing a bogus, unfixable clock.
+#define DISABLE_DS3231_PROBE
+
 ////////////////////////////////////////////////////////////////////////////////
 // Number of pins
 

variants/lilygo_techo_lite/variant.h

@@ -70,9 +70,6 @@
 #define PIN_QSPI_IO2            _PINNUM(1, 9)
 #define PIN_QSPI_IO3            _PINNUM(0, 26)
 
-#define EXTERNAL_FLASH_DEVICES ZD25WQ32CEIGR
-#define EXTERNAL_FLASH_USE_QSPI
-
 ////////////////////////////////////////////////////////////////////////////////
 // Builtin LEDs
 
@@ -95,9 +92,6 @@
 #define PIN_BUTTON2             _PINNUM(0, 18)
 #define BUTTON_PIN2             PIN_BUTTON2
 
-#define EXTERNAL_FLASH_DEVICES MX25R1635F
-#define EXTERNAL_FLASH_USE_QSPI
-
 ////////////////////////////////////////////////////////////////////////////////
 // Lora
 
@@ -154,8 +148,8 @@ extern const int SCK;
 // GPS - per LilyGo t_echo_lite_config.h
 // PIN_GPS_TX/RX named from GPS module's perspective
 
-#define PIN_GPS_TX              _PINNUM(0, 29) // GPS UART TX -> MCU RX
-#define PIN_GPS_RX              _PINNUM(1, 10) // GPS UART RX <- MCU TX
+#define PIN_GPS_RX              _PINNUM(0, 29) // MCU TX -> GPS RX
+#define PIN_GPS_TX              _PINNUM(1, 10) // GPS TX -> MCU RX
 #define GPS_EN                  _PINNUM(1, 11) // GPS RT9080 power enable
 #define PIN_GPS_STANDBY         _PINNUM(1, 13) // GPS wake-up
-#define PIN_GPS_PPS             _PINNUM(1, 15) // GPS 1PPS
+#define PIN_GPS_PPS             _PINNUM(1, 15) // GPS 1PPS

variants/promicro/platformio.ini

@@ -24,6 +24,7 @@ build_flags = ${rak4631_hw.build_flags}
   -D ENV_INCLUDE_BMP280=1
   -D ENV_INCLUDE_INA3221=1
   -D ENV_INCLUDE_INA219=1
+  -D ENV_INCLUDE_INA226=1
 build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/sensors>
   +<../variants/promicro>
@@ -35,6 +36,7 @@ lib_deps= ${rak4631_hw.lib_deps}
   adafruit/Adafruit BME280 Library @ ^2.3.0
   adafruit/Adafruit BMP280 Library@^2.6.8
   stevemarple/MicroNMEA @ ^2.0.6
+  robtillaart/INA226@^0.6.6
 
 [env:ProMicro_repeater]
 extends = Promicro