aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/infinity/infinity.h
diff options
context:
space:
mode:
authorjpetermans <tibcmhhm@gmail.com>2017-05-08 15:24:50 -0700
committerjpetermans <tibcmhhm@gmail.com>2017-05-08 15:24:50 -0700
commit967cf0f6d43bd05c9951c7c31190971acd0799ea (patch)
tree34ff786a7e5177c6edc48e93b69ce71132cb3cbf /keyboards/ergodox/infinity/infinity.h
parent5df74f3ba73f18f6bbd13b82a3a960c86fa592e1 (diff)
parent153eb95ab208cf5563ce2fae7ec68981b64d11ce (diff)
downloadfirmware-967cf0f6d43bd05c9951c7c31190971acd0799ea.tar.gz
firmware-967cf0f6d43bd05c9951c7c31190971acd0799ea.tar.bz2
firmware-967cf0f6d43bd05c9951c7c31190971acd0799ea.zip
Merge remote-tracking branch 'upstream/master' into user_led_configuration
Diffstat (limited to 'keyboards/ergodox/infinity/infinity.h')
-rw-r--r--keyboards/ergodox/infinity/infinity.h71
1 files changed, 41 insertions, 30 deletions
diff --git a/keyboards/ergodox/infinity/infinity.h b/keyboards/ergodox/infinity/infinity.h
index fec9e565c..73a0f4bf7 100644
--- a/keyboards/ergodox/infinity/infinity.h
+++ b/keyboards/ergodox/infinity/infinity.h
@@ -7,13 +7,38 @@ void ergodox_board_led_on(void);
void ergodox_right_led_1_on(void);
void ergodox_right_led_2_on(void);
void ergodox_right_led_3_on(void);
-void ergodox_right_led_on(uint8_t led);
+
+inline void ergodox_right_led_on(uint8_t led) {
+ switch (led) {
+ case 0:
+ ergodox_right_led_1_on();
+ break;
+ case 1:
+ ergodox_right_led_2_on();
+ break;
+ case 2:
+ ergodox_right_led_3_on();
+ break;
+ }
+}
void ergodox_board_led_off(void);
void ergodox_right_led_1_off(void);
void ergodox_right_led_2_off(void);
void ergodox_right_led_3_off(void);
-void ergodox_right_led_off(uint8_t led);
+inline void ergodox_right_led_off(uint8_t led) {
+ switch (led) {
+ case 0:
+ ergodox_right_led_1_off();
+ break;
+ case 1:
+ ergodox_right_led_2_off();
+ break;
+ case 2:
+ ergodox_right_led_3_off();
+ break;
+ }
+}
inline void ergodox_led_all_on(void)
{
@@ -31,36 +56,22 @@ inline void ergodox_led_all_off(void)
ergodox_right_led_3_off();
}
-inline void ergodox_right_led_1_set(uint8_t n){
- if (n) {
- ergodox_right_led_1_on();
- } else {
- ergodox_right_led_1_off();
- }
-}
-
-inline void ergodox_right_led_2_set(uint8_t n){
- if (n) {
- ergodox_right_led_2_on();
- } else {
- ergodox_right_led_2_off();
- }
-}
-
-inline void ergodox_right_led_3_set(uint8_t n){
- if (n) {
- ergodox_right_led_3_on();
- } else {
- ergodox_right_led_3_off();
- }
-}
+void ergodox_right_led_1_set(uint8_t n);
+void ergodox_right_led_2_set(uint8_t n);
+void ergodox_right_led_3_set(uint8_t n);
inline void ergodox_right_led_set(uint8_t led, uint8_t n){
- if (n) {
- ergodox_right_led_on(led);
- } else {
- ergodox_right_led_off(led);
- }
+ switch (led) {
+ case 0:
+ ergodox_right_led_1_set(n);
+ break;
+ case 1:
+ ergodox_right_led_2_set(n);
+ break;
+ case 2:
+ ergodox_right_led_3_set(n);
+ break;
+ }
}
inline void ergodox_led_all_set(uint8_t n) {