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-01-29 13:01:47 -05:00 · 2017-01-15 23:29:24 -05:00
2 changed files with 9 additions and 9 deletions
--- 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
@ -21,7 +21,7 @@ NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/
 if [[ $NEFM -gt 0 ]] ; then
 	echo "Essential files modified."
 	git fetch --tags
-	lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort | awk '{print $4}' | tail -1)
+	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
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	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