diff options
author | Drashna Jaelre <drashna@live.com> | 2019-09-03 08:34:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-03 08:34:31 -0700 |
commit | dab4967f1bebc9a70374ed3e1fe7906828b280c2 (patch) | |
tree | 3008882538fe229273fe9b8d5be662a951460f33 /quantum | |
parent | 9f46606dff2f52f31c6c36a63035cfb75824276a (diff) | |
download | qmk_firmware-dab4967f1bebc9a70374ed3e1fe7906828b280c2.tar.gz qmk_firmware-dab4967f1bebc9a70374ed3e1fe7906828b280c2.zip |
Add Dip Switch as a core feature (#6140)
* Add Dip Switches as a core feature
* Add documentation for Dip Switch feature
* Update Preonic Rev3 to use new feature and remove custom matrix
* Apply suggestions from code review
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
* Remove custom matrix line completely
Rather than just disabling it
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* DIP changes
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Use better check for DIP Switch configuration
* Add to show features
* Add bitmask callback for dip switch
* Fix OLKB Boards dip switch config
* Update docs to include bitmask example
* Fix comments/documentation
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Fix issues with docs and use example from @tuzonghua
* Fix wording
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Fix example to use proper formatting
Bad, BAAAAAAD drashna!!!
* Handle dip switch initialization better
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/dip_switch.c | 71 | ||||
-rw-r--r-- | quantum/dip_switch.h | 29 | ||||
-rw-r--r-- | quantum/quantum.c | 8 | ||||
-rw-r--r-- | quantum/quantum.h | 5 |
4 files changed, 113 insertions, 0 deletions
diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c new file mode 100644 index 000000000..3b5a8dadc --- /dev/null +++ b/quantum/dip_switch.c | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | * Copyright 2018 Jack Humbert <jack.humb@gmail.com> | ||
3 | * Copyright 2019 Drashna Jaelre (Christopher Courtney) <drashna@live.com> | ||
4 | * | ||
5 | * This program is free software: you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation, either version 2 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | */ | ||
18 | |||
19 | #include "dip_switch.h" | ||
20 | |||
21 | // for memcpy | ||
22 | #include <string.h> | ||
23 | |||
24 | |||
25 | #if !defined(DIP_SWITCH_PINS) | ||
26 | # error "No DIP switch pads defined by DIP_SWITCH_PINS" | ||
27 | #endif | ||
28 | |||
29 | #define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad)/sizeof(pin_t)) | ||
30 | static pin_t dip_switch_pad[] = DIP_SWITCH_PINS; | ||
31 | static bool dip_switch_state[NUMBER_OF_DIP_SWITCHES] = { 0 }; | ||
32 | static bool last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = { 0 }; | ||
33 | |||
34 | |||
35 | __attribute__((weak)) | ||
36 | void dip_switch_update_user(uint8_t index, bool active) {} | ||
37 | |||
38 | __attribute__((weak)) | ||
39 | void dip_switch_update_kb(uint8_t index, bool active) { dip_switch_update_user(index, active); } | ||
40 | |||
41 | __attribute__((weak)) | ||
42 | void dip_switch_update_mask_user(uint32_t state) {} | ||
43 | |||
44 | __attribute__((weak)) | ||
45 | void dip_switch_update_mask_kb(uint32_t state) { dip_switch_update_mask_user(state); } | ||
46 | |||
47 | void dip_switch_init(void) { | ||
48 | for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) { | ||
49 | setPinInputHigh(dip_switch_pad[i]); | ||
50 | } | ||
51 | dip_switch_read(true); | ||
52 | } | ||
53 | |||
54 | |||
55 | void dip_switch_read(bool forced) { | ||
56 | bool has_dip_state_changed = false; | ||
57 | uint32_t dip_switch_mask = 0; | ||
58 | |||
59 | for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) { | ||
60 | dip_switch_state[i] = !readPin(dip_switch_pad[i]); | ||
61 | dip_switch_mask |= dip_switch_state[i] << i; | ||
62 | if (last_dip_switch_state[i] ^ dip_switch_state[i] || forced) { | ||
63 | has_dip_state_changed = true; | ||
64 | dip_switch_update_kb(i, dip_switch_state[i]); | ||
65 | } | ||
66 | } | ||
67 | if (has_dip_state_changed) { | ||
68 | dip_switch_update_mask_kb(dip_switch_mask); | ||
69 | } | ||
70 | memcpy(last_dip_switch_state, dip_switch_state, sizeof(&dip_switch_state)); | ||
71 | } | ||
diff --git a/quantum/dip_switch.h b/quantum/dip_switch.h new file mode 100644 index 000000000..61ef1cc19 --- /dev/null +++ b/quantum/dip_switch.h | |||
@@ -0,0 +1,29 @@ | |||
1 | /* | ||
2 | * Copyright 2018 Jack Humbert <jack.humb@gmail.com> | ||
3 | * Copyright 2018 Drashna Jaelre (Christopher Courtney) <drashna@live.com> | ||
4 | * | ||
5 | * This program is free software: you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation, either version 2 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | */ | ||
18 | |||
19 | #pragma once | ||
20 | |||
21 | #include "quantum.h" | ||
22 | |||
23 | void dip_switch_update_kb(uint8_t index, bool active); | ||
24 | void dip_switch_update_user(uint8_t index, bool active); | ||
25 | void dip_switch_update_mask_user(uint32_t state); | ||
26 | void dip_switch_update_mask_kb(uint32_t state); | ||
27 | |||
28 | void dip_switch_init(void); | ||
29 | void dip_switch_read(bool forced); | ||
diff --git a/quantum/quantum.c b/quantum/quantum.c index 61e9003b7..85a03377f 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
@@ -967,6 +967,10 @@ void matrix_init_quantum() { | |||
967 | #ifdef OUTPUT_AUTO_ENABLE | 967 | #ifdef OUTPUT_AUTO_ENABLE |
968 | set_output(OUTPUT_AUTO); | 968 | set_output(OUTPUT_AUTO); |
969 | #endif | 969 | #endif |
970 | #ifdef DIP_SWITCH_ENABLE | ||
971 | dip_switch_init(); | ||
972 | #endif | ||
973 | |||
970 | matrix_init_kb(); | 974 | matrix_init_kb(); |
971 | } | 975 | } |
972 | 976 | ||
@@ -1003,6 +1007,10 @@ void matrix_scan_quantum() { | |||
1003 | haptic_task(); | 1007 | haptic_task(); |
1004 | #endif | 1008 | #endif |
1005 | 1009 | ||
1010 | #ifdef DIP_SWITCH_ENABLE | ||
1011 | dip_switch_read(false); | ||
1012 | #endif | ||
1013 | |||
1006 | matrix_scan_kb(); | 1014 | matrix_scan_kb(); |
1007 | } | 1015 | } |
1008 | #if defined(BACKLIGHT_ENABLE) && (defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)) | 1016 | #if defined(BACKLIGHT_ENABLE) && (defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)) |
diff --git a/quantum/quantum.h b/quantum/quantum.h index 066113590..f5ac97379 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h | |||
@@ -145,6 +145,11 @@ extern layer_state_t layer_state; | |||
145 | # include "oled_driver.h" | 145 | # include "oled_driver.h" |
146 | #endif | 146 | #endif |
147 | 147 | ||
148 | #ifdef DIP_SWITCH_ENABLE | ||
149 | #include "dip_switch.h" | ||
150 | #endif | ||
151 | |||
152 | |||
148 | // Function substitutions to ease GPIO manipulation | 153 | // Function substitutions to ease GPIO manipulation |
149 | #if defined(__AVR__) | 154 | #if defined(__AVR__) |
150 | typedef uint8_t pin_t; | 155 | typedef uint8_t pin_t; |