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

Speed1 · Jul 7, 2022 · b0c3d61 · b0c3d61
2 parents 643f636 + e724801
commit b0c3d61
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 50 deletions.
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "../../config.h"
-
 /* Use I2C or Serial, not both */
 
 #define USE_SERIAL

diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
@@ -1,6 +1,4 @@
-#include "dactyl_manuform.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 

diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 #define XXX KC_NO
 

diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.c b/keyboards/handwired/dactyl_manuform/dactyl_manuform.c
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dactyl_manuform.h"
+#include "quantum.h"
 
 // This uses the same coordinate system as the program that defines
 // the case model, but not the same coordinates.