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.
* rework I2C sensor init
the goal is to only instantiate sensors that are pressend to save memory.
side effacts:
- easyer sensor integration (less C&P code)
- nodeTelemetrySensorsMap can be removed when all devices are migrated
* add missing ifdef
* refactor a bunch of more sensors
RAM -816
Flash -916
* fix build for t1000
* refactor more sensors
RAM -192
Flash -60
* improve error handling
Flash -112
* fix build
* fix build
* fix IndicatorSensor
* fix tracker-t1000-e build
not sure what magic is used but it works
* Apply suggestion from @Copilot
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Apply suggestion from @Copilot
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Apply suggestion from @Copilot
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update src/modules/Telemetry/Sensor/DFRobotGravitySensor.h
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Fix
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* 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
JorropoandGitHub
Jonathan BennettandGitHub
Jorge Castillo