I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
* Update platformio inis for stm32 platform and wio-e5 variant for enabling i2c
* Don't reference timezone functions if MESHTASTIC_EXCLUDE_TZ is defined
* Use custom pow_of_two in RadioInterface instead of floating-point pow()
* First pass: enable sensors for STM32wL
* Fix AirQualityTelemetryModule being created if the PM25AQI header is missing
* Link in power sensor libraries
* more ini tweaks
* Add =1 to EXCLUDE defines, fix indentation.
* Drop HAS_WIRE in ini, it's defined in architecture.h
* Fix build when power sensor libraries are missing
Make MAX sensor integration into Power.cpp optional based on its library header existing.
Also make NullSensor expose a voltage and current sensor, because Power calls directly into these for INA sensors.
This lets us remove all the deps for the STM32WL platform.
* Change default I2C for RAK3172 to be I2C1, not I2C2
* Respect the laws of mathematics (oops)
* First addition of __has_include for sensor support
* Add __has_include blocks for sensors
* Put BMP and BME back in the right sensors
* Make TelemetrySensor::setup() a pure virtual finction
* Split environmental_base to environmental_extra, to compile the working sensor libs for Native
* Remove hard-coded checks for ARCH_PORTDUINO
* Un-clobber bmx160
* Move BusIO to environmental_extra due to Armv7 compile error
* Move to forked BusIO for the moment
* Enable HAS_SENSOR for Portduino
* Move back to Adafruit BusIO after patch
remove newline from logging statements in code. The LOG_* functions will now magically add it at the end.
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
