Run the python tests inside docker

* Replace spaces with tab in docker_build.sh

* Use errcho instead of echo >&2

bin/qmk

@@ -94,4 +94,10 @@ else:
         exit(1)
 
 if __name__ == '__main__':
-    milc.cli()
+    return_code = milc.cli()
+    if return_code is False:
+        exit(1)
+    elif return_code is not True and isinstance(return_code, int) and return_code < 256:
+        exit(return_code)
+    else:
+        exit(0)

docs/config_options.md

@@ -91,8 +91,10 @@ This is a C header file that is one of the first things included, and will persi
   * tries to keep switch state consistent with keyboard LED state
 * `#define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)`
   * key combination that allows the use of magic commands (useful for debugging)
-* `#define USB_MAX_POWER_CONSUMPTION`
+* `#define USB_MAX_POWER_CONSUMPTION 500`
   * sets the maximum power (in mA) over USB for the device (default: 500)
+* `#define USB_POLLING_INTERVAL_MS 10`
+  * sets the USB polling rate in milliseconds for the keyboard, mouse, and shared (NKRO/media keys) interfaces
 * `#define F_SCL 100000L`
   * sets the I2C clock rate speed for keyboards using I2C. The default is `400000L`, except for keyboards using `split_common`, where the default is `100000L`.
 

keyboards/handwired/onekey/pytest/config.h

