david
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
miryoku-merge-master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'dbbab40981'
${ noResults }
qmk_firmware/tmk_core/common
History
Takeshi ISHII dbbab40981
Refactor rgblight_reconfig.h (#7773) 
* Moved contents of rgblight_reconfig.h to rgblight_post_config.h.

In #3582, rgblight_reconfig.h had to be newly created. Now, the build system of qmk_firmware has a post_cofig feature, so that what was done in rgblight_reconfig.h can now be realized in rgblight_post_config.h.

**This commit does not change the build result.**

Testing script
```shell
  # build on master
  git checkout master
  echo master > /tmp/master_md5.txt

  # RGBLIGHT_ENABLE = no
  make HELIX=verbose helix/rev2:default:clean
  make HELIX=verbose helix/rev2:default
  md5 helix_rev2_default.hex >> /tmp/master_md5.txt

  # RGBLIGHT_ENABLE = yes, with animations
  make HELIX=verbose helix/rev2/back:default:clean
  make HELIX=verbose helix/rev2/back:default
  md5 helix_rev2_back_default.hex >> /tmp/master_md5.txt

  # RGBLIGHT_ENABLE = yes, without animations
  make HELIX=verbose,no_ani helix/rev2/back:default:clean
  make HELIX=verbose,no_ani helix/rev2/back:default
  md5 helix_rev2_back_default.hex >> /tmp/master_md5.txt

  # build on refactor_rgblight_reconfig.h
  git checkout refactor_rgblight_reconfig.h
  echo refactor_rgblight_reconfig.h > /tmp/branch_md5.txt

  # RGBLIGHT_ENABLE = no
  make HELIX=verbose helix/rev2:default:clean
  make HELIX=verbose helix/rev2:default
  md5 helix_rev2_default.hex >> /tmp/branch_md5.txt

  # RGBLIGHT_ENABLE = yes, with animations
  make HELIX=verbose helix/rev2/back:default:clean
  make HELIX=verbose helix/rev2/back:default
  md5 helix_rev2_back_default.hex >> /tmp/branch_md5.txt

  # RGBLIGHT_ENABLE = yes, without animations
  make HELIX=verbose,no_ani helix/rev2/back:default:clean
  make HELIX=verbose,no_ani helix/rev2/back:default
  md5 helix_rev2_back_default.hex >> /tmp/branch_md5.txt

  diff -u /tmp/master_md5.txt /tmp/branch_md5.txt
```

Test result:
```
--- /tmp/master_md5.txt 2020-01-03 15:42:22.000000000 +0900
+++ /tmp/branch_md5.txt 2020-01-03 15:42:42.000000000 +0900
@@ -1,4 +1,4 @@
-master
+refactor_rgblight_reconfig.h
 MD5 (helix_rev2_default.hex) = f360032edd522448366d471d8f4f8181
 MD5 (helix_rev2_back_default.hex) = 0c663acc6cccc44476b3b969ad22a48f
 MD5 (helix_rev2_back_default.hex) = e66b1195ff6d38e6e22c975b8ae42fd3
```

* Expressions that are too long are difficult to read, so wrap them.

* Edit the expression again

* remove `defined(RGBLIGHT_ANIMATIONS)` in `tmk_core/common/*/suspend.c`, `tmk_core/protocol/*/main.c`

move contents of rgblight_reconfig.h to rgblight.h.

The following changes were made to rgblight.h.

```diff
+#ifdef RGBLIGHT_USE_TIMER
 void rgblight_task(void);

 void rgblight_timer_init(void);
 void rgblight_timer_enable(void);
 void rgblight_timer_disable(void);
 void rgblight_timer_toggle(void);
+#else
+#define rgblight_task()
+#define rgblight_timer_init()
+#define rgblight_timer_enable()
+#define rgblight_timer_disable()
+#define rgblight_timer_toggle()
+#endif
```

The following changes were made to tmk_core/common/avr/suspend.c, tmk_core/common/chibios/suspend.c, tmk_core/protocol/chibios/main.c, tmk_core/protocol/lufa/lufa.c, tmk_core/protocol/vusb/main.c.

```diff
-#    ifdef RGBLIGHT_ANIMATIONS
     rgblight_timer_enable();
-#    endif
```
```diff
-#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE)
+#if defined(RGBLIGHT_ENABLE)
         rgblight_task();
 #endif
```

* remove 'defined(RGBLIGHT_ANIMATIONS)' in tmk_core/common/keyboard.c

Co-authored-by: Joel Challis <git@zvecr.com>
 		6 years ago
..
arm_atsam format code according to conventions [skip ci] 6 years ago
avr Refactor rgblight_reconfig.h (#7773) 6 years ago
chibios Refactor rgblight_reconfig.h (#7773) 6 years ago
test Add customisable EEPROM driver selection (#7274) 6 years ago
action.c 2020 February 29 Breaking Changes Update (#8064) 6 years ago
action.h Fix bug in `do_code16()` (#6935) 6 years ago
action_code.h 2020 February 29 Breaking Changes Update (#8064) 6 years ago
action_layer.c Fix LAYER_STATE_8BIT compile issues (#7304) 6 years ago
action_layer.h Fix LAYER_STATE_8BIT compile issues (#7304) 6 years ago
action_macro.c clang-format changes 6 years ago
action_macro.h clang-format changes 6 years ago
action_tapping.c format code according to conventions [skip ci] 6 years ago
action_tapping.h clang-format changes 6 years ago
action_util.c clang-format changes 6 years ago
action_util.h clang-format changes 6 years ago
bootloader.h clang-format changes 6 years ago
bootmagic.c ARM split - Add bootmagic/magic keycodes for setting handedness (#6545) 6 years ago
bootmagic.h ARM split - Add bootmagic/magic keycodes for setting handedness (#6545) 6 years ago
command.c 2020 February 29 Breaking Changes Update (#8064) 6 years ago
command.h clang-format changes 6 years ago
debug.c clang-format changes 6 years ago
debug.h clang-format changes 6 years ago
eeconfig.c Add customisable EEPROM driver selection (#7274) 6 years ago
eeconfig.h VIA Configurator Refactor (#7268) 6 years ago
eeprom.h Add customisable EEPROM driver selection (#7274) 6 years ago
host.c Run clang-format manually to fix recently changed files 6 years ago
host.h New and improved lock LED callbacks (#7215) 6 years ago
host_driver.h clang-format changes 6 years ago
keyboard.c Refactor rgblight_reconfig.h (#7773) 6 years ago
keyboard.h clang-format changes 6 years ago
keycode.h Add 4-character aliases for sendstring keycodes (#7409) 6 years ago
led.h Run clang-format manually to fix recently changed files 6 years ago
magic.c clang-format changes 6 years ago
magic.h
…
matrix.h Allow 30us matrix delay to be keyboard/user overridable (#8216) 6 years ago
mousekey.c clang-format changes 6 years ago
mousekey.h clang-format changes 6 years ago
nodebug.h clang-format changes 6 years ago
print.c clang-format changes 6 years ago
print.h Remove mbed files (#7605) 6 years ago
progmem.h Clean up includes for glcdfont headers (#7745) 6 years ago
raw_hid.h clang-format changes 6 years ago
report.c clang-format changes 6 years ago
report.h Use function for KEYCODE2 routines instead of macro. (#8101) 6 years ago
sendchar.h clang-format changes 6 years ago
sendchar_null.c clang-format changes 6 years ago
sendchar_uart.c clang-format changes 6 years ago
sleep_led.h clang-format changes 6 years ago
suspend.h clang-format changes 6 years ago
timer.h 2020 February 29 Breaking Changes Update (#8064) 6 years ago
uart.c format code according to conventions [skip ci] 6 years ago
uart.h clang-format changes 6 years ago
util.c clang-format changes 6 years ago
util.h Wrap util.h functions in `extern "C"` (#6762) 6 years ago
virtser.h
…
wait.h Remove mbed files (#7605) 6 years ago