diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
| commit | 2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch) | |
| tree | 2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /keyboards/ergodox_infinity | |
| parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
| parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) | |
| download | qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.tar.gz qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ergodox_infinity')
| -rw-r--r-- | keyboards/ergodox_infinity/ergodox_infinity.c | 4 | ||||
| -rw-r--r-- | keyboards/ergodox_infinity/led.c | 2 | ||||
| -rw-r--r-- | keyboards/ergodox_infinity/matrix.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/ergodox_infinity/ergodox_infinity.c index c69c1eb36..a9962f96a 100644 --- a/keyboards/ergodox_infinity/ergodox_infinity.c +++ b/keyboards/ergodox_infinity/ergodox_infinity.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "ch.h" | 2 | #include <ch.h> |
| 3 | #include "hal.h" | 3 | #include <hal.h> |
| 4 | #include "serial_link/system/serial_link.h" | 4 | #include "serial_link/system/serial_link.h" |
| 5 | #ifdef VISUALIZER_ENABLE | 5 | #ifdef VISUALIZER_ENABLE |
| 6 | #include "lcd_backlight.h" | 6 | #include "lcd_backlight.h" |
diff --git a/keyboards/ergodox_infinity/led.c b/keyboards/ergodox_infinity/led.c index 8175c1c5c..0b50247d7 100644 --- a/keyboards/ergodox_infinity/led.c +++ b/keyboards/ergodox_infinity/led.c | |||
| @@ -15,7 +15,7 @@ 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/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include "hal.h" | 18 | #include <hal.h> |
| 19 | 19 | ||
| 20 | #include "led.h" | 20 | #include "led.h" |
| 21 | 21 | ||
diff --git a/keyboards/ergodox_infinity/matrix.c b/keyboards/ergodox_infinity/matrix.c index 941367a36..7baacd24d 100644 --- a/keyboards/ergodox_infinity/matrix.c +++ b/keyboards/ergodox_infinity/matrix.c | |||
| @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | #include <stdint.h> | 18 | #include <stdint.h> |
| 19 | #include <stdbool.h> | 19 | #include <stdbool.h> |
| 20 | #include <string.h> | 20 | #include <string.h> |
| 21 | #include "hal.h" | 21 | #include <hal.h> |
| 22 | #include "timer.h" | 22 | #include "timer.h" |
| 23 | #include "wait.h" | 23 | #include "wait.h" |
| 24 | #include "print.h" | 24 | #include "print.h" |
