diff options
| author | QMK Bot <hello@qmk.fm> | 2022-03-04 03:57:31 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-03-04 03:57:31 +0000 |
| commit | bcd4f34b266aca6fd52b9861e3ddfbdd8e8d18b2 (patch) | |
| tree | 0fe8a22139289aac2b5d235d7a77acf20fb2f469 | |
| parent | 9958f9e1470b93b492e374e185b8afb22d50b22a (diff) | |
| parent | d412854e37a53d35e567af3dc5c452d64c570fdd (diff) | |
| download | qmk_firmware-bcd4f34b266aca6fd52b9861e3ddfbdd8e8d18b2.tar.gz qmk_firmware-bcd4f34b266aca6fd52b9861e3ddfbdd8e8d18b2.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | drivers/sensors/analog_joystick.c | 2 | ||||
| -rw-r--r-- | platforms/avr/drivers/analog.c | 3 | ||||
| -rw-r--r-- | platforms/avr/drivers/analog.h | 2 | ||||
| -rw-r--r-- | platforms/chibios/drivers/analog.c | 1 | ||||
| -rw-r--r-- | platforms/chibios/drivers/analog.h | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c index 95f8cff23a..12256a8e7a 100644 --- a/drivers/sensors/analog_joystick.c +++ b/drivers/sensors/analog_joystick.c @@ -18,6 +18,8 @@ #include "analog.h" #include "gpio.h" #include "wait.h" +#include "timer.h" +#include <stdlib.h> // Set Parameters uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN; diff --git a/platforms/avr/drivers/analog.c b/platforms/avr/drivers/analog.c index ed4d563609..a68c6a371d 100644 --- a/platforms/avr/drivers/analog.c +++ b/platforms/avr/drivers/analog.c @@ -14,9 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <avr/io.h> -#include <avr/pgmspace.h> -#include <stdint.h> #include "analog.h" static uint8_t aref = ADC_REF_POWER; diff --git a/platforms/avr/drivers/analog.h b/platforms/avr/drivers/analog.h index fb13e106ff..214f1f01fb 100644 --- a/platforms/avr/drivers/analog.h +++ b/platforms/avr/drivers/analog.h @@ -17,7 +17,7 @@ #pragma once #include <stdint.h> -#include "quantum.h" +#include "gpio.h" #ifdef __cplusplus extern "C" { diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c index 48a59fd290..a7b7ec76d7 100644 --- a/platforms/chibios/drivers/analog.c +++ b/platforms/chibios/drivers/analog.c @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "quantum.h" #include "analog.h" #include <ch.h> #include <hal.h> diff --git a/platforms/chibios/drivers/analog.h b/platforms/chibios/drivers/analog.h index 8a821719e3..67a7b466a5 100644 --- a/platforms/chibios/drivers/analog.h +++ b/platforms/chibios/drivers/analog.h @@ -17,7 +17,7 @@ #pragma once #include <stdint.h> -#include "quantum.h" +#include "gpio.h" #ifdef __cplusplus extern "C" { |