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

keyboards/25keys/cassette42/common/oled_helper.c

@@ -1,5 +1,7 @@
 #include "oled_helper.h"
-#include "quantum.h"
+#include "progmem.h"
+#include "rgblight.h"
+#include "oled_driver.h"
 #include <stdio.h>
 #include <string.h>
 

keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c

@@ -14,8 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include QMK_KEYBOARD_H
 #include "pimoroni_trackball.h"
 #include "i2c_master.h"
+#include "action.h"
+#include "timer.h"
+#include "print.h"
 
 static uint8_t scrolling      = 0;
 static int16_t x_offset       = 0;

keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h

@@ -16,8 +16,10 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include "pointing_device.h"
+#include "report.h"
 
 #ifndef TRACKBALL_ADDRESS
 #    define TRACKBALL_ADDRESS (0x0A << 1)

keyboards/annepro2/annepro2_ble.h

@@ -17,7 +17,6 @@
 #pragma once
 
 #include "annepro2.h"
-#include "quantum.h"
 
 void annepro2_ble_bootload(void);
 void annepro2_ble_startup(void);

keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c

@@ -4,6 +4,9 @@
 #include "satisfaction_core.h"
 #include "print.h"
 #include "debug.h"
+#include "matrix.h"
+#include "quantum.h"
+#include "encoder.h"
 
 #include <ch.h>
 #include <hal.h>

keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h

@@ -3,7 +3,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "via.h" // only for EEPROM address
 #include "satisfaction_keycodes.h"

keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "satisfaction_core.h"
+#include "backlight.h"
 #include "eeprom.h"
 
 void pre_encoder_mode_change(void){

keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c

@@ -2,6 +2,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "satisfaction_core.h"
+#include "action_layer.h"
+#include "action_util.h"
+#include "timer.h"
+#include "matrix.h"
+#include "led.h"
+#include "host.h"
+#include "oled_driver.h"
+#include "progmem.h"
 #include <stdio.h>
 
 void draw_default(void);

keyboards/clueboard/2x1800/2021/max7219.c

@@ -40,6 +40,10 @@
  */
 
 #include "max7219.h"
+#include "spi_master.h"
+#include "debug.h"
+#include "gpio.h"
+#include "wait.h"
 #include "font.h"
 
 // Datastructures

keyboards/clueboard/2x1800/2021/max7219.h

@@ -26,8 +26,10 @@
  *    OTHER DEALINGS IN THE SOFTWARE.
  */
 #pragma once
-#include "quantum.h"
-#include "spi_master.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 // Set defaults if they're not set
 #ifndef MAX7219_LOAD

keyboards/converter/usb_usb/custom_matrix.cpp

@@ -35,10 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keyboard.h"
 
-extern "C" {
-#include "quantum.h"
-}
-
 /* KEY CODE to Matrix
  *
  * HID keycode(1 byte):

keyboards/converter/xt_usb/xt.h

@@ -38,7 +38,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 #define XT_DATA_IN()               \
     do {                           \

keyboards/duck/duck_led/duck_led.c

@@ -1,6 +1,5 @@
-#include <avr/io.h>
 #include "duck_led.h"
-#include "quantum.h"
+#include "wait.h"
 
 void show(void) {
   wait_us((RES / 1000UL) + 1);

keyboards/duck/jetfire/indicator_leds.c

@@ -12,13 +12,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "indicator_leds.h"
 #include <avr/interrupt.h>
 #include <avr/io.h>
-#include <stdbool.h>
 #include <util/delay.h>
-#include <stdint.h>
-#include "indicator_leds.h"
-#include "quantum.h"
 
 #define LED_T1H  900
 #define LED_T1L  600

keyboards/duck/jetfire/indicator_leds.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
 #include "duck_led/duck_led.h"
 
 void backlight_init_ports(void);

keyboards/fallacy/indicators.h

@@ -15,8 +15,7 @@
  */
 #pragma once
 
-#include "quantum.h"
-
+#include <stdbool.h>
 
 void init_fallacy_leds(void);
 void update_fallacy_leds(void);

keyboards/handwired/d48/taphold.c

@@ -1,4 +1,7 @@
 #include "taphold.h"
+#include "action_layer.h"
+#include "keyboard.h"
+#include "timer.h"
 
 bool taphold_process(uint16_t keycode, keyrecord_t *record) {
     for (int i = 0; i < taphold_config_size; i++) {

keyboards/handwired/d48/taphold.h

@@ -1,6 +1,8 @@
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
 
 typedef enum taphold_mode_t {
     TAPHOLD_LAYER,

keyboards/handwired/dactyl_minidox/dactyl_minidox.c

@@ -0,0 +1,66 @@
+/*
+Copyright 2021 @dlford
+
+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/>.
+*/
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// LED Layout
+// Columns
+// 0   1   2   3   4   5   6   7   8   9   10  11
+// Physical (Center: 133)
+// 20  41  61  81  102 122 143 163 183 204 224 244
+//                                                  Rows  Physical (Center: 54)
+// 17  12  11  06  05          23  24  29  30  35   0     21
+// 16  13  10  07  04          22  25  28  31  34   1     43
+// 15  14  09  08  03          21  26  27  32  33   2     64
+//             02  01  00  18  19  20               3     85
+
+led_config_t g_led_config = { {
+    // Key matrix to LED index
+    // Left 1-18
+            {17, 12, 11,  6,  5},
+            {16, 13, 10,  7,  4},
+            {15, 14,  9,  8,  3},
+    {NO_LED, NO_LED,  2,  1,  0},
+                                    // Right 1-18
+                                    {23, 24, 29, 30, 35},
+                                    {22, 25, 28, 31, 34},
+                                    {21, 26, 27, 32, 33},
+                                    {18, 19, 20, NO_LED, NO_LED},
+}, {
+    // LED index to physical position
+    // Left 1-18
+    {122,85},{102,85},{81,85},{102,64},{102,43},{102,21},
+    {81,21},{81,43},{81,64},{61,64},{61,43},{61,21},
+    {41,21},{41,43},{41,64},{20,64},{20,43},{20,21},
+    // Right 1-18
+    {143,85},{163,85},{183,85},{163,64},{163,43},{163,21},
+    {183,21},{183,43},{183,64},{204,64},{204,43},{204,21},
+    {224,21},{224,43},{224,64},{244,64},{244,43},{244,21}
+}, {
+    // LED index to flag
+    // Left 1-18
+    4,4,4,4,4,4,
+    4,4,4,4,4,4,
+    4,4,4,4,4,4,
+    // Right 1-18
+    4,4,4,4,4,4,
+    4,4,4,4,4,4,
+    4,4,4,4,4,4
+} };
+
+#endif

keyboards/handwired/dygma/raise/leds.c

@@ -14,15 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
+#include "leds.h"
+#include <string.h>
 #include "i2c_master.h"
 #include "led_tables.h"
 #include "rgb_matrix.h"
-#include <string.h>
+#include "wait.h"
 #include "raise.h"
 #include "wire-protocol-constants.h"
 #include "print.h"
-#include "leds.h"
 
 // Color order of LEDs is Green, Red, Blue.
 typedef struct PACKED {