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

2021-03-15 01:19:36 +00:00
parent 35db567c9c 0779c34db8
commit 998c58e89b
11 changed files with 395 additions and 3 deletions
@@ -1 +1,2 @@
-VIA_ENABLE = yes
+VIA_ENABLE = yes
+LEADER_ENABLE = no
@@ -121,3 +121,5 @@
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
+
+#define VIA_HAS_BROKEN_KEYCODES
@@ -47,5 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define RGBLIGHT_ANIMATIONS             // Run RGB animations


+#define VIA_HAS_BROKEN_KEYCODES


@@ -99,3 +99,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define ENCODERS_PAD_B { F7 }

 #define ENCODER_RESOLUTION 4
+
+#define VIA_HAS_BROKEN_KEYCODES
@@ -23,4 +23,6 @@

 #define AdafruitBleResetPin D4
 #define AdafruitBleCSPin B4
-#define AdafruitBleIRQPin E6
+#define AdafruitBleIRQPin E6
+
+#define VIA_HAS_BROKEN_KEYCODES
@@ -69,3 +69,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AdafruitBleCSPin    B4
 #define AdafruitBleIRQPin   E6
 #define BATTERY_LEVEL_PIN   B6
+
+#define VIA_HAS_BROKEN_KEYCODES
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
+LTO_ENABLE = yes
+KEY_LOCK_ENABLE = no
@@ -332,7 +332,11 @@ enum quantum_keycodes {

    MIDI_VELOCITY_MIN,
    MI_VEL_0 = MIDI_VELOCITY_MIN,
+#ifdef VIA_ENABLE
+    MI_VEL_1 = MIDI_VELOCITY_MIN,
+#else
    MI_VEL_1,
+#endif
    MI_VEL_2,
    MI_VEL_3,
    MI_VEL_4,
@@ -46,6 +46,7 @@
 #include "dynamic_keymap.h"
 #include "tmk_core/common/eeprom.h"
 #include "version.h"  // for QMK_BUILDDATE used in EEPROM magic
+#include "via_ensure_keycode.h"

 // Forward declare some helpers.
 #if defined(VIA_QMK_BACKLIGHT_ENABLE)
@@ -524,7 +524,11 @@ enum internal_special_keycodes {

 enum mouse_keys {
    /* Mouse Buttons */
+#ifdef VIA_ENABLE
+    KC_MS_UP = 0xF0,
+#else
    KC_MS_UP = 0xED,
+#endif
    KC_MS_DOWN,
    KC_MS_LEFT,
    KC_MS_RIGHT,  // 0xF0
@@ -533,9 +537,15 @@ enum mouse_keys {
    KC_MS_BTN3,
    KC_MS_BTN4,
    KC_MS_BTN5,
+#ifdef VIA_ENABLE
+    KC_MS_BTN6 = KC_MS_BTN5,
+    KC_MS_BTN7 = KC_MS_BTN5,
+    KC_MS_BTN8 = KC_MS_BTN5,
+#else
    KC_MS_BTN6,
    KC_MS_BTN7,
    KC_MS_BTN8,
+#endif

    /* Mouse Wheel */
    KC_MS_WH_UP,