Merge pull request #1010 from SjB/oneshot_timeout_fix

oneshot timeout would only timeout after an event.
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
2017-02-06 18:57:23 -05:00 · 2017-02-06 18:28:50 -05:00 · 2017-02-06 18:28:37 -05:00 · 2017-02-06 18:00:47 -05:00 · 2017-02-06 17:51:20 -05:00 · 2017-02-06 17:06:53 -05:00
5 changed files with 51 additions and 12 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ language: c
 branches:
  except:
    - /^.*-automated-build$/
+    - /^[0-9]+\.[0-9]+\.[0-9]+/
 env:
  global:
  - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -141,7 +141,16 @@ bool process_unicode_map(uint16_t keycode, keyrecord_t *record) {
    const uint32_t* map = unicode_map;
    uint16_t index = keycode & 0x7FF;
    uint32_t code = pgm_read_dword_far(&map[index]);
-    if ((code > 0xFFFF && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) {
+    if (code > 0xFFFF && code <= 0x10ffff && input_mode == UC_OSX) {
+      // Convert to UTF-16 surrogate pair
+      code -= 0x10000;
+      uint32_t lo = code & 0x3ff;
+      uint32_t hi = (code & 0xffc00) >> 10;
+      unicode_input_start();
+      register_hex32(hi + 0xd800);
+      register_hex32(lo + 0xdc00);
+      unicode_input_finish();
+    } else if ((code > 0x10ffff && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) {
      // when character is out of range supported by the OS
      unicode_map_input_error();
    } else {
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -33,14 +33,42 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
    f(KC_RGUI);
 }

+static inline void qk_register_weak_mods(uint8_t kc) {
+    add_weak_mods(MOD_BIT(kc));
+    send_keyboard_report();
+}
+
+static inline void qk_unregister_weak_mods(uint8_t kc) {
+    del_weak_mods(MOD_BIT(kc));
+    send_keyboard_report();
+}
+
+static inline void qk_register_mods(uint8_t kc) {
+    add_weak_mods(MOD_BIT(kc));
+    send_keyboard_report();
+}
+
+static inline void qk_unregister_mods(uint8_t kc) {
+    del_weak_mods(MOD_BIT(kc));
+    send_keyboard_report();
+}
+
 void register_code16 (uint16_t code) {
-  do_code16 (code, register_code);
+  if (IS_MOD(code) || code == KC_NO) {
+      do_code16 (code, qk_register_mods);
+  } else {
+      do_code16 (code, qk_register_weak_mods);
+  }
  register_code (code);
 }

 void unregister_code16 (uint16_t code) {
  unregister_code (code);
-  do_code16 (code, unregister_code);
+  if (IS_MOD(code) || code == KC_NO) {
+      do_code16 (code, qk_unregister_mods);
+  } else {
+      do_code16 (code, qk_unregister_weak_mods);
+  }
 }

 __attribute__ ((weak))
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -49,6 +49,13 @@ void action_exec(keyevent_t event)

    keyrecord_t record = { .event = event };

+#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+    if (has_oneshot_layer_timed_out()) {
+        dprintf("Oneshot layer: timeout\n");
+        clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+    }
+#endif
+
 #ifndef NO_ACTION_TAPPING
    action_tapping_process(record);
 #else
@@ -100,7 +107,7 @@ bool process_record_quantum(keyrecord_t *record) {
    return true;
 }

-void process_record(keyrecord_t *record) 
+void process_record(keyrecord_t *record)
 {
    if (IS_NOEVENT(record->event)) { return; }

@@ -126,13 +133,6 @@ void process_action(keyrecord_t *record, action_t action)
    uint8_t tap_count = record->tap.count;
 #endif

-#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
-    if (has_oneshot_layer_timed_out()) {
-        dprintf("Oneshot layer: timeout\n");
-        clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-    }
-#endif
-
    if (event.pressed) {
        // clear the potential weak mods left by previously pressed keys
        clear_weak_mods();
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -20,7 +20,8 @@ increment_version ()
 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
 if [[ $NEFM -gt 0 ]] ; then
 	echo "Essential files modified."
-	lasttag=$(git tag | grep -Ev '\-' | head -1)
+	git fetch --tags
+	lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
 	newtag=$(increment_version $lasttag)
 	git tag $newtag
 	git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware
Author	SHA1	Message	Date
Jack Humbert	b6ffda4849	Merge pull request #1010 from SjB/oneshot_timeout_fix oneshot timeout would only timeout after an event.	2017-02-06 18:57:23 -05:00
Jack Humbert	449ab9109a	Merge branch 'master' of github.com:jackhumbert/qmk_firmware	2017-02-06 18:28:50 -05:00
Jack Humbert	35edb382ee	[skip build] testing travis script	2017-02-06 18:28:37 -05:00
Jack Humbert	0a3c5c06fe	Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs Add support for Unicode supplementary planes on OS X	2017-02-06 18:00:47 -05:00
Jack Humbert	5c8cdfd2b5	[skip build] testing travis script	2017-02-06 17:51:20 -05:00
Jack Humbert	246d2583ff	Merge pull request #1030 from SjB/refactor_register_code16 speeding up (un)register_code16	2017-02-06 17:06:53 -05:00
SjB	45e0d09414	moved oneshot cancellation code outside of process_record. The oneshot cancellation code do not depend on the action_tapping_process and since process_record get called via the action_tapping_process logic moved the oneshot cancellation code into the action_exec function just before the action_tapping_process call	2017-01-29 13:01:47 -05:00
SjB	f644b9a07a	registering a weak_mods when using register_code16 Scenario: Locking the KC_LSHIFT, and then using a tap dance key that registers a S(KC_9) will unregister the KC_LSHIFT. The tap dance or any keycode that is registered should not have the side effect of cancelling a locked moditifier. We should be using a similar logic as the TMK codes in tmk_core/comman/action.c:158.	2017-01-29 12:29:43 -05:00
SjB	2b3859937b	speeding up (un)register_code16 In register_code16 and unregister_code16 we call register_code and unregister_code twice, once for the mods and once for the keycode. The (un)register_code have many check to see that keycode we have sent however because we know that we are sending it a mods key, why not just skip all of it and call (un)register_mods instead. This will skip alot of checks and should speedup the loop a little.	2017-01-23 23:16:57 -05:00
SjB	6f44ca7a59	oneshot timeout would only timeout after an event. After setting a ONESHOT_TIMEOUT value, the oneshot layer state would not expire without an event being triggered (key pressed). The reason was that in the process_record function we would return priort to execute the process_action function if it detected a NOEVENT cycle. The process_action contained the codes to timeout the oneshot layer state. The codes to clear the oneshot layer state have been move just in front of where we check for the NOEVENT cycle in the process_record function.	2017-01-15 23:29:24 -05:00
Jonas Oberschweiber	0aa413af44	Add support for supplementary planes for OS X	2016-12-31 19:37:56 +01:00