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

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;

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;

platforms/avr/drivers/analog.h

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

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>

platforms/chibios/drivers/analog.h

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