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.
* 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
* * Update RAK9154 sensor to tx remote power telemetry
* remove uf2 script, pio run does that inline
* move sensor module to correct position
* disable LED and Accelerometer code on rak2560
* trunk fmt
* mention epaper variant
* attention, revert, revert
* Enable Environment Telemetry of these values
* fix float values
* Initiate magenetometer based compass calibration from button presses
- only active for BMX160 accelerometers on RAK_4631
- replace automatic calibration on power on with button triggered
calibration
- set 5 presses to trigger 30s calibration
- set 6 presses to trigger 60s calibration (useful if unit is not
handheld, ie vehicle mounted)
- show calibration time remaining on calibration alert screen
* Fix non RAK 4631 builds
- exclude changes from non RAK 4631 builds
- remove calls to screen when not present
* Fix build on RAK4631_eth_gw
- exclude all compass heading updates on variant without screen
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
JorropoandGitHub
Jonathan BennettandGitHub
Thomas GöttgensandGitHub
