diff options
| author | QMK Bot <hello@qmk.fm> | 2023-03-26 22:56:50 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-03-26 22:56:50 +0000 |
| commit | 66d56a948043c6acce7ba14ff96b61551f0b8939 (patch) | |
| tree | 06dddc97df92a18faaccc14137e6f2561d78c768 /keyboards/tzarc/djinn | |
| parent | 36ce81df592ca8e9f9fed498e513437aa1cae54f (diff) | |
| parent | 3ee17cd5d3a9f04ea2775e7228cea0064f9d0b2b (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/tzarc/djinn')
| -rw-r--r-- | keyboards/tzarc/djinn/djinn_portscan_matrix.c | 2 | ||||
| -rw-r--r-- | keyboards/tzarc/djinn/djinn_usbpd.c | 2 | ||||
| -rw-r--r-- | keyboards/tzarc/djinn/keymaps/default/config.h | 4 | ||||
| -rw-r--r-- | keyboards/tzarc/djinn/keymaps/via/config.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c index 6fcfd48bba..cb73c47def 100644 --- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c +++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c @@ -114,4 +114,4 @@ void matrix_wait_for_interrupt(void) { writePinHigh(col_pins[i]); setPinInputHigh(col_pins[i]); } -}
\ No newline at end of file +} diff --git a/keyboards/tzarc/djinn/djinn_usbpd.c b/keyboards/tzarc/djinn/djinn_usbpd.c index b0bf166b7c..7a56f92b8e 100644 --- a/keyboards/tzarc/djinn/djinn_usbpd.c +++ b/keyboards/tzarc/djinn/djinn_usbpd.c @@ -25,4 +25,4 @@ void usbpd_update(void) { kb_state.current_setting = allowance; } } -}
\ No newline at end of file +} diff --git a/keyboards/tzarc/djinn/keymaps/default/config.h b/keyboards/tzarc/djinn/keymaps/default/config.h index b40936ff93..9ba29d4cf3 100644 --- a/keyboards/tzarc/djinn/keymaps/default/config.h +++ b/keyboards/tzarc/djinn/keymaps/default/config.h @@ -3,7 +3,7 @@ #pragma once // Uncomment the following if your board uses 1.5A and 3.0A hold current fuses. -//#define DJINN_SUPPORTS_3A_FUSE +// #define DJINN_SUPPORTS_3A_FUSE // Encoder settings #define ENCODER_RESOLUTION 2 @@ -60,4 +60,4 @@ #define ENABLE_RGB_MATRIX_SPLASH #define ENABLE_RGB_MATRIX_MULTISPLASH #define ENABLE_RGB_MATRIX_SOLID_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
\ No newline at end of file +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH diff --git a/keyboards/tzarc/djinn/keymaps/via/config.h b/keyboards/tzarc/djinn/keymaps/via/config.h index b40936ff93..9ba29d4cf3 100644 --- a/keyboards/tzarc/djinn/keymaps/via/config.h +++ b/keyboards/tzarc/djinn/keymaps/via/config.h @@ -3,7 +3,7 @@ #pragma once // Uncomment the following if your board uses 1.5A and 3.0A hold current fuses. -//#define DJINN_SUPPORTS_3A_FUSE +// #define DJINN_SUPPORTS_3A_FUSE // Encoder settings #define ENCODER_RESOLUTION 2 @@ -60,4 +60,4 @@ #define ENABLE_RGB_MATRIX_SPLASH #define ENABLE_RGB_MATRIX_MULTISPLASH #define ENABLE_RGB_MATRIX_SOLID_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
\ No newline at end of file +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH |