Merge branch 'master' into 10bitConsumerCodeSupport

* master:
  Back out part of 374a3e136c because it breaks our ability to pass -D defines into code
  Update key_events.cpp (IS_INTERNAL Handling)

bin/kaleidoscope-builder

@@ -145,6 +145,7 @@ compile () {
 		    ${EXTRA_BUILDER_ARGS} \
 		    -build-path "${BUILD_PATH}" \
 		    -ide-version "${ARDUINO_IDE_VERSION}" \
+		    -prefs "compiler.cpp.extra_flags=-std=c++11 -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-variable -Wno-ignored-qualifiers ${ARDUINO_CFLAGS} ${LOCAL_CFLAGS}" \
 		    -warnings all \
         ${ARDUINO_VERBOSE} \
 		    ${ARDUINO_AVR_GCC_PREFIX_PARAM} \

src/key_events.cpp

@@ -8,9 +8,7 @@ static bool handleSyntheticKeyswitchEvent(Key mappedKey, uint8_t keyState) {
   if (!(mappedKey.flags & SYNTHETIC))
     return false;
 
-  if (mappedKey.flags & IS_INTERNAL) {
+  if (mappedKey.flags & IS_CONSUMER) {
-    return false;
-  } else if (mappedKey.flags & IS_CONSUMER) {
     if (keyIsPressed(keyState)) {
     } else if (keyWasPressed(keyState)) {
       kaleidoscope::hid::pressConsumerControl(mappedKey);
@@ -22,6 +20,8 @@ static bool handleSyntheticKeyswitchEvent(Key mappedKey, uint8_t keyState) {
       kaleidoscope::hid::pressSystemControl(mappedKey);
       kaleidoscope::hid::releaseSystemControl(mappedKey);
     }
+  } else if (mappedKey.flags & IS_INTERNAL) {
+    return false;
   } else if (mappedKey.flags & SWITCH_TO_KEYMAP) {
     // Should not happen, handled elsewhere.
   }