diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-07 23:16:47 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-07 23:16:47 +0000 |
| commit | 3a98bd75c88c5cc64aed72b9d2e3a8857d949fed (patch) | |
| tree | 7edcbbfa0c0efd16e456d6012f90833922d3bb3c /keyboards | |
| parent | b8031a1613290ada50f4cb746216fcae90d8935d (diff) | |
| parent | 99bffc2a21ebed07fd767ad2a9a7e1aadd491ef3 (diff) | |
| download | qmk_firmware-3a98bd75c88c5cc64aed72b9d2e3a8857d949fed.tar.gz qmk_firmware-3a98bd75c88c5cc64aed72b9d2e3a8857d949fed.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/ai03/orbit/matrix.h | 3 | ||||
| -rw-r--r-- | keyboards/ai03/orbit/transport.h | 2 | ||||
| -rw-r--r-- | keyboards/converter/adb_usb/led.h | 43 |
3 files changed, 1 insertions, 47 deletions
diff --git a/keyboards/ai03/orbit/matrix.h b/keyboards/ai03/orbit/matrix.h deleted file mode 100644 index 664372b76..000000000 --- a/keyboards/ai03/orbit/matrix.h +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | #pragma once | ||
| 2 | |||
| 3 | #include "common/matrix.h" | ||
diff --git a/keyboards/ai03/orbit/transport.h b/keyboards/ai03/orbit/transport.h index 67597652f..757eae6f5 100644 --- a/keyboards/ai03/orbit/transport.h +++ b/keyboards/ai03/orbit/transport.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #include "common/matrix.h" | 3 | #include "matrix.h" |
| 4 | 4 | ||
| 5 | #define ROWS_PER_HAND (MATRIX_ROWS/2) | 5 | #define ROWS_PER_HAND (MATRIX_ROWS/2) |
| 6 | 6 | ||
diff --git a/keyboards/converter/adb_usb/led.h b/keyboards/converter/adb_usb/led.h deleted file mode 100644 index b33b6894e..000000000 --- a/keyboards/converter/adb_usb/led.h +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2011 Jun Wako <wakojun@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | |||
| 17 | Ported to QMK by Peter Roe <pete@13bit.me> | ||
| 18 | */ | ||
| 19 | |||
| 20 | #ifndef LED_H | ||
| 21 | #define LED_H | ||
| 22 | #include <stdint.h> | ||
| 23 | |||
| 24 | |||
| 25 | /* keyboard LEDs */ | ||
| 26 | #define USB_LED_NUM_LOCK 0 | ||
| 27 | #define USB_LED_CAPS_LOCK 1 | ||
| 28 | #define USB_LED_SCROLL_LOCK 2 | ||
| 29 | #define USB_LED_COMPOSE 3 | ||
| 30 | #define USB_LED_KANA 4 | ||
| 31 | |||
| 32 | |||
| 33 | #ifdef __cplusplus | ||
| 34 | extern "C" { | ||
| 35 | #endif | ||
| 36 | |||
| 37 | void led_set(uint8_t usb_led); | ||
| 38 | |||
| 39 | #ifdef __cplusplus | ||
| 40 | } | ||
| 41 | #endif | ||
| 42 | |||
| 43 | #endif | ||
