From 2881f53dd49d3fe70fefe9f05a618ac713c8529b Mon Sep 17 00:00:00 2001
From: Jonas Avellana <14019120+ninjonas@users.noreply.github.com>
Date: Mon, 7 Oct 2019 11:42:03 -0600
Subject: [Keymap] updating ninjonas userspace (#6903)

* [refactor] updating ninjonas layout blocks and standardized LOWER & ADJUST

* [feat] added new macro M_TERM to open MacOS terminal app

* [feat] introducing mod-tap functionality on keymap

* [fix] fixing oled turning on when it feels like it. thanks @drashna for helping

* [feat] updating OLED to rotate logo 180 degrees

* [feat] updating keymaps to reflect VSCode frequent habits

* [refactor] converting crkbd modifier keys to layer blocks

* [fix(#6903)] converting _delay_ms to wait_ms on launching terminal macro
---
 users/ninjonas/oled.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'users/ninjonas/oled.c')

diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c
index 8a9c99593..721038e15 100644
--- a/users/ninjonas/oled.c
+++ b/users/ninjonas/oled.c
@@ -4,12 +4,19 @@
 
 #ifdef OLED_DRIVER_ENABLE
 
-static uint16_t oled_timer = 0;
+static uint32_t oled_timer = 0;
 extern uint8_t is_master;
 
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (is_master) {
+    return OLED_ROTATION_0;
+  }
+  return OLED_ROTATION_180;
+}
+
 bool process_record_oled(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-        oled_timer = timer_read();
+        oled_timer = timer_read32();
     }
     return true;
 }
@@ -64,7 +71,7 @@ static void render_logo(void) {
 }
 
 void oled_task_user(void) {
-    if (timer_elapsed(oled_timer) > 30000) {
+    if (timer_elapsed32(oled_timer) > 30000) {
         oled_off();
         return;
     }
@@ -75,8 +82,8 @@ void oled_task_user(void) {
     if (is_master) {
         render_status();
     } else {
-        oled_write_P(PSTR("\n"), false);
         render_logo();
+        oled_write_P(PSTR("\n"), false);
         oled_scroll_left();
     }
 }
-- 
cgit v1.2.3