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

Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py

tmk_core/common/bootmagic_lite.c

@@ -1,7 +1,5 @@
 #include "quantum.h"
 
-bool is_keyboard_left(void);
-
 /** \brief Reset eeprom
  *
  * ...just incase someone wants to only change the eeprom behaviour
@@ -48,4 +46,4 @@ __attribute__((weak)) void bootmagic_lite(void) {
         // Jump to bootloader.
         bootloader_jump();
     }
-}
+}

tmk_core/common/keyboard.c

@@ -222,6 +222,12 @@ void keyboard_setup(void) {
  */
 __attribute__((weak)) bool is_keyboard_master(void) { return true; }
 
+/** \brief is_keyboard_left
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) bool is_keyboard_left(void) { return true; }
+
 /** \brief should_process_keypress
  *
  * Override this function if you have a condition where keypresses processing should change:

tmk_core/common/keyboard.h

@@ -63,6 +63,8 @@ void keyboard_task(void);
 void keyboard_set_leds(uint8_t leds);
 /* it runs whenever code has to behave differently on a slave */
 bool is_keyboard_master(void);
+/* it runs whenever code has to behave differently on left vs right split */
+bool is_keyboard_left(void);
 
 void keyboard_pre_init_kb(void);
 void keyboard_pre_init_user(void);

tmk_core/common/led.h

@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef LED_H
-#define LED_H
+#pragma once
+
 #include "stdint.h"
 #include "stdbool.h"
 
@@ -52,5 +52,3 @@ void led_init_ports(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif

tmk_core/protocol/arm_atsam/led_matrix.c

@@ -311,9 +311,11 @@ void led_matrix_indicators(void) {
                 (led_map[i].scan == USB_LED_KANA_SCANCODE && (kbled & (1 << USB_LED_KANA))) ||
 #endif  // KANA
                 (0)) {
-                led_buffer[i].r = 255 - led_buffer[i].r;
-                led_buffer[i].g = 255 - led_buffer[i].g;
-                led_buffer[i].b = 255 - led_buffer[i].b;
+                if (rgb_matrix_get_flags() & LED_FLAG_INDICATOR) {
+                    led_buffer[i].r = 255 - led_buffer[i].r;
+                    led_buffer[i].g = 255 - led_buffer[i].g;
+                    led_buffer[i].b = 255 - led_buffer[i].b;
+                }
             }
         }
     }