Jorropo
beb268ff25
Revert "add a .clang-format file ( #9154 )" ( #9172 )
...
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 .
2026-01-04 05:15:53 -06:00
Jorropo
0d11331d18
add a .clang-format file ( #9154 )
2026-01-03 14:19:24 -06:00
Ben Meadors
27b522b55a
Merge branch 'master' into develop
2026-01-01 18:25:18 -06:00
Ben Meadors
1b83501ee2
Revert "Upgrade all esp32 targets to NimBLE 2.X ( #9003 )" ( #9125 )
...
This reverts commit 40f1f91c0d .
2025-12-30 17:23:50 -06:00
Ben Meadors
4fe1c87e54
Merge branch 'master' into develop
2025-12-20 09:52:08 -06:00
Austin
96c42229b0
Renovate all the things ( #8994 )
2025-12-17 11:05:48 -06:00
Ben Meadors
40f1f91c0d
Upgrade all esp32 targets to NimBLE 2.X ( #9003 )
...
* Upgrade all esp32 targets to NimBLE 2.X
* Remove guard
2025-12-17 10:40:33 -06:00
Austin
ed77ba5612
Replace PIO fuzzy version matches (reproducible builds) ( #8984 )
...
This change does not introduce version *changes*, but simply "updates" to the version already being referenced by the fuzzy-match (^)
2025-12-15 19:48:34 -06:00
Riker
09bbfce625
Enabled MQTT and WEBSERVER by default ( #8679 )
...
Signed-off-by: kur1k0 <zhuzirun@m5stack.com >
Co-authored-by: Ben Meadors <benmmeadors@gmail.com >
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz >
2025-11-30 20:27:45 -06:00
Thomas Göttgens
71d84404c6
add WIP for Unit C6L ( #7433 )
...
* add WIP for Unit C6L
* adapt to new config structure
* Add c6l BLE and screen support (#7991 )
* Minor c6l fix
* Move out of PRIVATE_HW
---------
Co-authored-by: Austin <vidplace7@gmail.com >
Co-authored-by: Ben Meadors <benmmeadors@gmail.com >
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz >
Co-authored-by: Jason P <Xaositek@users.noreply.github.com >
Co-authored-by: Markus <Links2004@users.noreply.github.com >
2025-09-17 22:40:55 +02:00