Merge remote-tracking branch 'origin/master' into develop
commit
2e0f2025bd
|
@ -1,6 +1,6 @@
|
|||
#include "quantum.h"
|
||||
#include "serial.h"
|
||||
#include "printf.h"
|
||||
#include "print.h"
|
||||
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <stdlib.h>
|
||||
#include "util/font5x7.h"
|
||||
#include "util/font8x16.h"
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
|
||||
#define TOTALFONTS 2
|
||||
const unsigned char* fonts_pointer[] = {font5x7, font8x16};
|
||||
|
|
|
@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/
|
||||
|
||||
#include <avr/io.h>
|
||||
#include "stdint.h"
|
||||
#include <stdint.h>
|
||||
#include "led.h"
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
#pragma once
|
||||
|
||||
#include <common/matrix.h>
|
||||
#include "common/matrix.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <common/matrix.h>
|
||||
#include "common/matrix.h"
|
||||
|
||||
#define ROWS_PER_HAND (MATRIX_ROWS/2)
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
* generator plugin. Do not edit manually.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include "stm32_gpio.h"
|
||||
#include <hal.h>
|
||||
#include <stm32_gpio.h>
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver local definitions. */
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
#include "util.h"
|
||||
#include "quantum.h"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
#include "ws2812.h"
|
||||
#include "stdlib.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
#define BYTES_FOR_LED_BYTE 4
|
||||
#define NB_COLORS 3
|
||||
|
|
|
@ -15,10 +15,9 @@ 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 "hal.h"
|
||||
#include <hal.h>
|
||||
#include "led_custom.h"
|
||||
#include "satisfaction75.h"
|
||||
#include "printf.h"
|
||||
|
||||
static void breathing_callback(PWMDriver *pwmp);
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
#include "print.h"
|
||||
#include "debug.h"
|
||||
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
#ifdef QWIIC_MICRO_OLED_ENABLE
|
||||
#include "micro_oled.h"
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
* generator plugin. Do not edit manually.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include "stm32_gpio.h"
|
||||
#include <hal.h>
|
||||
#include <stm32_gpio.h>
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver local definitions. */
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include "printf.h"
|
||||
#include <hal.h>
|
||||
#include "print.h"
|
||||
|
||||
#ifdef BACKLIGHT_ENABLE
|
||||
#include "backlight.h"
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* Copyright 2017 skully <skullydazed@gmail.com>
|
||||
*
|
||||
* 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 "hal.h"
|
||||
#include "led.h"
|
||||
#include "printf.h"
|
|
@ -1,159 +0,0 @@
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "hal.h"
|
||||
#include "timer.h"
|
||||
#include "wait.h"
|
||||
#include "printf.h"
|
||||
#include "matrix.h"
|
||||
#include "action.h"
|
||||
#include "keycode.h"
|
||||
#include <string.h>
|
||||
|
||||
/*
|
||||
* #define MATRIX_ROW_PINS { PB11, PA6, PA3, PA2, PA1, PB5, PB6, PC15, PC14, PC13 }
|
||||
* #define MATRIX_COL_PINS { PB10, PB2, PB1, PB0, PA7, PB4, PB3, PB7 }
|
||||
*/
|
||||
/* matrix state(1:on, 0:off) */
|
||||
static matrix_row_t matrix[MATRIX_ROWS];
|
||||
static matrix_row_t matrix_debouncing[MATRIX_COLS];
|
||||
static bool debouncing = false;
|
||||
static uint16_t debouncing_time = 0;
|
||||
|
||||
__attribute__ ((weak))
|
||||
void matrix_init_user(void) {}
|
||||
|
||||
__attribute__ ((weak))
|
||||
void matrix_scan_user(void) {}
|
||||
|
||||
__attribute__ ((weak))
|
||||
void matrix_init_kb(void) {
|
||||
matrix_init_user();
|
||||
}
|
||||
|
||||
__attribute__ ((weak))
|
||||
void matrix_scan_kb(void) {
|
||||
matrix_scan_user();
|
||||
}
|
||||
|
||||
void matrix_init(void) {
|
||||
printf("matrix init\n");
|
||||
//debug_matrix = true;
|
||||
|
||||
// actual matrix setup
|
||||
palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
palSetPadMode(GPIOB, 4, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
palSetPadMode(GPIOB, 3, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
palSetPadMode(GPIOB, 7, PAL_MODE_OUTPUT_PUSHPULL);
|
||||
|
||||
palSetPadMode(GPIOB, 11, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOA, 6, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOA, 3, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOA, 1, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOB, 5, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOB, 6, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLDOWN);
|
||||
palSetPadMode(GPIOC, 13, PAL_MODE_INPUT_PULLDOWN);
|
||||
|
||||
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
|
||||
memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
|
||||
|
||||
matrix_init_quantum();
|
||||
}
|
||||
|
||||
uint8_t matrix_scan(void) {
|
||||
// actual matrix
|
||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
||||
matrix_row_t data = 0;
|
||||
|
||||
// strobe col { PB10, PB2, PB1, PB0, PA7, PB4, PB3, PB7 }
|
||||
switch (col) {
|
||||
case 0: palSetPad(GPIOB, 10); break;
|
||||
case 1: palSetPad(GPIOB, 2); break;
|
||||
case 2: palSetPad(GPIOB, 1); break;
|
||||
case 3: palSetPad(GPIOB, 0); break;
|
||||
case 4: palSetPad(GPIOA, 7); break;
|
||||
case 5: palSetPad(GPIOB, 4); break;
|
||||
case 6: palSetPad(GPIOB, 3); break;
|
||||
case 7: palSetPad(GPIOB, 7); break;
|
||||
}
|
||||
|
||||
// need wait to settle pin state
|
||||
wait_us(20);
|
||||
|
||||
// read row data { PB11, PA6, PA3, PA2, PA1, PB5, PB6, PC15, PC14, PC13 }
|
||||
data = (
|
||||
(palReadPad(GPIOB, 11) << 0 ) |
|
||||
(palReadPad(GPIOA, 6) << 1 ) |
|
||||
(palReadPad(GPIOA, 3) << 2 ) |
|
||||
(palReadPad(GPIOA, 2) << 3 ) |
|
||||
(palReadPad(GPIOA, 1) << 4 ) |
|
||||
(palReadPad(GPIOB, 5) << 5 ) |
|
||||
(palReadPad(GPIOB, 6) << 6 ) |
|
||||
(palReadPad(GPIOC, 15) << 7 ) |
|
||||
(palReadPad(GPIOC, 14) << 8 ) |
|
||||
(palReadPad(GPIOC, 13) << 9 )
|
||||
);
|
||||
|
||||
// unstrobe col { B11, B10, B2, B1, A7, B0 }
|
||||
switch (col) {
|
||||
case 0: palClearPad(GPIOB, 10); break;
|
||||
case 1: palClearPad(GPIOB, 2); break;
|
||||
case 2: palClearPad(GPIOB, 1); break;
|
||||
case 3: palClearPad(GPIOB, 0); break;
|
||||
case 4: palClearPad(GPIOA, 7); break;
|
||||
case 5: palClearPad(GPIOB, 4); break;
|
||||
case 6: palClearPad(GPIOB, 3); break;
|
||||
case 7: palClearPad(GPIOB, 7); break;
|
||||
}
|
||||
|
||||
if (matrix_debouncing[col] != data) {
|
||||
matrix_debouncing[col] = data;
|
||||
debouncing = true;
|
||||
debouncing_time = timer_read();
|
||||
}
|
||||
}
|
||||
|
||||
if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
|
||||
for (int row = 0; row < MATRIX_ROWS; row++) {
|
||||
matrix[row] = 0;
|
||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
||||
matrix[row] |= ((matrix_debouncing[col] & (1 << row) ? 1 : 0) << col);
|
||||
}
|
||||
}
|
||||
debouncing = false;
|
||||
}
|
||||
|
||||
matrix_scan_quantum();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
bool matrix_is_on(uint8_t row, uint8_t col) {
|
||||
return (matrix[row] & (1<<col));
|
||||
}
|
||||
|
||||
matrix_row_t matrix_get_row(uint16_t row) {
|
||||
return matrix[row];
|
||||
}
|
||||
|
||||
void matrix_print(void) {
|
||||
printf("\nr/c 01234567\n");
|
||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
||||
printf("%X0: ", row);
|
||||
matrix_row_t data = matrix_get_row(row);
|
||||
for (int col = 0; col < MATRIX_COLS; col++) {
|
||||
if (data & (1<<col))
|
||||
printf("1");
|
||||
else
|
||||
printf("0");
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
}
|
|
@ -17,10 +17,7 @@ CONSOLE_ENABLE = yes # Console for debug
|
|||
COMMAND_ENABLE = yes # Commands for debug and configuration
|
||||
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
|
||||
NKRO_ENABLE = yes # USB Nkey Rollover
|
||||
#CUSTOM_MATRIX = yes # Custom matrix file
|
||||
AUDIO_ENABLE = yes
|
||||
# SERIAL_LINK_ENABLE = yes
|
||||
|
||||
# project specific files
|
||||
SRC = led.c
|
||||
LAYOUTS = 66_ansi
|
||||
|
|
|
@ -19,7 +19,7 @@ Ported to QMK by Peter Roe <pete@13bit.me>
|
|||
|
||||
#ifndef LED_H
|
||||
#define LED_H
|
||||
#include "stdint.h"
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
/* keyboard LEDs */
|
||||
|
|
|
@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "util.h"
|
||||
#include "matrix.h"
|
||||
#include "timer.h"
|
||||
#include "LUFA/Drivers/Peripheral/SPI.h"
|
||||
#include <LUFA/Drivers/Peripheral/SPI.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ 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 "stdint.h"
|
||||
#include <stdint.h>
|
||||
#include "ps2.h"
|
||||
#include "led.h"
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "wait.h"
|
||||
#include "print.h"
|
||||
#include "matrix.h"
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
static matrix_row_t matrix[MATRIX_ROWS];
|
||||
static matrix_row_t matrix_debouncing[MATRIX_ROWS];
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "quantum.h"
|
||||
#include "report.h"
|
||||
#include <util/delay.h>
|
||||
#include "../../lib/lufa/LUFA/Drivers/Peripheral/SPI.h"
|
||||
#include <LUFA/Drivers/Peripheral/SPI.h>
|
||||
|
||||
// Trackpad speed adjustments
|
||||
#define POINTER_SPEED_MULTIPLIER 2
|
||||
|
|
|
@ -18,6 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <serial_config.h>
|
||||
#include "serial_config.h"
|
||||
|
||||
#define PRODUCT Corne Keyboard Rev.1 (Legacy Split)
|
||||
|
|
|
@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <split_scomm.h>
|
||||
#include "split_scomm.h"
|
||||
#include "serial.h"
|
||||
#ifdef CONSOLE_ENABLE
|
||||
#include "debug.h"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#ifdef AUDIO_ENABLE
|
||||
float test_sound[][2] = SONG(STARTUP_SOUND);
|
||||
#include <audio/audio.h>
|
||||
#include "audio.h"
|
||||
#endif
|
||||
|
||||
uint16_t click_hz = CLICK_HZ;
|
||||
|
|
|
@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
#include <serial_config.h>
|
||||
#include "serial_config.h"
|
||||
|
||||
/* USB Device descriptor parameter
|
||||
VID & PID are lisenced from microchip sublisence program, Don't use other project! */
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <inttypes.h>
|
||||
#include <compat/twi.h>
|
||||
|
||||
#include <i2cmaster.h>
|
||||
#include "i2cmaster.h"
|
||||
|
||||
|
||||
/* define CPU frequency in Mhz here if not defined in Makefile */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
#include "serial_link/system/serial_link.h"
|
||||
#ifdef VISUALIZER_ENABLE
|
||||
#include "lcd_backlight.h"
|
||||
|
|
|
@ -15,7 +15,7 @@ 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 "hal.h"
|
||||
#include <hal.h>
|
||||
|
||||
#include "led.h"
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
#include "timer.h"
|
||||
#include "wait.h"
|
||||
#include "print.h"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
|
||||
/**
|
||||
* @brief PAL setup.
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "action_layer.h"
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
|
||||
// #define I2C_ADDR 0b01000000
|
||||
#define I2C_ADDR 0b01000000
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
|
||||
bool is_alt_tab_active = false;
|
||||
uint16_t alt_tab_timer = 0;
|
||||
|
|
|
@ -309,7 +309,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
|
||||
//Functions for ver2
|
||||
#ifdef KEYBOARD_hadron_ver2
|
||||
#include "LUFA/Drivers/Peripheral/TWI.h"
|
||||
#include <LUFA/Drivers/Peripheral/TWI.h>
|
||||
void matrix_init_user(void) {
|
||||
#ifdef USE_I2C
|
||||
i2c_master_init();
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
#include "LUFA/Drivers/Peripheral/TWI.h"
|
||||
#include <LUFA/Drivers/Peripheral/TWI.h>
|
||||
#ifdef AUDIO_ENABLE
|
||||
#include "audio.h"
|
||||
#endif
|
||||
|
|
|
@ -15,7 +15,7 @@ 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 "hal.h"
|
||||
#include <hal.h>
|
||||
#include "led.h"
|
||||
|
||||
|
||||
|
|
|
@ -15,8 +15,8 @@ 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 "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
/*
|
||||
* scan matrix
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
|
||||
/**
|
||||
* @brief PAL setup.
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <inttypes.h>
|
||||
#include <compat/twi.h>
|
||||
|
||||
#include <i2cmaster.h>
|
||||
#include "i2cmaster.h"
|
||||
|
||||
/* define CPU frequency in Hz here if not defined in Makefile */
|
||||
#ifndef F_CPU
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "62key.h"
|
||||
#include "rgblight.h"
|
||||
#include <keymap_colemak.h>
|
||||
#include <sendstring_colemak.h>
|
||||
#include "keymap_colemak.h"
|
||||
#include "sendstring_colemak.h"
|
||||
|
||||
|
||||
// Automatic Layer ID:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef PROMETHIUM_H
|
||||
#define PROMETHIUM_H
|
||||
|
||||
#include "stdint.h"
|
||||
#include <stdint.h>
|
||||
|
||||
void battery_poll(uint8_t level);
|
||||
void led_set_kb(uint8_t usb_led);
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef LOCAL_GLCDFONT
|
||||
#include "common/glcdfont.c"
|
||||
#else
|
||||
#include <helixfont.h>
|
||||
#include "helixfont.h"
|
||||
#endif
|
||||
#ifdef PROTOCOL_LUFA
|
||||
#include "lufa.h"
|
||||
|
|
|
@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define PRODUCT Helix Alpha
|
||||
#define DESCRIPTION A split keyboard for the cheap makers
|
||||
|
||||
#include <serial_config.h>
|
||||
#include "serial_config.h"
|
||||
|
||||
#define HELIX_ROWS 5
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
#include "bootloader.h"
|
||||
#include "LUFA/Drivers/Peripheral/TWI.h"
|
||||
#include <LUFA/Drivers/Peripheral/TWI.h>
|
||||
#ifdef AUDIO_ENABLE
|
||||
#include "audio.h"
|
||||
#endif
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
#include <stdio.h>
|
||||
#ifdef CONSOLE_ENABLE
|
||||
#include <print.h>
|
||||
#include "print.h"
|
||||
#endif
|
||||
#ifdef SSD1306OLED
|
||||
#include "ssd1306.h"
|
||||
#endif
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
#include "layer_number.h"
|
||||
|
||||
extern int current_default_layer;
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <split_scomm.h>
|
||||
#include "split_scomm.h"
|
||||
#include "serial.h"
|
||||
#ifdef CONSOLE_ENABLE
|
||||
#include <print.h>
|
||||
#include "print.h"
|
||||
#endif
|
||||
|
||||
uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
#include <stdio.h>
|
||||
#ifdef CONSOLE_ENABLE
|
||||
#include <print.h>
|
||||
#include "print.h"
|
||||
#endif
|
||||
#ifdef SSD1306OLED
|
||||
#include "ssd1306.h"
|
||||
#endif
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
#include "layer_number.h"
|
||||
|
||||
extern int current_default_layer;
|
||||
|
|
|
@ -16,7 +16,7 @@ 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 "hal.h"
|
||||
#include <hal.h>
|
||||
|
||||
#include "led.h"
|
||||
|
||||
|
|
|
@ -22,8 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
* datasheet: http://www.issi.com/WW/pdf/31FL3731C.pdf
|
||||
*/
|
||||
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
#include "print.h"
|
||||
#include "led.h"
|
||||
#include "host.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
#include "timer.h"
|
||||
#include "wait.h"
|
||||
#include "print.h"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
|
||||
/**
|
||||
* @brief PAL setup.
|
||||
|
|
|
@ -15,7 +15,7 @@ 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 "hal.h"
|
||||
#include <hal.h>
|
||||
|
||||
#include "led.h"
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
#include "timer.h"
|
||||
#include "wait.h"
|
||||
#include "print.h"
|
||||
|
|
|
@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <config_common.h>
|
||||
#include "config_common.h"
|
||||
|
||||
/* USB Device descriptor parameter */
|
||||
#define VENDOR_ID 0x1209
|
||||
|
|
|
@ -13,10 +13,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 <quantum.h>
|
||||
#include <i2c_master.h>
|
||||
#include <led_tables.h>
|
||||
#include <rgb_matrix.h>
|
||||
#include "quantum.h"
|
||||
#include "i2c_master.h"
|
||||
#include "led_tables.h"
|
||||
#include "rgb_matrix.h"
|
||||
#include <string.h>
|
||||
#include "model01.h"
|
||||
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include <quantum.h>
|
||||
#include <rgb_matrix.h>
|
||||
#include "quantum.h"
|
||||
#include "rgb_matrix.h"
|
||||
|
||||
void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
|
||||
void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
* 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>
|
||||
#include <i2c_master.h>
|
||||
#include "quantum.h"
|
||||
#include "i2c_master.h"
|
||||
#include <string.h>
|
||||
#include "model01.h"
|
||||
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
* 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>
|
||||
#include <i2c_master.h>
|
||||
#include "quantum.h"
|
||||
#include "i2c_master.h"
|
||||
#include <string.h>
|
||||
#include "model01.h"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include <quantum.h>
|
||||
#include "quantum.h"
|
||||
|
||||
#define LAYOUT( \
|
||||
L07, L06, L05, L04, L03, L02, R05, R04, R03, R02, R01, R00, \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include QMK_KEYBOARD_H
|
||||
#include "LUFA/Drivers/Peripheral/TWI.h"
|
||||
#include <LUFA/Drivers/Peripheral/TWI.h>
|
||||
#ifdef SSD1306OLED
|
||||
#include "ssd1306.h"
|
||||
#endif
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#include "TWIlib.h"
|
||||
#include "util/delay.h"
|
||||
#include <util/delay.h>
|
||||
#include "print.h"
|
||||
|
||||
// Global transmit buffer
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <avr/timer_avr.h>
|
||||
#include <avr/wdt.h>
|
||||
#include <audio/audio.h>
|
||||
#include "audio.h"
|
||||
#include "issi.h"
|
||||
#include "TWIlib.h"
|
||||
#include "lighting.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "lighting.h"
|
||||
#include "debug.h"
|
||||
#include "rgblight.h"
|
||||
#include "audio/audio.h"
|
||||
#include "audio.h"
|
||||
|
||||
|
||||
extern rgblight_config_t rgblight_config; // Declared in rgblight.c
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
* generator plugin. Do not edit manually.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include "stm32_gpio.h"
|
||||
#include <hal.h>
|
||||
#include <stm32_gpio.h>
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver local definitions. */
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
* generator plugin. Do not edit manually.
|
||||
*/
|
||||
|
||||
#include "hal.h"
|
||||
#include "stm32_gpio.h"
|
||||
#include <hal.h>
|
||||
#include <stm32_gpio.h>
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Driver local definitions. */
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
#include "quantum.h"
|
||||
#include "timer.h"
|
||||
#include "wait.h"
|
||||
#include "printf.h"
|
||||
#include "print.h"
|
||||
#include "matrix.h"
|
||||
|
||||
/**
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#include "TWIlib.h"
|
||||
#include "util/delay.h"
|
||||
#include <util/delay.h>
|
||||
#include "print.h"
|
||||
|
||||
// Global transmit buffer
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include "TWIlib.h"
|
||||
#include "lighting.h"
|
||||
#include "debug.h"
|
||||
#include "audio/audio.h"
|
||||
#include "audio.h"
|
||||
|
||||
|
||||
const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP;
|
||||
|
|
|
@ -21,10 +21,10 @@
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
#include "timer.h"
|
||||
#include "wait.h"
|
||||
#include "printf.h"
|
||||
#include "print.h"
|
||||
#include "matrix.h"
|
||||
#include "action.h"
|
||||
#include "keycode.h"
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
# include <avr/interrupt.h>
|
||||
#endif
|
||||
#ifdef STM32_EEPROM_ENABLE
|
||||
# include "hal.h"
|
||||
# include <hal.h>
|
||||
# include "eeprom.h"
|
||||
# include "eeprom_stm32.h"
|
||||
#endif
|
||||
|
@ -31,7 +31,7 @@
|
|||
#include "color.h"
|
||||
#include "debug.h"
|
||||
#include "led_tables.h"
|
||||
#include "lib/lib8tion/lib8tion.h"
|
||||
#include <lib/lib8tion/lib8tion.h>
|
||||
#ifdef VELOCIKEY_ENABLE
|
||||
# include "velocikey.h"
|
||||
#endif
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
*/
|
||||
#include <stdbool.h>
|
||||
#include "action.h"
|
||||
#include "lib/lufa/LUFA/Drivers/Peripheral/TWI.h"
|
||||
#include "lib/lufa/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c"
|
||||
#include <LUFA/Drivers/Peripheral/TWI.h>
|
||||
#include <LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c>
|
||||
#include "mcp23017.h"
|
||||
#include "debug.h"
|
||||
#include "wait.h"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include "quantum.h"
|
||||
#include "pointing_device.h"
|
||||
#include "adns9800_srom_A4.h"
|
||||
#include "../../lib/lufa/LUFA/Drivers/Peripheral/SPI.h"
|
||||
#include <LUFA/Drivers/Peripheral/SPI.h>
|
||||
|
||||
// registers
|
||||
#define REG_Product_ID 0x00
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "hal.h"
|
||||
#include <hal.h>
|
||||
#include "usb_main.h"
|
||||
#include "phoenix.h"
|
||||
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "ez.h"
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
|
||||
keyboard_config_t keyboard_config;
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#ifdef LED_MATRIX_ENABLE
|
||||
#include "is31fl3731-simple.h"
|
||||
#include <math.h>
|
||||
#include <print.h>
|
||||
#include "print.h"
|
||||
#include "quantum.h"
|
||||
|
||||
const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
|
||||
|
|
|
@ -55,8 +55,8 @@
|
|||
#include <avr/interrupt.h>
|
||||
#include "drivers/avr/i2c_master.h"
|
||||
#else
|
||||
#include "ch.h"
|
||||
#include "hal.h"
|
||||
#include <ch.h>
|
||||
#include <hal.h>
|
||||
#include "drivers/chibios/i2c_master.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
#include <serial_config.h>
|
||||
#include "serial_config.h"
|
||||
|
||||
#define USE_I2C
|
||||
#define USE_SERIAL
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <split_scomm.h>
|
||||
#include "split_scomm.h"
|
||||
#include "serial.h"
|
||||
#ifdef CONSOLE_ENABLE
|
||||
#include <print.h>
|
||||
#include "print.h"
|
||||
#endif
|
||||
|
||||
uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
*/
|
||||
#include "voices.h"
|
||||
#include "audio.h"
|
||||
#include "stdlib.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
// these are imported from audio.c
|
||||
extern uint16_t envelope_index;
|
||||
|
|
|
@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "stdint.h"
|
||||
#include "stdbool.h"
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
/* FIXME: Add doxygen comments here. */
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "progmem.h"
|
||||
#include "stddef.h"
|
||||
#include "inttypes.h"
|
||||
#include <stddef.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#define ATTR_PACKED __attribute__((packed))
|
||||
/** Concatenates the given input into a single token, via the C Preprocessor.
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "led.h"
|
||||
#include "sendchar.h"
|
||||
#include "debug.h"
|
||||
#include "printf.h"
|
||||
#include "print.h"
|
||||
|
||||
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
|
||||
// Change this to be TRUE once we've migrated keyboards to the new init system
|
||||
|
|
Loading…
Reference in New Issue