Merge branch 'keymap2'

Conflicts:
	common/keyboard.c

diff --combined common/command.c
index 5cdd168d46297dcbf1992bdce80f5ccc1181dfe9,8ca16b91029adddf9df3ba6bc63d98f8febef321..6d4e4c642dbc34df5f70c4a3032c7784b0633867
--- 1/common/command.c
--- 2/common/command.c
+++ b/common/command.c
@@@ -19,6 -19,7 +19,7 @@@ along with this program.  If not, see <
  #include <util/delay.h>
  #include "keycode.h"
  #include "host.h"
+ #include "keymap.h"
  #include "print.h"
  #include "debug.h"
  #include "util.h"
@@@ -53,7 -54,6 +54,6 @@@ static void mousekey_console_help(void)
  
  static uint8_t numkey2num(uint8_t code);
  static void switch_layer(uint8_t layer);
- static void clear_keyboard(void);
  
  
  typedef enum { ONESHOT, CONSOLE, MOUSEKEY } cmdstate_t;
@@@ -234,7 -234,6 +234,7 @@@ static bool command_common(uint8_t code
              break;
  #ifdef NKRO_ENABLE
          case KC_N:
 +            clear_keyboard(); //Prevents stuck keys.
              keyboard_nkro = !keyboard_nkro;
              if (keyboard_nkro)
                  print("NKRO: enabled\n");
@@@ -556,18 -555,3 +556,3 @@@ static void switch_layer(uint8_t layer
      default_layer = layer;
      print("switch to "); print_val_hex8(layer);
  }
- 
- static void clear_keyboard(void)
- {
-     host_clear_keys();
-     host_clear_mods();
-     host_send_keyboard_report();
- 
-     host_system_send(0);
-     host_consumer_send(0);
- 
- #ifdef MOUSEKEY_ENABLE
-     mousekey_clear();
-     mousekey_send();
- #endif
- }

diff --combined common/host.h
index 8417987966d2962411cbdd855f153c9d8580e0fa,c59fbfee6a3ff5661a36c551cbaa3ffcf3413361..7c4f06601d9a0e682b77a38b56bd46cf0abfc4e4
--- 1/common/host.h
--- 2/common/host.h
+++ b/common/host.h
@@@ -19,7 -19,6 +19,7 @@@ along with this program.  If not, see <
  #define HOST_H
  
  #include <stdint.h>
 +#include <stdbool.h>
  #include "report.h"
  #include "host_driver.h"
  
@@@ -52,10 -51,13 +52,13 @@@ void host_consumer_send(uint16_t data)
  void host_add_key(uint8_t key);
  void host_del_key(uint8_t key);
  void host_clear_keys(void);
- void host_add_mod_bit(uint8_t mod);
- void host_del_mod_bit(uint8_t mod);
+ 
+ uint8_t host_get_mods(void);
+ void host_add_mods(uint8_t mods);
+ void host_del_mods(uint8_t mods);
  void host_set_mods(uint8_t mods);
  void host_clear_mods(void);
+ 
  uint8_t host_has_anykey(void);
  uint8_t host_has_anymod(void);
  uint8_t host_get_first_key(void);