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

keyboards/nightly_boards/octopadplus/keymaps/via/keymap.c

@@ -0,0 +1,54 @@
+/* Copyright 2022 DeskDaily
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+		 KC_MUTE,                      KC_MYCM,
+		 KC_Q,     KC_W,     KC_E,     KC_R,
+		 KC_A,     KC_S,     KC_D,     KC_F
+		
+    ),
+	[1] = LAYOUT(
+		KC_TRNS,                     KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+		
+    ),
+	[2] = LAYOUT(
+		KC_TRNS,                     KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+		
+    ),
+	[3] = LAYOUT(
+		KC_TRNS,                     KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
+		
+    ),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
+    [1] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [2] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] =   { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+	};
+#endif

keyboards/nightly_boards/octopadplus/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes