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>
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>
if u8i == 135, then u8i++ runs, the loop exits since u8i == 136,
then value for u8i is 136 after the for loop.
then in the next line, ntc_res2[u8i] will read past the end
of the array
Jorropo