summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-16 05:21:50 +0000
committerQMK Bot <hello@qmk.fm>2022-07-16 05:21:50 +0000
commitabdca8847d5ef6560548c832ef826ced4fbc59fe (patch)
treeab039c5d7ed46cad396f49f2366c1c375c381fca
parentc84f68d4c864d290a48a100411d944dc268fca19 (diff)
parent1f93485aef68fb96b2b141d8d95ecb88986bc55e (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c2
-rw-r--r--keyboards/keebwerk/nano_slider/keymaps/via/keymap.c67
-rw-r--r--keyboards/keebwerk/nano_slider/keymaps/via/rules.mk1
3 files changed, 69 insertions, 1 deletions
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
index 0623f7556c..783790f020 100644
--- a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
+++ b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
@@ -41,7 +41,7 @@ uint8_t midi2vol = 0x3E;
enum custom_layers {
_MEDIA, /* Controls Pause, Mute , Forward ... */
_NAV, /* Nav arrows, Enter, Space*/
- _VOLUME /* Changes midi2vol int to interface with midi2vol program: Chrome Volume, General Volume */
+ _VOLUME, /* Changes midi2vol int to interface with midi2vol program: Chrome Volume, General Volume */
_DISCORD, /* FXX unsused keys to interface with Discord: Mute , Silence */
_LIGHTS, /* Edits underglow and retroilumination */
_EDIT, /* Cut, Copy ,Paste */
diff --git a/keyboards/keebwerk/nano_slider/keymaps/via/keymap.c b/keyboards/keebwerk/nano_slider/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ea1faadfda
--- /dev/null
+++ b/keyboards/keebwerk/nano_slider/keymaps/via/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2020 Duckle
+ *
+ * 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
+#include "analog.h"
+#include "qmk_midi.h"
+
+enum layer_names {
+ _BASE,
+ _FN,
+ _MEDIA,
+ _FN2
+};
+
+/* Defines the keycodes used by our macros in process_record_user */
+enum custom_keycodes { /* In order to add more volume controls, add here a custom keycode, ex: VLC */
+ DEFAULT= SAFE_RANGE,SPOTIFY,DISCORD,CHROME/*,VLC*/
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base */
+ [_BASE] = LAYOUT(
+ TO(_FN),
+ KC_1, KC_2, KC_3,
+ KC_4, KC_5, KC_6, KC_0
+ ),
+ [_FN] = LAYOUT(
+ TO(_MEDIA),
+ RGB_TOG, RGB_MOD, RGB_VAI,
+ RGB_SAI, BL_BRTG, BL_STEP, KC_LSFT
+ ),
+ [_MEDIA] = LAYOUT(
+ TO(_BASE),
+ KC_VOLD, KC_VOLU, KC_F24,
+ KC_MRWD, KC_MFFD, KC_F23, KC_MPLY
+ ),
+ [_FN2] = LAYOUT(
+ _______,
+ _______, _______, _______,
+ _______, _______, _______, _______
+ )
+};
+
+uint8_t divisor = 0;
+
+void slider(void) {
+ if (divisor++) { // only run the slider function 1/256 times it's called
+ return;
+ }
+
+ midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3));
+}
+
+void matrix_scan_user(void) {
+ slider();
+}
diff --git a/keyboards/keebwerk/nano_slider/keymaps/via/rules.mk b/keyboards/keebwerk/nano_slider/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/keebwerk/nano_slider/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes \ No newline at end of file