diff options
author | Ryan <fauxpark@gmail.com> | 2020-03-24 14:32:23 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-24 03:32:23 +0000 |
commit | 297aad6ebd8577e826ea738cde25207a61337dc0 (patch) | |
tree | fe9250a52c968dbf685758e507ef6a92546d89a2 | |
parent | 8f69983c58e7c8025d55ccdb31bcf570158f5433 (diff) | |
download | qmk_firmware-297aad6ebd8577e826ea738cde25207a61337dc0.tar.gz qmk_firmware-297aad6ebd8577e826ea738cde25207a61337dc0.zip |
Set backlight and RGB pins for AVR onekeys (#8533)
* Set backlight and RGB pins for AVR onekeys
* Set pin for ADC as well
* Define ADC_PIN for F4 blackpills
* Use A0 for F4 ADCs
* Set ADC pins for F0 and F1
-rw-r--r-- | keyboards/handwired/onekey/blackpill_f401/config.h | 2 | ||||
-rw-r--r-- | keyboards/handwired/onekey/blackpill_f411/config.h | 2 | ||||
-rw-r--r-- | keyboards/handwired/onekey/bluepill/config.h | 2 | ||||
-rw-r--r-- | keyboards/handwired/onekey/elite_c/config.h | 6 | ||||
-rw-r--r-- | keyboards/handwired/onekey/keymaps/adc/config.h | 1 | ||||
-rw-r--r-- | keyboards/handwired/onekey/keymaps/adc/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/handwired/onekey/promicro/config.h | 6 | ||||
-rw-r--r-- | keyboards/handwired/onekey/proton_c/config.h | 8 | ||||
-rw-r--r-- | keyboards/handwired/onekey/stm32f0_disco/config.h | 2 | ||||
-rw-r--r-- | keyboards/handwired/onekey/teensy_2/config.h | 6 | ||||
-rw-r--r-- | keyboards/handwired/onekey/teensy_2pp/config.h | 10 |
11 files changed, 39 insertions, 10 deletions
diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h index 01555e431..c6166380c 100644 --- a/keyboards/handwired/onekey/blackpill_f401/config.h +++ b/keyboards/handwired/onekey/blackpill_f401/config.h | |||
@@ -27,3 +27,5 @@ | |||
27 | #define BACKLIGHT_PWM_CHANNEL 1 | 27 | #define BACKLIGHT_PWM_CHANNEL 1 |
28 | 28 | ||
29 | #define RGB_DI_PIN A1 | 29 | #define RGB_DI_PIN A1 |
30 | |||
31 | #define ADC_PIN A0 | ||
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h index 01555e431..c6166380c 100644 --- a/keyboards/handwired/onekey/blackpill_f411/config.h +++ b/keyboards/handwired/onekey/blackpill_f411/config.h | |||
@@ -27,3 +27,5 @@ | |||
27 | #define BACKLIGHT_PWM_CHANNEL 1 | 27 | #define BACKLIGHT_PWM_CHANNEL 1 |
28 | 28 | ||
29 | #define RGB_DI_PIN A1 | 29 | #define RGB_DI_PIN A1 |
30 | |||
31 | #define ADC_PIN A0 | ||
diff --git a/keyboards/handwired/onekey/bluepill/config.h b/keyboards/handwired/onekey/bluepill/config.h index 01555e431..c6166380c 100644 --- a/keyboards/handwired/onekey/bluepill/config.h +++ b/keyboards/handwired/onekey/bluepill/config.h | |||
@@ -27,3 +27,5 @@ | |||
27 | #define BACKLIGHT_PWM_CHANNEL 1 | 27 | #define BACKLIGHT_PWM_CHANNEL 1 |
28 | 28 | ||
29 | #define RGB_DI_PIN A1 | 29 | #define RGB_DI_PIN A1 |
30 | |||
31 | #define ADC_PIN A0 | ||
diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h index fbcd630d7..167373cd3 100644 --- a/keyboards/handwired/onekey/elite_c/config.h +++ b/keyboards/handwired/onekey/elite_c/config.h | |||
@@ -21,3 +21,9 @@ | |||
21 | #define MATRIX_COL_PINS { F4 } | 21 | #define MATRIX_COL_PINS { F4 } |
22 | #define MATRIX_ROW_PINS { F5 } | 22 | #define MATRIX_ROW_PINS { F5 } |
23 | #define UNUSED_PINS | 23 | #define UNUSED_PINS |
24 | |||
25 | #define BACKLIGHT_PIN B6 | ||
26 | |||
27 | #define RGB_DI_PIN F6 | ||
28 | |||
29 | #define ADC_PIN F6 | ||
diff --git a/keyboards/handwired/onekey/keymaps/adc/config.h b/keyboards/handwired/onekey/keymaps/adc/config.h deleted file mode 100644 index 6f70f09be..000000000 --- a/keyboards/handwired/onekey/keymaps/adc/config.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #pragma once | ||
diff --git a/keyboards/handwired/onekey/keymaps/adc/keymap.c b/keyboards/handwired/onekey/keymaps/adc/keymap.c index c5294bbc3..6626894fa 100644 --- a/keyboards/handwired/onekey/keymaps/adc/keymap.c +++ b/keyboards/handwired/onekey/keymaps/adc/keymap.c | |||
@@ -2,10 +2,6 @@ | |||
2 | #include "analog.h" | 2 | #include "analog.h" |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | 4 | ||
5 | #ifndef ADC_PIN | ||
6 | # define ADC_PIN A0 | ||
7 | #endif | ||
8 | |||
9 | enum custom_keycodes { | 5 | enum custom_keycodes { |
10 | ADC_SAMPLE = SAFE_RANGE, | 6 | ADC_SAMPLE = SAFE_RANGE, |
11 | }; | 7 | }; |
diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h index fbcd630d7..167373cd3 100644 --- a/keyboards/handwired/onekey/promicro/config.h +++ b/keyboards/handwired/onekey/promicro/config.h | |||
@@ -21,3 +21,9 @@ | |||
21 | #define MATRIX_COL_PINS { F4 } | 21 | #define MATRIX_COL_PINS { F4 } |
22 | #define MATRIX_ROW_PINS { F5 } | 22 | #define MATRIX_ROW_PINS { F5 } |
23 | #define UNUSED_PINS | 23 | #define UNUSED_PINS |
24 | |||
25 | #define BACKLIGHT_PIN B6 | ||
26 | |||
27 | #define RGB_DI_PIN F6 | ||
28 | |||
29 | #define ADC_PIN F6 | ||
diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h index fe34f94ad..3ba4ba649 100644 --- a/keyboards/handwired/onekey/proton_c/config.h +++ b/keyboards/handwired/onekey/proton_c/config.h | |||
@@ -18,8 +18,8 @@ | |||
18 | 18 | ||
19 | #include "config_common.h" | 19 | #include "config_common.h" |
20 | 20 | ||
21 | #define MATRIX_COL_PINS { A3 } | 21 | #define MATRIX_COL_PINS { A2 } |
22 | #define MATRIX_ROW_PINS { A2 } | 22 | #define MATRIX_ROW_PINS { A1 } |
23 | #define UNUSED_PINS | 23 | #define UNUSED_PINS |
24 | 24 | ||
25 | #define BACKLIGHT_PIN B8 | 25 | #define BACKLIGHT_PIN B8 |
@@ -27,4 +27,6 @@ | |||
27 | #define BACKLIGHT_PWM_CHANNEL 3 | 27 | #define BACKLIGHT_PWM_CHANNEL 3 |
28 | #define BACKLIGHT_PAL_MODE 2 | 28 | #define BACKLIGHT_PAL_MODE 2 |
29 | 29 | ||
30 | #define RGB_DI_PIN A1 | 30 | #define RGB_DI_PIN A0 |
31 | |||
32 | #define ADC_PIN A0 | ||
diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h index 637ed65d3..0d6dd18fa 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/config.h +++ b/keyboards/handwired/onekey/stm32f0_disco/config.h | |||
@@ -28,3 +28,5 @@ | |||
28 | #define BACKLIGHT_PAL_MODE 0 | 28 | #define BACKLIGHT_PAL_MODE 0 |
29 | 29 | ||
30 | #define RGB_DI_PIN B15 | 30 | #define RGB_DI_PIN B15 |
31 | |||
32 | #define ADC_PIN A0 | ||
diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h index fbcd630d7..167373cd3 100644 --- a/keyboards/handwired/onekey/teensy_2/config.h +++ b/keyboards/handwired/onekey/teensy_2/config.h | |||
@@ -21,3 +21,9 @@ | |||
21 | #define MATRIX_COL_PINS { F4 } | 21 | #define MATRIX_COL_PINS { F4 } |
22 | #define MATRIX_ROW_PINS { F5 } | 22 | #define MATRIX_ROW_PINS { F5 } |
23 | #define UNUSED_PINS | 23 | #define UNUSED_PINS |
24 | |||
25 | #define BACKLIGHT_PIN B6 | ||
26 | |||
27 | #define RGB_DI_PIN F6 | ||
28 | |||
29 | #define ADC_PIN F6 | ||
diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h index 9d993980c..167373cd3 100644 --- a/keyboards/handwired/onekey/teensy_2pp/config.h +++ b/keyboards/handwired/onekey/teensy_2pp/config.h | |||
@@ -18,6 +18,12 @@ | |||
18 | 18 | ||
19 | #include "config_common.h" | 19 | #include "config_common.h" |
20 | 20 | ||
21 | #define MATRIX_COL_PINS { B2 } | 21 | #define MATRIX_COL_PINS { F4 } |
22 | #define MATRIX_ROW_PINS { B1 } | 22 | #define MATRIX_ROW_PINS { F5 } |
23 | #define UNUSED_PINS | 23 | #define UNUSED_PINS |
24 | |||
25 | #define BACKLIGHT_PIN B6 | ||
26 | |||
27 | #define RGB_DI_PIN F6 | ||
28 | |||
29 | #define ADC_PIN F6 | ||