Merge upstream master

3 files changed, 99 insertions, 0 deletions

diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
new file mode 100644
index 0000000000..d3b6ef0378
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
@@ -0,0 +1,38 @@
+#include "sweet16.h"
+
+enum layers {
+ num,
+ extra,
+ mouse
+};
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [num] = LAYOUT_numpad_4x4(
+        KC_P7,   KC_P8,  KC_P9,  LT(extra, KC_PPLS),
+        KC_P4,   KC_P5,  KC_P6,
+        KC_P1,   KC_P2,  KC_P3,  KC_PENT,
+             LT(mouse, KC_P0),      KC_DOT
+    ),
+
+ [extra] = LAYOUT_numpad_4x4(
+        KC_PSLS,   KC_PAST,  KC_PMNS,  KC_TRNS,
+        KC_BSPC,   KC_EXECUTE,  KC_DEL,
+        KC_LPRN,   KC_RPRN,  KC_PEQL,  KC_PENT,
+             KC_TAB,      KC_NUM
+    ),
+
+
+[mouse] = LAYOUT_numpad_4x4(
+        KC_WH_D,   KC_MS_U,  KC_WH_U,  LT(extra, KC_PPLS),
+        KC_MS_L,   KC_MS_D,  KC_MS_R,
+        KC_BTN1,   KC_BTN2,  KC_BTN3,  KC_PENT,
+             KC_TRNS,      KC_DOT
+    )
+
+
+
+
+};
+
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c
new file mode 100644
index 0000000000..05cdc0cfb6
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/keymaps/sebas/keymap.c
@@ -0,0 +1,23 @@
+#include QMK_KEYBOARD_H
+#define ALT TG(_FUNC)
+
+enum layers {
+ _KEYP,
+ _FUNC
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_KEYP]=LAYOUT_ortho_4x4(
+  KC_P7, KC_P8,   KC_P9,   ALT,
+  KC_P4, KC_P5,   KC_P6,   KC_PAST,
+  KC_P1, KC_P2,   KC_P3,   KC_PMNS,
+  KC_P0, KC_PDOT, KC_PENT, KC_PPLS
+),
+[_FUNC]=LAYOUT_ortho_4x4(
+  KC_MPRV, KC_MPLY, KC_MNXT, _______,
+  XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM,
+  KC_INS,  KC_HOME, KC_PGUP, XXXXXXX,
+  KC_DEL,  KC_END,  KC_PGDN, XXXXXXX
+)
+};
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
new file mode 100644
index 0000000000..b95287a7c2
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { D1, D0, D4, C6 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#ifndef CONVERT_TO_PROTON_C
+#    define LED_NUM_LOCK_PIN B0 // RXLED
+#    define LED_CAPS_LOCK_PIN D5 // TXLED
+#    define LED_PIN_ON_STATE 0
+#endif
+
+/* Underglow options */
+#define RGB_DI_PIN B1
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 1
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif