Explorar o código

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

QMK Bot hai 1 ano
pai
achega
99249c88c1
Modificáronse 36 ficheiros con 142 adicións e 122 borrados
  1. 2 0
      data/schemas/keyboard.jsonschema
  2. 4 3
      keyboards/akb/vero/board.h
  3. 0 23
      keyboards/akb/vero/config.h
  4. 8 0
      keyboards/ibm/model_m_4th_gen/overnumpad_1xb/board.h
  5. 0 2
      keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
  6. 8 0
      keyboards/keychron/c1_pro_v2/board.h
  7. 0 3
      keyboards/keychron/c1_pro_v2/mcuconf.h
  8. 8 0
      keyboards/keychron/c2_pro_v2/board.h
  9. 0 3
      keyboards/keychron/c2_pro_v2/mcuconf.h
  10. 8 0
      keyboards/keychron/c3_pro/board.h
  11. 0 3
      keyboards/keychron/c3_pro/mcuconf.h
  12. 8 0
      keyboards/neson_design/810e/board.h
  13. 0 21
      keyboards/neson_design/810e/config.h
  14. 8 0
      keyboards/nix_studio/lilith/board.h
  15. 8 0
      keyboards/teleport/native/board.h
  16. 0 3
      keyboards/teleport/native/config.h
  17. 8 0
      keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/board.h
  18. 0 2
      keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
  19. 8 0
      keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/board.h
  20. 0 2
      keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
  21. 8 0
      keyboards/unicomp/pc122/overnumpad_1xb/board.h
  22. 0 2
      keyboards/unicomp/pc122/overnumpad_1xb/config.h
  23. 8 0
      keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/board.h
  24. 0 2
      keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
  25. 8 0
      keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/board.h
  26. 0 2
      keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
  27. 8 0
      keyboards/werk_technica/one/board.h
  28. 0 7
      keyboards/werk_technica/one/config.h
  29. 8 0
      keyboards/xelus/rs108/board.h
  30. 0 3
      keyboards/xelus/rs108/config.h
  31. 8 0
      keyboards/xelus/rs60/rev2_0/board.h
  32. 0 3
      keyboards/xelus/rs60/rev2_0/config.h
  33. 8 0
      keyboards/xelus/valor_frl_tkl/rev2_0/board.h
  34. 0 19
      keyboards/xelus/valor_frl_tkl/rev2_0/config.h
  35. 8 0
      keyboards/xelus/valor_frl_tkl/rev2_1/board.h
  36. 0 19
      keyboards/xelus/valor_frl_tkl/rev2_1/config.h

+ 2 - 0
data/schemas/keyboard.jsonschema

