From 9160405d39d82ba787bac07ab569aa74d86d5082 Mon Sep 17 00:00:00 2001 From: skullydazed Date: Wed, 23 Oct 2019 21:14:00 -0700 Subject: Support for the upcoming 1UP Keyboards Sweet 16 rev2 (#7125) * Support for the upcoming 1up Keyboards Sweet 16 rev2 * Update keyboards/1upkeyboards/sweet16/rev1/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev1/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev2/promicro/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev2/proton_c/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/readme.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rev1.c Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rules.mk Co-Authored-By: fauxpark * Update keyboards/1upkeyboards/sweet16/rev1/rules.mk Co-Authored-By: Drashna Jaelre * Update keyboards/1upkeyboards/sweet16/rev2/promicro/rules.mk Co-Authored-By: Drashna Jaelre * tweak readme wording per @noroadsleft * Change rev to V * remove extraneous info.json files --- .../1upkeyboards/sweet16/v2/promicro/config.h | 31 ++++++++++++++++++++++ .../1upkeyboards/sweet16/v2/promicro/promicro.c | 8 ++++++ .../1upkeyboards/sweet16/v2/promicro/promicro.h | 30 +++++++++++++++++++++ .../1upkeyboards/sweet16/v2/promicro/readme.md | 13 +++++++++ .../1upkeyboards/sweet16/v2/promicro/rules.mk | 10 +++++++ .../1upkeyboards/sweet16/v2/proton_c/config.h | 20 ++++++++++++++ .../1upkeyboards/sweet16/v2/proton_c/proton_c.c | 1 + .../1upkeyboards/sweet16/v2/proton_c/proton_c.h | 30 +++++++++++++++++++++ .../1upkeyboards/sweet16/v2/proton_c/readme.md | 13 +++++++++ .../1upkeyboards/sweet16/v2/proton_c/rules.mk | 6 +++++ 10 files changed, 162 insertions(+) create mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/config.h create mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c create mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h create mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/readme.md create mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk create mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/config.h create mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c create mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h create mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md create mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk (limited to 'keyboards/1upkeyboards/sweet16/v2') diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h new file mode 100644 index 000000000..bd50b6960 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h @@ -0,0 +1,31 @@ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define PRODUCT_ID 0x2011 +#define DEVICE_VER 0x0001 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { D4, D1, E6, B5 } +#define MATRIX_COL_PINS { F7, F6, D2, D3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION ROW2COL + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Encoder pins */ +#define ENCODERS_PAD_A { F4 } +#define ENCODERS_PAD_B { F5 } +#define ENCODER_RESOLUTION 4 + +/* Underglow options */ +#define RGB_DI_PIN F4 +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 1 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c new file mode 100644 index 000000000..0176dc1a3 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c @@ -0,0 +1,8 @@ +#include "promicro.h" +#include "encoder.h" + +#ifdef ENCODER_ENABLED +void encoder_update_kb(int8_t index, bool clockwise) { + encoder_update_user(index, clockwise); +} +#endif diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h new file mode 100644 index 000000000..7320ccd9e --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h @@ -0,0 +1,30 @@ +#pragma once + +#include "quantum.h" + +// Any changes to the layout names and/or definitions must also be made to info.json + +#define LAYOUT_ortho_4x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, K23 }, \ + { K30, K31, K32, K33 } \ +} + +#define LAYOUT_numpad_4x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, \ + K20, K21, K22, K23, \ + K31, K32 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, KC_NO }, \ + { K20, K21, K22, K23 }, \ + { KC_NO, K31, K32, KC_NO } \ +} + diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md b/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md new file mode 100644 index 000000000..584b44651 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md @@ -0,0 +1,13 @@ +# Sweet16 V2 (Pro Micro) + +A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard + +* Keyboard Maintainer: skullydazed +* Hardware Supported: Sweet16 V2 PCB, Pro Micro +* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/) + +Make example for this keyboard (after setting up your build environment): + + make 1upkeyboards/sweet16/v2/promicro:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk b/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk new file mode 100644 index 000000000..4b08a7e6b --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk @@ -0,0 +1,10 @@ +MCU = atmega32u4 +BOOTLOADER = caterina +LINK_TIME_OPTIMIZATION_ENABLE=yes + +## Features +CONSOLE_ENABLE = yes + +## On a Pro Micro you have to choose between underglow and the rotary encoder. +RGBLIGHT_ENABLE = no +ENCODER_ENABLE = yes diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h new file mode 100644 index 000000000..6f27f0b62 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h @@ -0,0 +1,20 @@ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define PRODUCT_ID 0x2011 +#define DEVICE_VER 0x0001 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { B5, B7, B2, B0 } +#define MATRIX_COL_PINS { B8, A0, A10, A9 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION ROW2COL + +/* Encoder pins */ +#define ENCODERS_PAD_A { A2 } +#define ENCODERS_PAD_B { A1 } +#define ENCODER_RESOLUTION 4 diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c new file mode 100644 index 000000000..b08e33e81 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c @@ -0,0 +1 @@ +#include "proton_c.h" diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h new file mode 100644 index 000000000..7320ccd9e --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h @@ -0,0 +1,30 @@ +#pragma once + +#include "quantum.h" + +// Any changes to the layout names and/or definitions must also be made to info.json + +#define LAYOUT_ortho_4x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, K23 }, \ + { K30, K31, K32, K33 } \ +} + +#define LAYOUT_numpad_4x4( \ + K00, K01, K02, K03, \ + K10, K11, K12, \ + K20, K21, K22, K23, \ + K31, K32 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, KC_NO }, \ + { K20, K21, K22, K23 }, \ + { KC_NO, K31, K32, KC_NO } \ +} + diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md b/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md new file mode 100644 index 000000000..6806cc573 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md @@ -0,0 +1,13 @@ +# Sweet16 V2 (Proton C) + +A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard + +* Keyboard Maintainer: skullydazed +* Hardware Supported: Sweet16 V2 PCB, Proton C +* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/) + +Make example for this keyboard (after setting up your build environment): + + make 1upkeyboards/sweet16/v2/proton_c:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk b/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk new file mode 100644 index 000000000..3bfa1623f --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk @@ -0,0 +1,6 @@ +MCU = STM32F303 + +## Features +CONSOLE_ENABLE = yes +ENCODER_ENABLE = yes +AUDIO_ENABLE = yes -- cgit v1.2.3