diff options
| author | Stephen Christie <undersampled@live.com> | 2016-08-02 22:51:30 -0400 |
|---|---|---|
| committer | Stephen Christie <undersampled@live.com> | 2016-08-02 22:51:30 -0400 |
| commit | bf2b260429dbc015d49d005065a37441c8f15753 (patch) | |
| tree | ff87f04b747ce54870e8fb2a56af205079f9415c /tmk_core/common | |
| parent | 0acb394ac41f56895d4287d950a79bca5437a45c (diff) | |
| parent | 79a9e04706919b4cc684f9ee9420ef38470bcd66 (diff) | |
Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/action_layer.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/print.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c index 63fa2b5ae4..a3c7579642 100644 --- a/tmk_core/common/action_layer.c +++ b/tmk_core/common/action_layer.c @@ -111,7 +111,7 @@ void layer_debug(void) #endif #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) -uint8_t source_layers_cache[(MATRIX_ROWS * MATRIX_COLS + 7) / 8][MAX_LAYER_BITS] = {0}; +uint8_t source_layers_cache[(MATRIX_ROWS * MATRIX_COLS + 7) / 8][MAX_LAYER_BITS] = {{0}}; void update_source_layers_cache(keypos_t key, uint8_t layer) { diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h index 0368bcd4a1..a1352527fc 100644 --- a/tmk_core/common/print.h +++ b/tmk_core/common/print.h @@ -29,7 +29,9 @@ #include <stdbool.h> #include "util.h" - +#if defined(PROTOCOL_CHIBIOS) +#define PSTR(x) x +#endif #ifndef NO_PRINT |