Merge remote-tracking branch 'origin/master' into develop

6 files changed, 148 insertions, 0 deletions

diff --git a/keyboards/tweetydabird/lbs6/config.h b/keyboards/tweetydabird/lbs6/config.h
new file mode 100644
index 0000000000..ed8d2caa5b
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/config.h
@@ -0,0 +1,10 @@
+// Copyright 2022 Markus Knutsson (@TweetyDaBird)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include "config_common.h"
+
+// Bootmagic Lite key configuration
+// Not yet supported in info.json ?
+#define BOOTMAGIC_LITE_ROW 2
+#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json
new file mode 100644
index 0000000000..ac1b574220
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/info.json
@@ -0,0 +1,76 @@
+{
+	"keyboard_name": "Little Big Scroll 6",
+	"manufacturer": "Tweetys Wild Thinking",
+	"url": "https://lectronz.com/stores/tweetys-wild-thinking",
+	"maintainer": "TweetyDaBird",	
+	
+	"development_board": "promicro",
+	
+	"features": {
+		"bootmagic": true,
+		"command": false,
+		"console": false,
+		"extrakey": true,
+		"mousekey": true,
+		"nkro": false,
+		"rgblight": true,
+		"encoder": true
+	},
+
+  "build": {
+    "lto": true
+  },
+
+	"usb": {
+		"vid": "0xFEED",
+        "pid": "0x23B0",
+		"device_version": "1.1.0"
+	},
+	
+	"debounce": 5,
+	
+	"matrix_pins": {
+        "direct": [
+			[null, "F5", null],
+            ["D4", "D7", "B4"],
+			["C6", "E6", "B5"]
+        ]
+    },
+
+	"encoder": {
+        "rotary": [
+            { "pin_a": "F7", "pin_b": "F6", "resolution": 2 }
+        ]
+    },
+
+	"rgblight": {
+        "led_count": 8,
+        "pin": "D2",
+        "hue_steps": 8,
+        "saturation_steps": 17,
+        "brightness_steps": 17,
+		"max_brightness": 200,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "rainbow_mood": true,
+            "static_gradient": true,
+        }
+    },
+	
+	"layouts": {
+        "LAYOUT": {
+            "layout": [	
+			{ "label": "Play", 	"matrix": [0, 1], "x": 1, "y": 0, "w": 1, "h": 1 }, 
+			
+			{ "label": "F1", 	"matrix": [1, 0], "x": 0, "y": 1, "w": 1, "h": 1 }, 
+			{ "label": "F2", 	"matrix": [1, 1], "x": 1, "y": 1, "w": 1, "h": 1 }, 
+			{ "label": "F3", 	"matrix": [1, 2], "x": 2, "y": 1, "w": 1, "h": 1 },
+			
+			{ "label": "F4", 	"matrix": [2, 0], "x": 0, "y": 2, "w": 1, "h": 1 },
+			{ "label": "F5", 	"matrix": [2, 1], "x": 1, "y": 2, "w": 1, "h": 1 },
+			{ "label": "F6", 	"matrix": [2, 2], "x": 2, "y": 2, "w": 1, "h": 1 },
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs6/keymaps/default/keymap.c b/keyboards/tweetydabird/lbs6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..590cb8ea0b
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2022 Markus Knutsson (@TweetyDaBird)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT(
+        KC_MPLY,	
+		RGB_MOD,	RGB_VAI,	RGB_TOG,
+		KC_MPRV,	KC_MPLY,	KC_MNXT
+		
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } 
+    return false;
+}
diff --git a/keyboards/tweetydabird/lbs6/keymaps/default/readme.md b/keyboards/tweetydabird/lbs6/keymaps/default/readme.md
new file mode 100644
index 0000000000..22c4296f55
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# The default keymap for LBS6
+
+This is a very basic layout using LBS6 as media playback buttons. 
diff --git a/keyboards/tweetydabird/lbs6/readme.md b/keyboards/tweetydabird/lbs6/readme.md
new file mode 100644
index 0000000000..2301cc3c56
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/readme.md
@@ -0,0 +1,28 @@
+# lsb6
+
+
+*A simple 6-key macro pad with a clickable scrollwheel, for media controls and whatever else you can imagine.*
+
+* Keyboard Maintainer: [Markus Knutsson](https://github.com/TweetyDaBird/)
+* Hardware Supported: LBS6 PCB plus Pro Micro or pin compatible
+* Hardware Availability: https://lectronz.com/stores/tweetys-wild-thinking
+* Hardware Design: https://github.com/TweetyDaBird/Little-Big-Scroll
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tweetydabird/lbs6:default
+
+Flashing example for this keyboard:
+
+    make tweetydabird/lbs6:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the bottom right key and plug in the keyboard
+* **Physical reset**: Briefly short the marked pads on PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if mapped (not in default keymap)
\ No newline at end of file
diff --git a/keyboards/tweetydabird/lbs6/rules.mk b/keyboards/tweetydabird/lbs6/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/tweetydabird/lbs6/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file