@@ -0,0 +1,23 @@
+/* Copyright 2019
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define MATRIX_COL_PINS { A3 }
+#define MATRIX_ROW_PINS { A2 }
+#define UNUSED_PINS

keyboards/handwired/onekey/pytest/readme.md

@@ -0,0 +1,3 @@
+# PyTest onekey
+
+This is used by the python test framework. It's probably not useful otherwise.

keyboards/handwired/onekey/pytest/rules.mk

@@ -0,0 +1,2 @@
+# MCU name
+MCU = STM32F303

keyboards/handwired/onekey/pytest/templates/keymap.c

@@ -0,0 +1 @@
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};

keyboards/keebio/iris/iris.h

@@ -6,8 +6,10 @@
     #include "rev1_led.h"
 #elif KEYBOARD_keebio_iris_rev2
     #include "rev2.h"
-#else
+#elif KEYBOARD_keebio_iris_rev3
     #include "rev3.h"
+#elif KEYBOARD_keebio_iris_rev4
+    #include "rev4.h"
 #endif
 
 #include "quantum.h"

keyboards/keebio/iris/keymaps/default/keymap.c

@@ -112,3 +112,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+}

keyboards/keebio/iris/rev4/config.h

@@ -0,0 +1,95 @@
+/*
+Copyright 2019 Danny Nguyen <danny@keeb.io>
+
+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/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCB10
+#define PRODUCT_ID      0x1256
+#define DEVICE_VER      0x0400
+#define MANUFACTURER    Keebio
+#define PRODUCT         Iris Keyboard
+#define DESCRIPTION     Split 50 percent ergonomic keyboard
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { B1, F0, F5, F6, F7 }
+#define MATRIX_COL_PINS { F1, F4, D3, D2, B7, D4 }
+#define MATRIX_ROW_PINS_RIGHT { B1, B2, D2, F1, F4 }
+#define MATRIX_COL_PINS_RIGHT { D4, D7, D3, B7, F0, B3 }
+#define SPLIT_HAND_PIN D5
+#define QMK_ESC_OUTPUT F1
+#define QMK_ESC_INPUT B1
+#define QMK_LED B0
+#define QMK_SPEAKER C6
+
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B3 }
+#define ENCODERS_PAD_A_RIGHT { F7 }
+#define ENCODERS_PAD_B_RIGHT { F6 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+// #define BACKLIGHT_LEVELS 3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define BACKLIGHT_PIN B5
+#define BACKLIGHT_LEVELS 5
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D6
+#define RGBLED_NUM 12    // Number of LEDs
+#define RGBLED_SPLIT { 6, 6 }
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+
+// EEPROM usage
+
+// TODO: refactor with new user EEPROM code (coming soon)
+#define EEPROM_MAGIC 0x451F
+#define EEPROM_MAGIC_ADDR 34
+// Bump this every time we change what we store
+// This will automatically reset the EEPROM with defaults
+// and avoid loading invalid data from the EEPROM
+#define EEPROM_VERSION 0x08
+#define EEPROM_VERSION_ADDR 36
+
+// Dynamic keymap starts after EEPROM version
+#define DYNAMIC_KEYMAP_EEPROM_ADDR 37
+// Dynamic macro starts after dynamic keymaps (37+(4*10*6*2)) = (37+480)
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 517
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 507    // 1024-DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR
+#define DYNAMIC_KEYMAP_MACRO_COUNT 16

keyboards/keebio/iris/rev4/rev4.c

@@ -0,0 +1 @@
+#include "rev4.h"

keyboards/keebio/iris/rev4/rev4.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include "iris.h"
+#include "quantum.h"
+
+
+#ifdef USE_I2C
+#include <stddef.h>
+#ifdef __AVR__
+    #include <avr/io.h>
+    #include <avr/interrupt.h>
+#endif
+#endif
+
+#define LAYOUT( \
+    LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
+    LB1, LB2, LB3, LB4, LB5, LB6,           RB6, RB5, RB4, RB3, RB2, RB1, \
+    LC1, LC2, LC3, LC4, LC5, LC6,           RC6, RC5, RC4, RC3, RC2, RC1, \
+    LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \
+                        LE3, LE4, LE5, RE5, RE4, RE3 \
+    ) \
+    { \
+        { LA1, LA2, LA3, LA4, LA5, LA6 }, \
+        { LB1, LB2, LB3, LB4, LB5, LB6 }, \
+        { LC1, LC2, LC3, LC4, LC5, LC6 }, \
+        { LD1, LD2, LD3, LD4, LD5, LD6 }, \
+        { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \
+        { RA1, RA2, RA3, RA4, RA5, RA6 }, \
+        { RB1, RB2, RB3, RB4, RB5, RB6 }, \
+        { RC1, RC2, RC3, RC4, RC5, RC6 }, \
+        { RD1, RD2, RD3, RD4, RD5, RD6 }, \
+        { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \
+    }

keyboards/keebio/iris/rev4/rules.mk

@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = yes
+BACKLIGHT_ENABLE = yes
+ENCODER_ENABLE = yes

keyboards/keebio/iris/rules.mk

@@ -9,6 +9,8 @@ F_USB = $(F_CPU)
 #     automatically (+60). See bootloader.mk for all options.
 ifneq (, $(findstring rev3, $(KEYBOARD)))
     BOOTLOADER = qmk-dfu
+else ifneq (, $(findstring rev4, $(KEYBOARD)))
+    BOOTLOADER = qmk-dfu
 else
     BOOTLOADER = caterina
 endif
@@ -24,8 +26,8 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls

keyboards/planck/keymaps/default/keymap.c

@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------
  * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|

keyboards/playkbtw/ca66/ca66.c

@@ -1,30 +1,12 @@
 #include "ca66.h"
-#include "config.h"
 
-void bootmagic_lite(void)
-{
-	// The lite version of TMK's bootmagic.
-	// 100% less potential for accidentally making the
-	// keyboard do stupid things.
+void led_set_kb(uint8_t usb_led) {
+	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    writePinHigh(D1);
+  } else {
+    writePinLow(D1);
+  }
 
-	// We need multiple scans because debouncing can't be turned off.
-	matrix_scan();
-	wait_ms(DEBOUNCE);
-	matrix_scan();
-
-	// If the Esc (matrix 0,0) is held down on power up,
-	// reset the EEPROM valid state and jump to bootloader.
-	if ( matrix_get_row(0) & (1<<0) )
-	{
-		// Set the TMK/QMK EEPROM state as invalid.
-		eeconfig_disable();
-		// Jump to bootloader.
-		bootloader_jump();
-	}
-}
-
-void matrix_init_kb(void)
-{
-	bootmagic_lite();
-	matrix_init_user();
+	led_set_user(usb_led);
 }

keyboards/playkbtw/ca66/ca66.h

@@ -1,5 +1,4 @@
-#ifndef CA66_H
-#define CA66_H
+#pragma once
 
 #include "quantum.h"
 
@@ -16,5 +15,3 @@
   { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
   { KC_NO, K401,  K402,  K403,  K404,  KC_NO, K406,  KC_NO, K408,  K409,  K410,  K411,  K412,  K413,  K414 }  \
 }
-
-#endif

keyboards/playkbtw/ca66/config.h

@@ -1,5 +1,4 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -15,7 +14,7 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* key matrix pins */
+/* key matrix pins         0   1   2   3   4   5   6   7   8   9  10  11  12  13  14*/
 #define MATRIX_ROW_PINS { F5, F4, F1, B0, B3 }
 #define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, F6, B7, E6 }
 #define UNUSED_PINS
@@ -45,5 +44,3 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
-#endif

keyboards/playkbtw/ca66/keymaps/default/keymap.c

@@ -16,21 +16,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LSFT, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_HUI,                  KC_END,  
     KC_LCTL,          KC_LGUI, KC_LALT,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI),
 };
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRD |= (1 << 1); PORTD &= ~(1 << 1);
-	} else {
-		DDRD &= ~(1 << 1); PORTD &= ~(1 << 1);
-	}
-}

keyboards/playkbtw/ca66/readme.md

@@ -1,15 +1,16 @@
-CA66
-==
+# CA66
 
 Custom 65%
 
+This QMK firmware handles both PCBs from Round 1 and from Round 2. 
+
 Keyboard Maintainer: QMK Community   
