diff options
| author | Toni <jeder@mail1a.de> | 2016-08-13 09:24:24 +0200 |
|---|---|---|
| committer | Toni <jeder@mail1a.de> | 2016-08-13 09:24:24 +0200 |
| commit | e0aa2169055f554a3cb87208b1e73a6b2707405b (patch) | |
| tree | 6c74a1f7284f385b99a231ef0c1c805fab1083e5 /tmk_core/common | |
| parent | cafa528b88c097f02ae92a5b15b015f5653cefe7 (diff) | |
| parent | 098951905d527c19043de75ef262ac9679ec452b (diff) | |
Merge remote-tracking branch 'origin/master' into iso_split_rshift
update from Upstream
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 |