Merge remote-tracking branch 'qmk/develop' into develop

* qmk/develop: [Keyboard] temporary fix for SpiderIsland 78 (qmk#14935) (qmk#14941) Fix Typo in documentation (qmk#14942) Begin to carve out platform/protocol API - Migrate keyboard_* calls (qmk#14888) Tidy up ADNS9800 and PMW3360 firmware blobs (qmk#14936) Align usbasp flashing behaviour (qmk#14928) [Keymap] Add logo to riblee userspace (qmk#14875) [Docs] Add default case to tap dance example 5. (qmk#14893) [Keymap] Add Gergoplex keymap (qmk#14768) [Keymap] Simplify unicode input mode change and CTRL and GUI swapping (qmk#14874) Reformat iris keymap antonlindstrom to be a bit more readable and consistent (qmk#14902) [Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR (qmk#14880) Corrected keyboard layout which was causing issue in QMK configurator (qmk#14891) [Keyboard] Update encoder callback on Evolv75 (qmk#14757) [Keyboard] Add MW75 support (qmk#14833) Remove legacy handling for ErgoDox Infinity handedness (qmk#14919) Check usb transmit status in send_extra() (qmk#14643)
cadusk · Oct 25, 2021 · 5176851 · 5176851
2 parents 2c85296 + c97539e
commit 5176851
Show file tree

Hide file tree

Showing 58 changed files with 1,301 additions and 3,493 deletions.
diff --git a/build_keyboard.mk b/build_keyboard.mk
@@ -32,20 +32,6 @@ endif
 #     this an empty or blank macro!
 KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
 
-# For split boards we need to set a master half.
-MASTER ?= left
-ifdef master
-    MASTER = $(master)
-endif
-
-ifeq ($(MASTER),right)
-    OPT_DEFS += -DMASTER_IS_ON_RIGHT
-else
-    ifneq ($(MASTER),left)
-$(error MASTER does not have a valid value(left/right))
-    endif
-endif
-
 ifdef SKIP_VERSION
     OPT_DEFS += -DSKIP_VERSION
 endif

diff --git a/docs/cli_tab_complete.md b/docs/cli_tab_complete.md
@@ -18,7 +18,7 @@ If you put `qmk_firmware` into another location you will need to adjust this pat
 
 If you want the tab completion available to all users of the system you can add a symlink to the `qmk_tab_complete.sh` script:
 
-    `ln -s ~/qmk_firmware/util/qmk_tab_complete.sh /etc/profile.d/qmk_tab_complete.sh`
+    ln -s ~/qmk_firmware/util/qmk_tab_complete.sh /etc/profile.d/qmk_tab_complete.sh
 
 ### System Wide Copy
 

diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
@@ -393,6 +393,9 @@ void altlp_finished(qk_tap_dance_state_t *state, void *user_data) {
         case TD_DOUBLE_SINGLE_TAP: // Allow nesting of 2 parens `((` within tapping term
             tap_code16(KC_LPRN);
             register_code16(KC_LPRN);
+            break;
+        default:
+            break;
     }
 }
 
@@ -406,6 +409,9 @@ void altlp_reset(qk_tap_dance_state_t *state, void *user_data) {
             break;
         case TD_DOUBLE_SINGLE_TAP:
             unregister_code16(KC_LPRN);
+            break;
+        default:
+            break;
     }
 }
 

diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
@@ -78,8 +78,7 @@
 #define US_BEFORE_MOTION 100
 #define MSB1 0x80
 
-extern const uint16_t adns_firmware_length;
-extern const uint8_t adns_firmware_data[];
+extern const uint8_t firmware_data[];
 
 void adns_spi_start(void){
     spi_start(SPI_SS_PIN, false, SPI_MODE, SPI_DIVISOR);
@@ -145,8 +144,8 @@ void adns_init() {
 
     // send all bytes of the firmware
     unsigned char c;
-    for(int i = 0; i < adns_firmware_length; i++){
-        c = (unsigned char)pgm_read_byte(adns_firmware_data + i);
+    for(int i = 0; i < FIRMWARE_LENGTH; i++){
+        c = (unsigned char)pgm_read_byte(firmware_data + i);
         spi_write(c);
         wait_us(15);
     }