diff options
| author | Joshua T <joshua@sonofone.net> | 2016-07-30 08:41:22 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-07-30 08:41:22 -0500 |
| commit | e9a501d4477981da878294a630431ed76716c57e (patch) | |
| tree | 5c6c6a381e21f3d8f2bba223438d7528da717962 /tmk_core/common | |
| parent | 5607b716ba0ec7002f29244f24aa8999b9511061 (diff) | |
| parent | 7775f3e4b3309f3102bf9d887a79514a67d18da6 (diff) | |
Merge remote-tracking branch 'upstream/master'
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 |