diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-04-13 20:07:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 20:07:48 +0200 |
| commit | 41a46c7c8e4aa2470c245cbe09deb57c0720698e (patch) | |
| tree | 8b07323439fc477f47833d7ee7564e26b323a3eb /tmk_core/common | |
| parent | d3301c0f8b0005738ab9aa2030d83739ffb5c4b6 (diff) | |
| parent | d68294615f9c67764c06a7524fb59c22c024a106 (diff) | |
| download | qmk_firmware-41a46c7c8e4aa2470c245cbe09deb57c0720698e.tar.gz qmk_firmware-41a46c7c8e4aa2470c245cbe09deb57c0720698e.tar.xz | |
Merge pull request #1224 from fredizzimo/fix_warnings
Fix all warnings and turn on warnings as errors
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/action.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/avr/suspend.c | 1 | ||||
| -rw-r--r-- | tmk_core/common/mousekey.h | 13 |
3 files changed, 13 insertions, 3 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 94de36918..4ba1cc251 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -140,7 +140,6 @@ void process_record(keyrecord_t *record) void process_action(keyrecord_t *record, action_t action) { - bool do_release_oneshot = false; keyevent_t event = record->event; #ifndef NO_ACTION_TAPPING uint8_t tap_count = record->tap.count; @@ -152,6 +151,7 @@ void process_action(keyrecord_t *record, action_t action) } #ifndef NO_ACTION_ONESHOT + bool do_release_oneshot = false; // notice we only clear the one shot layer if the pressed key is not a modifier. if (is_oneshot_layer_active() && event.pressed && !IS_MOD(action.key.code)) { clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index 0c81e8361..1c7618ff5 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -9,6 +9,7 @@ #include "suspend.h" #include "timer.h" #include "led.h" +#include "host.h" #ifdef PROTOCOL_LUFA #include "lufa.h" diff --git a/tmk_core/common/mousekey.h b/tmk_core/common/mousekey.h index 6eede06b4..9338d0af7 100644 --- a/tmk_core/common/mousekey.h +++ b/tmk_core/common/mousekey.h @@ -23,8 +23,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* max value on report descriptor */ -#define MOUSEKEY_MOVE_MAX 127 -#define MOUSEKEY_WHEEL_MAX 127 +#ifndef MOUSEKEY_MOVE_MAX + #define MOUSEKEY_MOVE_MAX 127 +#elif MOUSEKEY_MOVE_MAX > 127 + #error MOUSEKEY_MOVE_MAX needs to be smaller than 127 +#endif + +#ifndef MOUSEKEY_WHEEL_MAX + #define MOUSEKEY_WHEEL_MAX 127 +#elif MOUSEKEY_WHEEL_MAX > 127 + #error MOUSEKEY_WHEEL_MAX needs to be smaller than 127 +#endif #ifndef MOUSEKEY_MOVE_DELTA #define MOUSEKEY_MOVE_DELTA 5 |