diff options
Diffstat (limited to 'keyboards/preonic')
-rw-r--r-- | keyboards/preonic/rev1/keyboard.json (renamed from keyboards/preonic/rev1/info.json) | 13 | ||||
-rw-r--r-- | keyboards/preonic/rev1/rules.mk | 14 | ||||
-rw-r--r-- | keyboards/preonic/rev2/keyboard.json (renamed from keyboards/preonic/rev2/info.json) | 13 | ||||
-rw-r--r-- | keyboards/preonic/rev2/rules.mk | 14 | ||||
-rw-r--r-- | keyboards/preonic/rev3/config.h | 4 | ||||
-rw-r--r-- | keyboards/preonic/rev3/keyboard.json (renamed from keyboards/preonic/rev3/info.json) | 12 | ||||
-rw-r--r-- | keyboards/preonic/rev3/rules.mk | 18 | ||||
-rw-r--r-- | keyboards/preonic/rev3_drop/config.h | 4 | ||||
-rw-r--r-- | keyboards/preonic/rev3_drop/matrix.c | 5 |
9 files changed, 46 insertions, 51 deletions
diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/keyboard.json index e25c41d9b0..aa43fe2c47 100644 --- a/keyboards/preonic/rev1/info.json +++ b/keyboards/preonic/rev1/keyboard.json @@ -6,6 +6,19 @@ "pid": "0x67F3", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev1/rules.mk b/keyboards/preonic/rev1/rules.mk deleted file mode 100644 index 5700acd66c..0000000000 --- a/keyboards/preonic/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -LTO_ENABLE = yes diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/keyboard.json index 8f644f8f6c..3a6cab1e17 100644 --- a/keyboards/preonic/rev2/info.json +++ b/keyboards/preonic/rev2/keyboard.json @@ -6,6 +6,19 @@ "pid": "0x67F3", "device_version": "0.0.2" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "backlight": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev2/rules.mk b/keyboards/preonic/rev2/rules.mk deleted file mode 100644 index 0404fb325a..0000000000 --- a/keyboards/preonic/rev2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -LTO_ENABLE = yes diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index 7800131a90..6a842105b2 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -44,5 +44,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/keyboard.json index 6112699cfa..472229c0da 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/keyboard.json @@ -28,6 +28,18 @@ "rgb_matrix": { "driver": "ws2812" }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"] diff --git a/keyboards/preonic/rev3/rules.mk b/keyboards/preonic/rev3/rules.mk deleted file mode 100644 index 6836d19541..0000000000 --- a/keyboards/preonic/rev3/rules.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE -RGB_MATRIX_ENABLE = no - -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h index 7800131a90..6a842105b2 100644 --- a/keyboards/preonic/rev3_drop/config.h +++ b/keyboards/preonic/rev3_drop/config.h @@ -44,5 +44,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c index 60718caaba..1d9ab5e811 100644 --- a/keyboards/preonic/rev3_drop/matrix.c +++ b/keyboards/preonic/rev3_drop/matrix.c @@ -15,7 +15,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "quantum.h" +#include "matrix.h" +#include "debug.h" +#include "timer.h" +#include "wait.h" #ifndef DEBOUNCE # define DEBOUNCE 5 |