-Hardware Supported: CA66   
-Hardware Availability: [Play Keyboard](http://play-keyboard.store/)
+Hardware Supported: CA66 R1/R2  
+Hardware Availability: [Play Keyboard](http://play-keyboard.store/)  
 
 
 Make example for this keyboard (after setting up your build environment):
 
     make playkbtw/ca66:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/playkbtw/ca66/rules.mk

@@ -1,56 +1,18 @@
 # MCU name
 MCU = atmega32u4
 
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-
-# Boot Section Size in *bytes*
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
+BOOTLOADER = atmel-dfu
 
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= no
-MOUSEKEY_ENABLE ?= yes	# Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes	# Audio control and System control(+450)
-CONSOLE_ENABLE ?= no	# Console for debug(+400)
-COMMAND_ENABLE ?= no    # Commands for debug and configuration
-SLEEP_LED_ENABLE ?= no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE ?= yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE ?= yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE ?= no
-RGBLIGHT_ENABLE ?= yes
+BOOTMAGIC_ENABLE = lite
+MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
+CONSOLE_ENABLE = no	# Console for debug(+400)
+COMMAND_ENABLE = no    # Commands for debug and configuration
+SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+AUDIO_ENABLE = no
+RGBLIGHT_ENABLE = yes

keyboards/vitamins_included/config.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define USE_I2C
 
 /* Common USB Device descriptor parameters */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x1209
 #define PRODUCT_ID      0xBEE5
 #define MANUFACTURER    Duckle29
 #define PRODUCT         Vitamins included

layouts/community/ortho_4x12/jotix/keymap.c

@@ -1,20 +1,16 @@
 #include QMK_KEYBOARD_H
-#include "unicode.c"
 
 enum layers {
   _QWERTY,
-  _FN,
   _LOWER,
   _RAISE,
-  _UNICODE
+  _GAME
 };
 
-#define FN      MO(_FN)
 #define LOWER   MO(_LOWER)
 #define RAISE   MO(_RAISE)
-#define UNICODE MO(_UNICODE)
 #define TGLOWER TG(_LOWER)
-#define TGRAISE TG(_RAISE)
+#define TGGAME  TG(_GAME)
 
 static bool is_ctl_pressed;
 static bool is_esc_pressed;
@@ -26,33 +22,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
      KC_ESC, KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  , KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSPC,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-     KC_TAB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN, KC_ENT,
+     KC_TAB, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_N  , KC_M  ,KC_COMM, KC_DOT, KC_UP ,KC_SLSH,
+    KC_LSFT, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_N  , KC_M  ,KC_COMM, KC_DOT,KC_SLSH, KC_ENT,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    KC_LCTL,KC_LGUI,KC_LALT,   FN  , LOWER , KC_SPC, KC_SPC, RAISE ,UNICODE,KC_LEFT,KC_DOWN,KC_RGHT
+    KC_LCTL,KC_LGUI,KC_LALT,KC_RALT, LOWER , KC_SPC, KC_SPC, RAISE ,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ), 
 
-[_FN] = LAYOUT_ortho_4x12 (
-// ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-    _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 ,_______,_______,_______,_______,_______,_______,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 ,_______,_______,_______,_______,_______,_______,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______, KC_F9 , KC_F10, KC_F11, KC_F12,_______,_______,_______,_______,_______,KC_PGUP,_______,
-// ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,TGLOWER,_______,_______,TGRAISE,_______,KC_HOME,KC_PGDN, KC_END
-// └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
-),
-
 [_LOWER] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-    _______,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 ,_______,
+     KC_GRV,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 ,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,KC_VOLD,KC_MUTE,KC_VOLU,KC_HOME,KC_PGUP,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
+    _______,KC_VOLD,KC_MUTE,KC_VOLU,_______, TGGAME,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,KC_MPRV,KC_MPLY,KC_MNXT, KC_END,KC_PGDN,KC_MINS, KC_EQL,_______,_______,_______,_______,
+    _______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
@@ -60,25 +44,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_RAISE] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-     KC_GRV,  KC_1 ,  KC_2 ,  KC_3 ,  KC_4 ,  KC_5 ,  KC_6 ,  KC_7 ,  KC_8 ,  KC_9 ,  KC_0 , KC_DEL,
+    KC_TILD,KC_EXLM, KC_AT ,KC_HASH, KC_DLR,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_DEL,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,KC_LBRC,KC_RBRC,KC_BSLS,KC_QUOT,_______,_______,
+    KC_CAPS, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,KC_MINS, KC_EQL,KC_LBRC,KC_RBRC,KC_BSLS,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,KC_MINS, KC_EQL,_______,_______,KC_VOLU,_______,
+    _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,KC_PIPE,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_VOLD,KC_MUTE
+    _______,_______,_______,_______,TGLOWER,_______,_______,_______,KC_HOME,KC_PGDN,KC_PGUP, KC_END
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ),
 
