diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-01-19 11:13:39 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-19 11:13:39 +1100 |
| commit | baecc69da5c6fc9961392f77e5a7d8d2e095b69a (patch) | |
| tree | 8a021a2da8d3fa28738cdee7ccf38870ebe16bb6 | |
| parent | 4723f308adb7d1d4a4136722e2f576a398695559 (diff) | |
Add support for current/voltage measurement on Ghoul. (#19630)
| -rw-r--r-- | keyboards/tzarc/ghoul/rev1/rp2040/config.h | 4 | ||||
| -rw-r--r-- | keyboards/tzarc/ghoul/rev1/rp2040/halconf.h | 2 | ||||
| -rw-r--r-- | keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h | 4 | ||||
| -rw-r--r-- | keyboards/tzarc/ghoul/rev1/stm32/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/tzarc/ghoul/rules.mk | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/config.h b/keyboards/tzarc/ghoul/rev1/rp2040/config.h index c428b26606..43379b5763 100644 --- a/keyboards/tzarc/ghoul/rev1/rp2040/config.h +++ b/keyboards/tzarc/ghoul/rev1/rp2040/config.h @@ -28,8 +28,8 @@ #define RGB_ENABLE_PIN GP6 // ADC Configuration -#define ADC_RESOLUTION ? ? ? // ADC_CFGR1_RES_12BIT // TBD when RP2040 has analog support -#define ADC_SATURATION ? ? ? // ((1 << 12) - 1) // TBD when RP2040 has analog support +#define ADC_RESOLUTION 12 +#define ADC_SATURATION ((1 << 12) - 1) #define ADC_CURRENT_PIN GP26 #define ADC_VOLTAGE_PIN GP27 diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h index a22be02412..73389ef1b1 100644 --- a/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h +++ b/keyboards/tzarc/ghoul/rev1/rp2040/halconf.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -//#define HAL_USE_ADC TRUE +#define HAL_USE_ADC TRUE #define HAL_USE_SPI TRUE #include_next <halconf.h> diff --git a/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h index abd4e19f7c..19d7f9be0e 100644 --- a/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h +++ b/keyboards/tzarc/ghoul/rev1/rp2040/mcuconf.h @@ -5,8 +5,8 @@ #include_next <mcuconf.h> // Used for RGB -//#undef RP_ADC_USE_ADC1 -//#define RP_ADC_USE_ADC1 TRUE +#undef RP_ADC_USE_ADC1 +#define RP_ADC_USE_ADC1 TRUE // Used for EEPROM #undef RP_SPI_USE_SPI0 diff --git a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk index 69d4b426e1..c1285e300c 100644 --- a/keyboards/tzarc/ghoul/rev1/stm32/rules.mk +++ b/keyboards/tzarc/ghoul/rev1/stm32/rules.mk @@ -1,2 +1 @@ WS2812_DRIVER = pwm -SRC += analog.c diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk index a56726860d..a18cf56fce 100644 --- a/keyboards/tzarc/ghoul/rules.mk +++ b/keyboards/tzarc/ghoul/rules.mk @@ -5,3 +5,5 @@ QUANTUM_PAINTER_DRIVERS = ssd1351_spi OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32 + +SRC += analog.c |