@@ -554,6 +554,7 @@
                     "items": {
                         "type": "object",
                         "additionalProperties": false,
+                        "required": ["x", "y"],
                         "properties": {
                             "matrix": {
                                 "type": "array",
@@ -640,6 +641,7 @@
                     "items": {
                         "type": "object",
                         "additionalProperties": false,
+                        "required": ["x", "y"],
                         "properties": {
                             "matrix": {
                                 "type": "array",

+ 4 - 3
keyboards/nix_studio/lilith/config.h → keyboards/akb/vero/board.h

@@ -1,7 +1,8 @@
 // Copyright 2022 Martin Arnstad (@arnstadm)
 // SPDX-License-Identifier: GPL-2.0-or-later
-
 #pragma once
 
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 23
keyboards/akb/vero/config.h

@@ -1,23 +0,0 @@
-// Copyright 2022 Martin Arnstad (@arnstadm)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000

+ 8 - 0
keyboards/ibm/model_m_4th_gen/overnumpad_1xb/board.h

@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 2
keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h

@@ -21,8 +21,6 @@
 #define SERIAL_NUMBER DEF_SERIAL_NUMBER
 #endif
 
-#define STM32_HSECLK 16000000
-
 #define SOLENOID_PIN B5
 #define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 20

+ 8 - 0
keyboards/keychron/c1_pro_v2/board.h

@@ -0,0 +1,8 @@
+// Copyright 2025 @ Keychron (https://www.keychron.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 3
keyboards/keychron/c1_pro_v2/mcuconf.h

@@ -18,9 +18,6 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_HSECLK
-#define STM32_HSECLK 16000000U
-
 #undef STM32_PLLM_VALUE
 #define STM32_PLLM_VALUE 8
 

+ 8 - 0
keyboards/keychron/c2_pro_v2/board.h

@@ -0,0 +1,8 @@
+// Copyright 2025 @ Keychron (https://www.keychron.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 3
keyboards/keychron/c2_pro_v2/mcuconf.h

@@ -18,9 +18,6 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_HSECLK
-#define STM32_HSECLK 16000000U
-
 #undef STM32_PLLM_VALUE
 #define STM32_PLLM_VALUE 8
 

+ 8 - 0
keyboards/keychron/c3_pro/board.h

@@ -0,0 +1,8 @@
+// Copyright 2024 @ Keychron (https://www.keychron.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 3
keyboards/keychron/c3_pro/mcuconf.h

@@ -18,9 +18,6 @@
 
 #include_next <mcuconf.h>
 
-#undef STM32_HSECLK
-#define STM32_HSECLK 16000000U
-
 #undef STM32_PLLM_VALUE
 #define STM32_PLLM_VALUE 8
 

+ 8 - 0
keyboards/neson_design/810e/board.h

@@ -0,0 +1,8 @@
+// Copyright 2024 astro
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 21
keyboards/neson_design/810e/config.h

@@ -1,21 +0,0 @@
-/**
- * Copyright 2024 astro
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define BOARD_OTG_NOVBUSSENS 1
-#define STM32_HSECLK 16000000U

+ 8 - 0
keyboards/nix_studio/lilith/board.h

@@ -0,0 +1,8 @@
+// Copyright 2022 Martin Arnstad (@arnstadm)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 8 - 0
keyboards/teleport/native/board.h

@@ -0,0 +1,8 @@
+// Copyright 2022 Moritz Plattner
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 3
keyboards/teleport/native/config.h

@@ -67,6 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef ENABLE_RGB_MATRIX_TYPING_HEATMAP
     #define RGB_MATRIX_TYPING_HEATMAP_SLIM
 #endif
-
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000

+ 8 - 0
keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/board.h

@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 2
keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h

@@ -21,8 +21,6 @@
 #define SERIAL_NUMBER DEF_SERIAL_NUMBER
 #endif
 
-#define STM32_HSECLK 16000000
-
 #define SOLENOID_PIN B5
 #define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 20

+ 8 - 0
keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/board.h

@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 2
keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h

@@ -21,8 +21,6 @@
 #define SERIAL_NUMBER DEF_SERIAL_NUMBER
 #endif
 
-#define STM32_HSECLK 16000000
-
 #define SOLENOID_PIN B5
 #define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 20

+ 8 - 0
keyboards/unicomp/pc122/overnumpad_1xb/board.h

@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 2
keyboards/unicomp/pc122/overnumpad_1xb/config.h

@@ -21,8 +21,6 @@
 #define SERIAL_NUMBER DEF_SERIAL_NUMBER
 #endif
 
-#define STM32_HSECLK 16000000
-
 #define SOLENOID_PIN B5
 #define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 20

+ 8 - 0
keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/board.h

@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 2
keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h

@@ -21,8 +21,6 @@
 #define SERIAL_NUMBER DEF_SERIAL_NUMBER
 #endif
 
-#define STM32_HSECLK 16000000
-
 #define SOLENOID_PIN B5
 #define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 20

+ 8 - 0
keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/board.h

@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 2
keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h

@@ -21,8 +21,6 @@
 #define SERIAL_NUMBER DEF_SERIAL_NUMBER
 #endif
 
-#define STM32_HSECLK 16000000
-
 #define SOLENOID_PIN B5
 #define HAPTIC_ENABLE_PIN C13
 #define SOLENOID_DEFAULT_DWELL 20

+ 8 - 0
keyboards/werk_technica/one/board.h

@@ -0,0 +1,8 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 7
keyboards/werk_technica/one/config.h

@@ -1,7 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000

+ 8 - 0
keyboards/xelus/rs108/board.h

@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 3
keyboards/xelus/rs108/config.h

@@ -28,6 +28,3 @@
 
 // Hardware Defines
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-// HSE CLK
-#define STM32_HSECLK 16000000

+ 8 - 0
keyboards/xelus/rs60/rev2_0/board.h

@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 3
keyboards/xelus/rs60/rev2_0/config.h

@@ -28,6 +28,3 @@
 
 // Hardware Defines
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-// HSE CLK
-#define STM32_HSECLK 16000000

+ 8 - 0
keyboards/xelus/valor_frl_tkl/rev2_0/board.h

@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 19
keyboards/xelus/valor_frl_tkl/rev2_0/config.h

@@ -1,19 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define STM32_HSECLK 16000000

+ 8 - 0
keyboards/xelus/valor_frl_tkl/rev2_1/board.h

@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U

+ 0 - 19
keyboards/xelus/valor_frl_tkl/rev2_1/config.h

@@ -1,19 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define STM32_HSECLK 16000000