-[_UNICODE] = LAYOUT_ortho_4x12 (
+[_GAME] = LAYOUT_ortho_4x12 (
 // ┌───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┬───────┐
-     UN_ESC, UN_Q  , UN_W  , UN_E  , UN_R  , UN_T  , UN_Y  , UN_U  , UN_I  , UN_O  , UN_P  ,UN_BSPC,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-     UN_TAB, UN_A  , UN_S  , UN_D  , UN_F  , UN_G  , UN_H  , UN_J  , UN_K  , UN_L  ,UN_SCLN, UN_ENT,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    _______, UN_Z  , UN_X  , UN_C  , UN_V  , UN_B  , UN_N  , UN_M  ,UN_COMM, UN_DOT, UN_UP ,UN_SLSH,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, KC_UP ,_______,
 // ├───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┼───────┤
-    UC_M_LN,UC_M_WI,UC_M_OS,_______,_______,_______,_______,_______,_______,UN_DOWN, UN_UP ,UN_RGHT
+    _______,_______,_______,_______,_______,_______,_______,_______,KC_SLSH,KC_LEFT,KC_DOWN,KC_RGHT
 // └───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┴───────┘
 ),
 
@@ -95,7 +79,7 @@ uint32_t layer_state_set_user(uint32_t state) {
     writePinLow(JOTANCK_LED1);
     writePinHigh(JOTANCK_LED2);
     break;
-  case _FN:
+  case _GAME:
     writePinHigh(JOTANCK_LED1);
     writePinHigh(JOTANCK_LED2);
     break;
@@ -116,10 +100,6 @@ void led_set_user(uint8_t usb_led) {
 }
 */
 
-void keyboard_post_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case KC_LCTL:

layouts/community/ortho_4x12/jotix/readme.md

@@ -1,7 +1,5 @@
 # Jotix ortho 4x12 keymap
 
-![keymap](https://i.imgur.com/hfCyDRD.png)
-
 Tested on:
 
 * Planck/rev4

layouts/community/ortho_4x12/jotix/rules.mk

@@ -1 +0,0 @@
-UNICODEMAP_ENABLE = yes

layouts/community/ortho_4x12/jotix/unicode.c

@@ -1,200 +0,0 @@
-enum unicode_names {
-    A_ACUTE,
-    A_ACUTEC,
-    E_ACUTE,
-    E_ACUTEC,
-    I_ACUTE,
-    I_ACUTEC,
-    O_ACUTE,
-    O_ACUTEC,
-    U_ACUTE,
-    U_ACUTEC,
-    U_DIERESIS,
-    U_DIERESISC,
-    N_TILDE,
-    N_TILDEC,
-    OPEN_EXCML,
-    OPEN_QUEST,
-    EURO,
-    POUND,
-    LEFT_ARROW,
-    DOWN_ARROW,
-    UP_ARROW,
-    RIGHT_ARROW,
-    LEFT_DARROW,
-    DOWN_DARROW,
-    UP_DARROW,
-    RIGHT_DAROW,
-    LEFT_DQUOT,
-    RGHT_DQUOT,
-    DEGREE,
-    DEGREE_CELCIUS,
-    SUPER_1,
-    SUPER_2,
-    SUPER_3,
-    ONE_HALF,
-    PER_MILLE,
-    PER_THOUS,
-    PILCROW,
-    COPYRIGHT,
-    REGISTERED,
-    MICRO,
-    MIDDLE_DOT,
-    BOX_CORNER_1,
-    BOX_CORNER_2,
-    BOX_CORNER_3,
-    BOX_CORNER_4,
-    BOX_HORIZONTAL,
-    BOX_VERTICAL,
-    BOX_CROSS,
-    BOX_UNION_1,
-    BOX_UNION_2,
-    BOX_UNION_3,
-    BOX_UNION_4,
-    DBOX_CORNER_1,
-    DBOX_CORNER_2,
-    DBOX_CORNER_3,
-    DBOX_CORNER_4,
-    DBOX_HORIZONT,
-    DBOX_VERTICAL,
-    DBOX_CROSS,
-    DBOX_UNION_1,
-    DBOX_UNION_2,
-    DBOX_UNION_3,
-    DBOX_UNION_4,
-    LESS_EQUAL,
-    MORE_EQUAL,
-    DIVISION,
-    SQUARE_ROOT,
-    CUBE_ROOT,
-    SPADE_SUIT,
-    TREBOL_SUIT,
-    HEART_SUIT,
-    DIAMOND_SUIT,
-    NARRAY_SUM,
-    INFINIT_SYMBOL,
-    DIAMOND_BULLET,
-    CIRCLE_BULLET,
-    SMILE_FACE,
-    SAD_FACE
-};
-
-const uint32_t PROGMEM unicode_map[] = {
-    [A_ACUTE]       = 0x00E1,
-    [A_ACUTEC]      = 0x00C1,
-    [E_ACUTE]       = 0x00E9,
-    [E_ACUTEC]      = 0x00C9,
-    [I_ACUTE]       = 0x00ED,
-    [I_ACUTEC]      = 0x00CD,
-    [O_ACUTE]       = 0x00F3,
-    [O_ACUTEC]      = 0x00D3,
-    [U_ACUTE]       = 0x00FA,
-    [U_ACUTEC]      = 0x00DA,
-    [U_DIERESIS]    = 0x00FC,
-    [U_DIERESISC]   = 0x00DC,
-    [N_TILDE]       = 0x00F1,
-    [N_TILDEC]      = 0x00D1,
-    [OPEN_EXCML]    = 0x00A1,
-    [OPEN_QUEST]    = 0x00BF,
-    [EURO]          = 0x20AC,
-    [POUND]         = 0x00A3,
-    [LEFT_ARROW]    = 0x2190,
-    [DOWN_ARROW]    = 0x2193,
-    [UP_ARROW]      = 0x2191,
-    [RIGHT_ARROW]   = 0x2192,
-    [LEFT_DARROW]   = 0x21E6,
-    [DOWN_DARROW]   = 0x21D3,
-    [UP_DARROW]     = 0x21D1,
-    [RIGHT_DAROW]   = 0x21D2,
-    [LEFT_DQUOT]    = 0x00AB,
-    [RGHT_DQUOT]    = 0x00BB,
-    [DEGREE]        = 0x00B0,
-    [DEGREE_CELCIUS]= 0x2103,
-    [SUPER_1]       = 0x00B9,
-    [SUPER_2]       = 0x00B2,
-    [SUPER_3]       = 0x00B3,
-    [ONE_HALF]      = 0x00BD,
-    [PER_MILLE]     = 0x0609,
-    [PER_THOUS]     = 0x060A,
-    [PILCROW]       = 0x00B6,
-    [COPYRIGHT]     = 0x00A9,
-    [REGISTERED]    = 0x00AE,
-    [MICRO]         = 0x00B5,
-    [MIDDLE_DOT]    = 0x00B7,
-    [BOX_CORNER_1]  = 0x250C,
-    [BOX_CORNER_2]  = 0x2510,
-    [BOX_CORNER_3]  = 0x2514,
-    [BOX_CORNER_4]  = 0x2518,
-    [BOX_HORIZONTAL]= 0x2500,
-    [BOX_VERTICAL]  = 0x2502,
-    [BOX_CROSS]     = 0x253C,
-    [BOX_UNION_1]   = 0x2524,
-    [BOX_UNION_2]   = 0x252C,
-    [BOX_UNION_3]   = 0x2534,
-    [BOX_UNION_4]   = 0x251C,
-    [DBOX_CORNER_1] = 0x2554,
-    [DBOX_CORNER_2] = 0x2557,
-    [DBOX_CORNER_3] = 0x255A,
-    [DBOX_CORNER_4] = 0x255D,
-    [DBOX_HORIZONT] = 0x2550,
-    [DBOX_VERTICAL] = 0x2551,
-    [DBOX_CROSS]    = 0x256C,
-    [DBOX_UNION_1]  = 0x2563,
-    [DBOX_UNION_2]  = 0x2566,
-    [DBOX_UNION_3]  = 0x2569,
-    [DBOX_UNION_4]  = 0x2560,
-    [LESS_EQUAL]    = 0x2264,
-    [MORE_EQUAL]    = 0x2265,
-    [DIVISION]      = 0x00F7,
-    [SQUARE_ROOT]   = 0x221A,
-    [CUBE_ROOT]     = 0x221B,
-    [SPADE_SUIT]    = 0x2660,
-    [TREBOL_SUIT]   = 0x2663,
-    [HEART_SUIT]    = 0x2664,
-    [DIAMOND_SUIT]  = 0x2665,
-    [NARRAY_SUM]    = 0x2211,
-    [INFINIT_SYMBOL]= 0x221E,
-    [DIAMOND_BULLET]= 0x2B25,
-    [CIRCLE_BULLET] = 0x2981,
-    [SMILE_FACE]    = 0x263A,
-    [SAD_FACE]      = 0x2639
-};
-
-#define UN_ESC  XP(DEGREE, DEGREE_CELCIUS)
-#define UN_Q    XP(OPEN_EXCML, SUPER_1)
-#define UN_W    XP(SUPER_2, SUPER_3)
-#define UN_E    XP(E_ACUTE, E_ACUTEC)
-#define UN_R    XP(EURO, ONE_HALF)
-#define UN_T    XP(PER_MILLE, PER_THOUS)
-#define UN_Y    XP(U_DIERESIS, U_DIERESISC)
-#define UN_U    XP(U_ACUTE, U_ACUTEC)
-#define UN_I    XP(I_ACUTE, I_ACUTEC)
-#define UN_O    XP(O_ACUTE, O_ACUTEC)
-#define UN_P    XP(POUND, PILCROW)
-#define UN_BSPC XP(BOX_CROSS, DBOX_CROSS)
-#define UN_TAB  XP(DIAMOND_BULLET, CIRCLE_BULLET)
-#define UN_A    XP(A_ACUTE, A_ACUTEC)
-#define UN_S    XP(BOX_CORNER_1, DBOX_CORNER_1)
-#define UN_D    XP(BOX_CORNER_2, DBOX_CORNER_2)
-#define UN_F    XP(BOX_CORNER_3, DBOX_CORNER_3)
-#define UN_G    XP(BOX_CORNER_4, DBOX_CORNER_4)
-#define UN_H    XP(BOX_UNION_1, DBOX_UNION_1)
-#define UN_J    XP(BOX_UNION_2, DBOX_UNION_2)
-#define UN_K    XP(BOX_UNION_3, DBOX_UNION_3)
-#define UN_L    XP(BOX_UNION_4, DBOX_UNION_4)
-#define UN_SCLN XP(BOX_HORIZONTAL, DBOX_HORIZONT)
-#define UN_ENT  XP(BOX_VERTICAL, DBOX_VERTICAL)
-#define UN_Z    XP(NARRAY_SUM, INFINIT_SYMBOL)
-#define UN_X    XP(SMILE_FACE, SAD_FACE)
-#define UN_C    XP(COPYRIGHT, REGISTERED)
-#define UN_V    XP(SPADE_SUIT, TREBOL_SUIT)
-#define UN_B    XP(HEART_SUIT, DIAMOND_SUIT)
-#define UN_N    XP(N_TILDE, N_TILDEC)
-#define UN_M    XP(MICRO, MIDDLE_DOT)
-#define UN_COMM XP(LESS_EQUAL, LEFT_DQUOT)
-#define UN_DOT  XP(MORE_EQUAL, RGHT_DQUOT)
-#define UN_SLSH XP(OPEN_QUEST, DIVISION)
-#define UN_LEFT XP(LEFT_ARROW, LEFT_DARROW)
-#define UN_DOWN XP(DOWN_ARROW, DOWN_DARROW)
-#define UN_UP   XP(UP_ARROW, UP_DARROW)
-#define UN_RGHT XP(RIGHT_ARROW, RIGHT_DAROW) 

lib/python/milc.py

@@ -534,8 +534,7 @@ class MILC(object):
         if not self._inside_context_manager:
             # If they didn't use the context manager use it ourselves
             with self:
-                self.__call__()
-                return
+                return self.__call__()
 
         if not self._entrypoint:
             raise RuntimeError('No entrypoint provided!')

lib/python/qmk/cli/doctor.py

@@ -2,9 +2,11 @@
 
 Check up for QMK environment.
 """
-import shutil
-import platform
 import os
+import platform
+import shutil
+import subprocess
+from glob import glob
 
 from milc import cli
 
@@ -16,32 +18,60 @@ def main(cli):
     This is currently very simple, it just checks that all the expected binaries are on your system.
 
     TODO(unclaimed):
-        * [ ] Run the binaries to make sure they work
         * [ ] Compile a trivial program with each compiler
         * [ ] Check for udev entries on linux
     """
+    cli.log.info('QMK Doctor is checking your environment.')
 
+    # Make sure the basic CLI tools we need are available and can be executed.
     binaries = ['dfu-programmer', 'avrdude', 'dfu-util', 'avr-gcc', 'arm-none-eabi-gcc']
-
-    cli.log.info('QMK Doctor is Checking your environment')
-
+    binaries += glob('bin/qmk-*')
     ok = True
+
     for binary in binaries:
         res = shutil.which(binary)
         if res is None:
-            cli.log.error('{fg_red}QMK can\'t find ' + binary + ' in your path')
+            cli.log.error("{fg_red}QMK can't find %s in your path.", binary)
             ok = False
+        else:
+            try:
+                subprocess.run([binary, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=5, check=True)
+            except subprocess.CalledProcessError:
+                cli.log.error("{fg_red}Can't run `%s --version`", binary)
+                ok = False
 
+    # Determine our OS and run platform specific tests
     OS = platform.system()
-    if OS == "Darwin":
-        cli.log.info("Detected {fg_cyan}macOS")
-    elif OS == "Linux":
-        cli.log.info("Detected {fg_cyan}linux")
-        test = 'systemctl list-unit-files | grep enabled | grep -i ModemManager'
-        if os.system(test) == 0:
-            cli.log.warn("{bg_yellow}Detected modem manager. Please disable it if you are using Pro Micros")
-    else:
-        cli.log.info("Assuming {fg_cyan}Windows")
 
+    if OS == "Darwin":
+        cli.log.info("Detected {fg_cyan}macOS.")
+
+    elif OS == "Linux":
+        cli.log.info("Detected {fg_cyan}Linux.")
+        if shutil.which('systemctl'):
+            mm_check = subprocess.run(['systemctl', 'list-unit-files'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=10)
+            if mm_check.returncode == 0:
+                mm = True
+                for line in mm_check.stdout.split('\n'):
+                    if 'ModemManager' in line and 'enabled' in line:
+                        mm = False
+
+                if mm:
+                    cli.log.warn("{bg_yellow}Detected ModemManager. Please disable it if you are using a Pro-Micro.")
+
+            else:
+                cli.log.error('{bg_red}Could not run `systemctl list-unit-files`:')
+                cli.log.error(mm_check.stderr)
+
+        else:
+            cli.log.warn("Can't find systemctl to check for ModemManager.")
+
+    else:
+        cli.log.info("Assuming {fg_cyan}Windows.")
+
+    # Report a summary of our findings to the user
     if ok:
         cli.log.info('{fg_green}QMK is ready to go')
+    else:
+        cli.log.info('{fg_yellow}Problems detected, please fix these problems before proceeding.')
+        # FIXME(skullydazed): Link to a document about troubleshooting, or discord or something

lib/python/qmk/cli/nose2.py

@@ -0,0 +1,18 @@
+"""QMK Python Unit Tests
+
+QMK script to run unit and integration tests against our python code.
+"""
+from milc import cli
+
+
+@cli.entrypoint('QMK Python Unit Tests')
+def main(cli):
+    """Use nose2 to run unittests
+    """
+    try:
+        import nose2
+    except ImportError:
+        cli.log.error('Could not import nose2! Please install it with {fg_cyan}pip3 install nose2')
+        return False
+
+    nose2.discover()

lib/python/qmk/cli/pyformat.py

@@ -0,0 +1,16 @@
+"""Format python code according to QMK's style.
+"""
+from milc import cli
+
+import subprocess
+
+
+@cli.entrypoint("Format python code according to QMK's style.")
+def main(cli):
+    """Format python code according to QMK's style.
+    """
+    try:
+        subprocess.run(['yapf', '-vv', '-ri', 'bin/qmk', 'lib/python'], check=True)
+        cli.log.info('Successfully formatted the python code in `bin/qmk` and `lib/python`.')
+    except subprocess.CalledProcessError:
+        cli.log.error('Error formatting python code!')

lib/python/qmk/tests/attrdict.py

@@ -0,0 +1,9 @@
+class AttrDict(dict):
+    """A dictionary that can be accessed by attributes.
+
+    This should only be used to mock objects for unit testing. Please do not use this outside of qmk.tests.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(AttrDict, self).__init__(*args, **kwargs)
+        self.__dict__ = self

lib/python/qmk/tests/onekey_export.json

@@ -0,0 +1,6 @@
+{
+    "keyboard":"handwired/onekey/pytest",
+    "keymap":"pytest_unittest",
+    "layout":"LAYOUT",
+    "layers":[["KC_A"]]
+}

lib/python/qmk/tests/test_qmk_errors.py

@@ -0,0 +1,8 @@
+from qmk.errors import NoSuchKeyboardError
+
+
+def test_NoSuchKeyboardError():
+    try:
+        raise NoSuchKeyboardError("test message")
+    except NoSuchKeyboardError as e:
+        assert e.message == 'test message'

lib/python/qmk/tests/test_qmk_keymap.py

@@ -0,0 +1,19 @@
+import qmk.keymap
+
+
+def test_template_onekey_proton_c():
+    templ = qmk.keymap.template('handwired/onekey/proton_c')
+    assert templ == qmk.keymap.DEFAULT_KEYMAP_C
+
+
+def test_template_onekey_pytest():
+    templ = qmk.keymap.template('handwired/onekey/pytest')
+    assert templ == 'const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};\n'
+
+
+def test_generate_onekey_pytest():
+    templ = qmk.keymap.generate('handwired/onekey/pytest', 'LAYOUT', [['KC_A']])
+    assert templ == 'const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	[0] = LAYOUT(KC_A)};\n'
+
+
+# FIXME(skullydazed): Add a test for qmk.keymap.write that mocks up an FD.

lib/python/qmk/tests/test_qmk_path.py

@@ -0,0 +1,13 @@
+import os
+
+import qmk.path
+
+
+def test_keymap_onekey_pytest():
+    path = qmk.path.keymap('handwired/onekey/pytest')
+    assert path == 'keyboards/handwired/onekey/keymaps'
+
+
+def test_normpath():
+    path = qmk.path.normpath('lib/python')
+    assert path == os.environ['ORIG_CWD'] + '/lib/python'

nose2.cfg

@@ -0,0 +1,2 @@
+[unittest]
+start-dir = lib/python/qmk/tests

tmk_core/protocol/usb_descriptor.c

@@ -302,6 +302,10 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {.Header           = {.
 #    define USB_MAX_POWER_CONSUMPTION 500
 #endif
 
+#ifndef USB_POLLING_INTERVAL_MS
+#    define USB_POLLING_INTERVAL_MS 10
+#endif
+
 /*
  * Configuration descriptors
  */
@@ -324,7 +328,7 @@ const USB_Descriptor_Configuration_t PROGMEM
 
                                    .InterfaceStrIndex = NO_DESCRIPTOR},
             .Keyboard_HID        = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(KeyboardReport)},
-            .Keyboard_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = KEYBOARD_EPSIZE, .PollingIntervalMS = 0x0A},
+            .Keyboard_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = KEYBOARD_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
 #endif
 
 #if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
@@ -333,7 +337,7 @@ const USB_Descriptor_Configuration_t PROGMEM
              */
             .Mouse_Interface  = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .InterfaceNumber = MOUSE_INTERFACE, .AlternateSetting = 0x00, .TotalEndpoints = 1, .Class = HID_CSCP_HIDClass, .SubClass = HID_CSCP_BootSubclass, .Protocol = HID_CSCP_MouseBootProtocol, .InterfaceStrIndex = NO_DESCRIPTOR},
             .Mouse_HID        = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(MouseReport)},
-            .Mouse_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = MOUSE_EPSIZE, .PollingIntervalMS = 0x0A},
+            .Mouse_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = MOUSE_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
 #endif
 
 #ifdef SHARED_EP_ENABLE
@@ -354,7 +358,7 @@ const USB_Descriptor_Configuration_t PROGMEM
 #    endif
                                  .InterfaceStrIndex = NO_DESCRIPTOR},
             .Shared_HID        = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(SharedReport)},
-            .Shared_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | SHARED_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = SHARED_EPSIZE, .PollingIntervalMS = 0x0A},
+            .Shared_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | SHARED_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = SHARED_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
 #endif
 
 #ifdef RAW_ENABLE

util/docker_build.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
 # NOTE: This script uses tabs for indentation
 
+errcho() {
+	echo "$@" >&2
+}
+
 USAGE="Usage: $0 [keyboard[:keymap[:target]]]"
 
 # Check preconditions
@@ -11,11 +15,11 @@ for arg; do
 	fi
 done
 if [ $# -gt 1 ]; then
-	echo "$USAGE" >&2
+	errcho "$USAGE"
 	exit 1
 elif ! command -v docker >/dev/null 2>&1; then
-	echo "Error: docker not found" >&2
-	echo "See https://docs.docker.com/install/#supported-platforms for installation instructions" >&2
+	errcho "Error: docker not found"
+	errcho "See https://docs.docker.com/install/#supported-platforms for installation instructions"
 	exit 2
 fi
 
@@ -29,7 +33,7 @@ else
 	$1
 	EOF
 	if [ -n "$x" ]; then
-		echo "$USAGE" >&2
+		errcho "$USAGE"
 		exit 1
 	fi
 fi
@@ -37,9 +41,9 @@ if [ -n "$target" ]; then
 	if [ "$(uname)" = "Linux" ] || docker-machine active >/dev/null 2>&1; then
 		usb_args="--privileged -v /dev:/dev"
 	else
-		echo "Error: target requires docker-machine to work on your platform" >&2
-		echo "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos" >&2
-		echo "Consider flashing with QMK Toolbox (https://github.com/qmk/qmk_toolbox) instead" >&2
+		errcho "Error: target requires docker-machine to work on your platform"
+		errcho "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos"
+		errcho "Consider flashing with QMK Toolbox (https://github.com/qmk/qmk_toolbox) instead"
 		exit 3
 	fi
 fi
@@ -47,7 +51,7 @@ dir=$(pwd -W 2>/dev/null) || dir=$PWD  # Use Windows path if on Windows
 
 # Run container and build firmware
 docker run --rm -it $usb_args \
-    -w /qmk_firmware/ \
+	-w /qmk_firmware \
 	-v "$dir":/qmk_firmware \
 	-e ALT_GET_KEYBOARDS=true \
 	-e SKIP_GIT="$SKIP_GIT" \

util/travis_build.sh

@@ -2,9 +2,9 @@
 
 # if docker is installed - call make within the qmk docker image
 if command -v docker >/dev/null; then
-  function make() {
-    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
-  }
+	function make() {
+		docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
+	}
 fi
 
 # test force push
@@ -22,7 +22,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 		eval $MAKE_ALL
 		: $((exit_code = $exit_code + $?))
 	else
-		NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)'  | grep -Ev '^(docs/)' | wc -l)
+		NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(lib/python/)' | grep -Ev '(^bin/qmk)' | wc -l)
 		BRANCH=$(git rev-parse --abbrev-ref HEAD)
 		# is this branch master or a "non docs, non keyboards" change 
 		if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
@@ -30,7 +30,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 			eval $MAKE_ALL
 			: $((exit_code = $exit_code + $?))
 		else
-		    # keyboards project format
+			# keyboards project format
 			#  /keyboards/board1/rev/keymaps/
 			#  /keyboards/board2/keymaps/
 			# ensure we strip everything off after and including the keymaps folder to get board and/or revision
@@ -51,6 +51,14 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 				fi
 			done
 		fi
+		# Check and run python tests if necessary
+		PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E -e '^(lib/python/)' -e '^(bin/qmk)' | wc -l)
+		if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
+			echo
+			echo "Running python tests."
+			docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk nose2
+			: $((exit_code = $exit_code + $?))
+		fi
 	fi
 	exit $exit_code
 fi