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.
* Log and save in config lora tx_power after limits applyng
* Log and save in config lora tx_power after limits applyng
* Trunk fmt
* Remove duplicate logic
---------
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
- Rename REGULATORY_GAIN_LORA to TX_GAIN_LORA
- Move gain-based Tx power clamping from RadioInterface::applyModemConfig() to RadioInterface::limitPower()
- User-configured Tx power now matches the Tx power out of the device connector
- Re-order [LoRa Chip]Interface.cpp limitPower() to take place before the final Tx power clamping so we clamp based on the pre-PA Tx power rather than user-configured Tx power
Tested on XIAO BLE variant.
Signed-off-by: Andrew Yong <me@ndoo.sg>
Co-authored-by: Ben Meadors <benmmeadors@gmail.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>
* Wio-e5 / STM32WL wip
* Stubbing some FS stuff out
* Wio-e5 / STM32WL wip
* Stubbing some FS stuff out
* Wio-e5 / STM32WL wip
* Stubbing some FS stuff out
* Wio-e5 / STM32WL wip
* Stubbing some FS stuff out
* LittleFS compiles. Can't check with actual device.
* make cppcheck happy again
* Guard against accelerometer thread
* Missed a spot
* Upload via ST-LINK
* Derive MAC address from UID
* upload port
* Trunk it
* Guard it
* Maybe fix the cache error on startup.
* Latest RadioLib ref to fix SubGHZ
* revert nasty Sub-GHz Hack
* Boots and radio inits with RadioLib 6.0, LittleFS doesn't seem to work
---------
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: GUVWAF <thijs@havinga.eu>
