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

keyboards/planck/keymaps/lja83/config.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4

keyboards/planck/keymaps/lja83/readme.md

@@ -0,0 +1,2 @@
+# LJA83 Planck Layout
+

keyboards/planck/keymaps/lja83/rules.mk

@@ -0,0 +1 @@
+SRC += muse.c