Merge remote-tracking branch 'origin/master' into develop

5 years ago · 6155987d9f
parent 1ade5aa922 09835033da
commit 6155987d9f
1 changed files with 5 additions and 0 deletions
--- a/quantum/keymap_extras/keymap_fr_ch.h
+++ b/quantum/keymap_extras/keymap_fr_ch.h
@ -20,6 +20,11 @@

 // clang-format off

+#ifdef CH_H
+// The ChibiOS ch.h file defines this...
+#    undef CH_H
+#endif
+
 /*
 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
 * │ § │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ^ │       │