mirrors/qmk_firmware
1
0
Fork 1
mirror of https://github.com/qmk/qmk_firmware synced 2024-11-14 07:55:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2022-03-04 03:57:31 +00:00
commit bcd4f34b26
5 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/sensors/analog_joystick.c
View file

@ -18,6 +18,8 @@
#include "analog.h" #include "analog.h"
#include "gpio.h" #include "gpio.h"
#include "wait.h" #include "wait.h"
#include "timer.h"
#include <stdlib.h>
// Set Parameters // Set Parameters
uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN; uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;

3
platforms/avr/drivers/analog.c
View file

@ -14,9 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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" #include "analog.h"
static uint8_t aref = ADC_REF_POWER; static uint8_t aref = ADC_REF_POWER;

2
platforms/avr/drivers/analog.h
View file

@ -17,7 +17,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "quantum.h" #include "gpio.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
platforms/chibios/drivers/analog.c
View file

@ -14,7 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "quantum.h"
#include "analog.h" #include "analog.h"
#include <ch.h> #include <ch.h>
#include <hal.h> #include <hal.h>

2
platforms/chibios/drivers/analog.h
View file

@ -17,7 +17,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "quantum.h" #include "gpio.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {