~ruther/qmk_firmware

bcd4f34b266aca6fd52b9861e3ddfbdd8e8d18b2 — QMK Bot 3 years ago 9958f9e + d412854
Merge remote-tracking branch 'origin/master' into develop
M drivers/sensors/analog_joystick.c => drivers/sensors/analog_joystick.c +2 -0
@@ 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;

M platforms/avr/drivers/analog.c => platforms/avr/drivers/analog.c +0 -3
@@ 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;

M platforms/avr/drivers/analog.h => platforms/avr/drivers/analog.h +1 -1
@@ 17,7 17,7 @@
#pragma once

#include <stdint.h>
#include "quantum.h"
#include "gpio.h"

#ifdef __cplusplus
extern "C" {

M platforms/chibios/drivers/analog.c => platforms/chibios/drivers/analog.c +0 -1
@@ 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>

M platforms/chibios/drivers/analog.h => platforms/chibios/drivers/analog.h +1 -1
@@ 17,7 17,7 @@
#pragma once

#include <stdint.h>
#include "quantum.h"
#include "gpio.h"

#ifdef __cplusplus
extern "C" {