diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/bcat/rules.mk | 2 | ||||
| -rw-r--r-- | users/curry/oled.c | 3 | ||||
| -rw-r--r-- | users/drashna/oled_stuff.c | 5 | ||||
| -rw-r--r-- | users/ninjonas/oled.c | 3 | ||||
| -rw-r--r-- | users/nstickney/rules.mk | 3 | ||||
| -rw-r--r-- | users/riblee/riblee.c | 7 | ||||
| -rw-r--r-- | users/ridingqwerty/rules.mk | 2 | ||||
| -rw-r--r-- | users/snowe/oled_setup.c | 3 | ||||
| -rw-r--r-- | users/spidey3/rules.mk | 2 | ||||
| -rw-r--r-- | users/talljoe/rules.mk | 2 | ||||
| -rw-r--r-- | users/talljoe/visualizer.c | 21 | ||||
| -rw-r--r-- | users/tominabox1/rules.mk | 2 | ||||
| -rw-r--r-- | users/tominabox1/tominabox1.c | 3 | ||||
| -rw-r--r-- | users/wanleg/rules.mk | 4 | ||||
| -rw-r--r-- | users/xulkal/custom_oled.c | 3 | ||||
| -rw-r--r-- | users/yanfali/rules.mk | 2 | 
16 files changed, 26 insertions, 41 deletions
| diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk index 651ee96fe0..12c9a89bf4 100644 --- a/users/bcat/rules.mk +++ b/users/bcat/rules.mk @@ -1,7 +1,7 @@  SRC += bcat.c  # Enable Bootmagic Lite to consistently reset to bootloader and clear EEPROM. -BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite  # Enable media keys on all keyboards.  EXTRAKEY_ENABLE = yes diff --git a/users/curry/oled.c b/users/curry/oled.c index fc87a46e50..27f6072ff1 100644 --- a/users/curry/oled.c +++ b/users/curry/oled.c @@ -137,7 +137,7 @@ void render_status_secondary(void) {      render_keylogger_status();  } -void oled_task_user(void) { +bool oled_task_user(void) {      if (timer_elapsed32(oled_timer) > 30000) {          oled_off();          return; @@ -152,6 +152,7 @@ void oled_task_user(void) {      } else {          render_status_secondary();      } +    return false;  }  bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { diff --git a/users/drashna/oled_stuff.c b/users/drashna/oled_stuff.c index 4b54919507..69d1d64b79 100644 --- a/users/drashna/oled_stuff.c +++ b/users/drashna/oled_stuff.c @@ -421,13 +421,13 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {      return oled_init_keymap(rotation);  } -void oled_task_user(void) { +bool oled_task_user(void) {      update_log();      if (is_keyboard_master()) {          if (timer_elapsed32(oled_timer) > 30000) {              oled_off(); -            return; +            return false;          } else {              oled_on();          } @@ -442,4 +442,5 @@ void oled_task_user(void) {      } else {          render_keylock_status(host_keyboard_leds());      } +    return false;  } diff --git a/users/ninjonas/oled.c b/users/ninjonas/oled.c index 1d88c30579..55eaf88ccb 100644 --- a/users/ninjonas/oled.c +++ b/users/ninjonas/oled.c @@ -90,7 +90,7 @@ static void render_logo(void) {    oled_write_P(qmk_logo, false);  } -void oled_task_user(void) { +bool oled_task_user(void) {      if (timer_elapsed32(oled_timer) > 15000) {          oled_off();          return; @@ -106,6 +106,7 @@ void oled_task_user(void) {          oled_write_P(PSTR("\n"), false);          oled_scroll_left();      } +    return false;  }  #endif diff --git a/users/nstickney/rules.mk b/users/nstickney/rules.mk index 0f189e8a4f..cad245cc24 100644 --- a/users/nstickney/rules.mk +++ b/users/nstickney/rules.mk @@ -25,9 +25,8 @@ UCIS_ENABLE = no  LTO_ENABLE = yes  # https://beta.docs.qmk.fm/developing-qmk/qmk-reference/getting_started_make_guide#rules-mk-options -API_SYSEX_ENABLE = no  AUDIO_ENABLE = no -BOOTMAGIC_ENABLE = no +BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite  COMMAND_ENABLE = no  CONSOLE_ENABLE = no  MOUSEKEY_ENABLE  = no diff --git a/users/riblee/riblee.c b/users/riblee/riblee.c index 04e37b2428..307c697204 100644 --- a/users/riblee/riblee.c +++ b/users/riblee/riblee.c @@ -245,10 +245,9 @@ static void render_info(void) {      }      // Print string received via HID RAW -    oled_write_ln(receive_buffer, false); -} +    oled_write_ln(receive_buffer, false);} -void oled_task_user(void) { +bool oled_task_user(void) {      static bool finished_timer = false;      if (!finished_timer && (timer_elapsed(startup_timer) < 1000)) {          render_logo(); @@ -259,6 +258,8 @@ void oled_task_user(void) {          }          render_info();      } +    return false; +  }  #ifdef RAW_ENABLE diff --git a/users/ridingqwerty/rules.mk b/users/ridingqwerty/rules.mk index 93b88068ed..cc53f3f53e 100644 --- a/users/ridingqwerty/rules.mk +++ b/users/ridingqwerty/rules.mk @@ -1,7 +1,7 @@  SRC += ridingqwerty.c \         process_records.c -BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite  CONSOLE_ENABLE    = no  COMMAND_ENABLE    = no  UNICODE_ENABLE    = no # "yes" in Atreus default keymap, blocking UNICODEMAP_ENABLE diff --git a/users/snowe/oled_setup.c b/users/snowe/oled_setup.c index 3d21ea9f0a..dfc4b085e3 100644 --- a/users/snowe/oled_setup.c +++ b/users/snowe/oled_setup.c @@ -121,7 +121,7 @@ void render_bootmagic_status(void) {      oled_write_ln(wpm, false);  } -void oled_task_user(void) { +bool oled_task_user(void) {      if (is_master) {          oled_render_layer_state();          oled_render_keylog(); @@ -136,6 +136,7 @@ void oled_task_user(void) {          render_stars();  #    endif      } +    return false;  }  #endif  // OLED_ENABLE diff --git a/users/spidey3/rules.mk b/users/spidey3/rules.mk index 69327038b7..de8ed113e7 100644 --- a/users/spidey3/rules.mk +++ b/users/spidey3/rules.mk @@ -1,4 +1,4 @@ -BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite  CONSOLE_ENABLE = yes   # Console for debug  BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality  LTO_ENABLE = yes diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk index 632e725b71..9338568b97 100644 --- a/users/talljoe/rules.mk +++ b/users/talljoe/rules.mk @@ -13,4 +13,4 @@ TAP_DANCE_ENABLE=yes  CONSOLE_ENABLE=no  COMMAND_ENABLE=no  DYNAMIC_KEYMAP_ENABLE=no -BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite diff --git a/users/talljoe/visualizer.c b/users/talljoe/visualizer.c deleted file mode 100644 index c17b56706b..0000000000 --- a/users/talljoe/visualizer.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Joseph Wasson - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program.  If not, see <http://www.gnu.org/licenses/>. - */ - -#include "talljoe.h" - -static void get_visualizer_layer_and_color(visualizer_state_t* state) { -  state->status_text = layer_names[biton32(state->status.layer)]; -} diff --git a/users/tominabox1/rules.mk b/users/tominabox1/rules.mk index 160dcce7b9..1df5634640 100644 --- a/users/tominabox1/rules.mk +++ b/users/tominabox1/rules.mk @@ -5,7 +5,7 @@  CONSOLE_ENABLE = no  TAP_DANCE_ENABLE = yes  NKRO_ENABLE = yes -BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite  ifeq ($(strip $(KEYBOARD)), crkbd/rev1)  RGB_MATRIX_ENABLE = yes diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c index e48959be9d..7322ead0dc 100644 --- a/users/tominabox1/tominabox1.c +++ b/users/tominabox1/tominabox1.c @@ -262,7 +262,7 @@ void render_status_main(void) {  __attribute__ ((weak))  void oled_task_keymap(void) {} -void oled_task_user(void) { +bool oled_task_user(void) {      if (timer_elapsed(oled_timer) > 20000) {          oled_off(); @@ -275,6 +275,7 @@ void oled_task_user(void) {              oled_scroll_left();          }          oled_task_keymap(); +        return false;      }  #endif // OLED_Driver diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk index eb66a49e6f..410803512d 100644 --- a/users/wanleg/rules.mk +++ b/users/wanleg/rules.mk @@ -21,8 +21,8 @@ ifeq ($(strip $(BT)), yes)    #opt_defs for alternate pin usage    OPT_DEFS += -DBLUEFRUIT    #Adafruit Bluefruit controller settings -  BLUETOOTH = AdafruitBLE    BLUETOOTH_ENABLE = yes +  BLUETOOTH_DRIVER = AdafruitBLE    F_CPU = 8000000    CONSOLE_ENABLE = no 		# Console for debug(+400)    COMMAND_ENABLE = no 		# Commands for debug and configuration @@ -42,4 +42,4 @@ endif  #example usage: make gherkin:wanleg flip=yes  ifeq ($(strip $(flip)), yes)  	OPT_DEFS += -DFLIP -endif
\ No newline at end of file +endif diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c index 4ed2b9a0b0..7fe8040927 100644 --- a/users/xulkal/custom_oled.c +++ b/users/xulkal/custom_oled.c @@ -176,7 +176,7 @@ static void render_status(void)  #endif // OLED_90ROTATION -void oled_task_user(void) +bool oled_task_user(void)  {      if (is_keyboard_master())          render_status(); @@ -185,4 +185,5 @@ void oled_task_user(void)          render_logo();          oled_scroll_left();      } +    return false;  } diff --git a/users/yanfali/rules.mk b/users/yanfali/rules.mk index 631dda4fb3..6c0c48c764 100644 --- a/users/yanfali/rules.mk +++ b/users/yanfali/rules.mk @@ -1,4 +1,4 @@ -BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite  DYNAMIC_KEYMAP_ENABLE = no  LTO_ENABLE = yes  AUDIO_ENABLE = no | 
