kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Revert "add a .clang-format file (#9154)" (#9172)

Browse Source 
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.
This commit is contained in:
Jorropo
2026-01-04 05:15:53 -06:00
committed by GitHub
parent 0d11331d18
commit beb268ff25
771 changed files with 83399 additions and 77967 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/esp32s3/tracksenger/lcd/variant.h
+8 -4
View File
@@ -106,8 +106,12 @@
#define INPUTBROKER_MATRIX_TYPE 1
#define KEYS_COLS \
{ 44, 45, 46, 4, 5, 6 }
#define KEYS_ROWS \
{ 26, 37, 17, 16, 15, 7 }
#define KEYS_COLS \
{ \
44, 45, 46, 4, 5, 6 \
}
#define KEYS_ROWS \
{ \
26, 37, 17, 16, 15, 7 \
}
// #end keyboard