diff options
| author | Ryan Caltabiano <rcalt2vt@gmail.com> | 2019-04-16 18:36:55 -0500 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-04-20 08:05:10 -0700 |
| commit | dd3a813f871b911012da55a499955307c309a7a5 (patch) | |
| tree | 80df58d039a9b20283057809925a2351121135d5 /keyboards/zen | |
| parent | 0a645225b9c863a106921185a6c2e0c340f10694 (diff) | |
Reducing size of data send in one frame & update Zen rev2 oled usage
Diffstat (limited to 'keyboards/zen')
| -rw-r--r-- | keyboards/zen/rev2/config.h | 13 | ||||
| -rw-r--r-- | keyboards/zen/rev2/rev2.c | 8 | ||||
| -rw-r--r-- | keyboards/zen/rev2/rules.mk | 7 |
3 files changed, 5 insertions, 23 deletions
diff --git a/keyboards/zen/rev2/config.h b/keyboards/zen/rev2/config.h index dc37472f6b..5fa2627602 100644 --- a/keyboards/zen/rev2/config.h +++ b/keyboards/zen/rev2/config.h @@ -66,19 +66,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* ws2812 RGB LED */ #define RGBLED_NUM 34 // Number of LEDs -// If using 90 Degree rotation, increase block cout -#ifdef OLED_ROTATE90 - #define OLED_DISPLAY_CUSTOM - #define OLED_DISPLAY_WIDTH 128 - #define OLED_DISPLAY_HEIGHT 32 - #define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH) // 512 (compile time mathed) - #define OLED_BLOCK_TYPE uint16_t // Type to use for segmenting the oled display for smart rendering, use unsigned types only - #define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8) // 8 (compile time mathed) - #define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT) // 32 (compile time mathed) - #define OLED_SOURCE_MAP { 0, 8, 16, 24 } - #define OLED_TARGET_MAP { 24, 16, 8, 0 } -#endif - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/zen/rev2/rev2.c b/keyboards/zen/rev2/rev2.c index 4104460db1..7bd8efbdd0 100644 --- a/keyboards/zen/rev2/rev2.c +++ b/keyboards/zen/rev2/rev2.c @@ -47,11 +47,11 @@ void render_status(void) { oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR(" "), false); // Line 16 } -#ifdef OLED_ROTATE90 -bool oled_init_user(bool flip180) { - return true; +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + if (is_keyboard_master()) + return OLED_ROTATION_90; // flips the display 90 degrees if mainhand + return rotation; } -#endif __attribute__((weak)) void oled_task_user(void) { diff --git a/keyboards/zen/rev2/rules.mk b/keyboards/zen/rev2/rules.mk index d1fe410525..e9d19a69aa 100644 --- a/keyboards/zen/rev2/rules.mk +++ b/keyboards/zen/rev2/rules.mk @@ -1,14 +1,9 @@ ENCODER_ENABLE = yes OLED_DRIVER_ENABLE = no -OLED_ROTATE90 = yes -# Setup so that OLED and 90 degree rotation can be turned on/off easily -# with "OLED_DRIVER_ENABLE = yes" or "OLED_ROTATE90 = no" in user's rules.mk file +# Setup so that OLED can be turned on/off easily ifeq ($(strip $(OLED_DRIVER_ENABLE)), yes) # Custom local font file OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" - ifeq ($(strip $(OLED_DRIVER_ENABLE)), yes) - OPT_DEFS += -DOLED_ROTATE90 - endif endif |